incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r916084 - in /incubator/aries/trunk/ariestrader-sample: ./ assemblies/ assemblies/ariestrader-all-eba/ assemblies/ariestrader-all-equinox/ assemblies/ariestrader-all-equinox/src/main/resources/configuration/ assemblies/ariestrader-jdbc-eba/...
Date Thu, 25 Feb 2010 01:36:40 GMT
Author: jbohn
Date: Thu Feb 25 01:36:40 2010
New Revision: 916084

URL: http://svn.apache.org/viewvc?rev=916084&view=rev
Log:
ARIES-200 update AriesTrader to support depoyment of EBAs in the equinox assemblies - also
update the building of the EBAs to push them to the local maven repo

Modified:
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/pom.xml
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/configuration/config.ini
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/pom.xml
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/configuration/config.ini
    incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml
    incubator/aries/trunk/ariestrader-sample/pom.xml

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml Thu Feb
25 01:36:40 2010
@@ -93,53 +93,53 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                          <artifactItems>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-util</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-core</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-api</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                                <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                <artifactId>ariestrader-web</artifactId>
-                                <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-beans</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-persist-jdbc</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-entities</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-persist-jpa-am</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-persist-jpa-cm</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                          </artifactItems>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-util</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-core</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-api</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-web</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-beans</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-persist-jdbc</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-entities</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-persist-jpa-am</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-persist-jpa-cm</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
@@ -185,6 +185,28 @@
                 </executions>
             </plugin>
 
+            <!-- Use the build-helper-maven-plugin to push the eba to the maven repo 
-->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/${project.build.finalName}.eba</file>
+                                    <type>eba</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/pom.xml?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/pom.xml Thu
Feb 25 01:36:40 2010
@@ -118,6 +118,10 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.fileinstall</artifactId>
+        </dependency>
 
 
         <!--
@@ -149,23 +153,38 @@
             <version>${ariesVersion}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction.blueprint</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction.manager</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.install</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.api</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.utils</artifactId>
+            <artifactId>org.apache.aries.application.management</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.transaction</groupId>
-            <artifactId>org.apache.aries.transaction.blueprint</artifactId>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.runtime</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.transaction</groupId>
-            <artifactId>org.apache.aries.transaction.manager</artifactId>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
 
@@ -179,49 +198,10 @@
             <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-util</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-web</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-beans</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-persist-jdbc</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-entities</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-persist-jpa-am</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-persist-jpa-cm</artifactId>
+            <groupId>org.apache.aries.ariestrader.assemblies</groupId>
+            <artifactId>ariestrader-all-eba</artifactId>
             <version>${pom.version}</version>
+            <type>eba</type>
         </dependency>
     </dependencies>
 

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/configuration/config.ini?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/configuration/config.ini
(original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/configuration/config.ini
Thu Feb 25 01:36:40 2010
@@ -15,6 +15,12 @@
 pax-web-jetty-bundle-0.7.2.jar@start,\
 pax-web-extender-war-0.7.2.jar@start,\
 pax-web-jsp-0.7.2.jar@start,\
+org.apache.aries.application.install-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.management-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.api-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.utils-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.felix.fileinstall-2.0.8.jar@start,\
+org.apache.aries.application.runtime-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.jndi-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.jpa.container-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.jpa.container.context-1.0.0-incubating-SNAPSHOT.jar@start,\
@@ -24,15 +30,6 @@
 org.apache.aries.application.utils-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.transaction.blueprint-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.transaction.manager-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-util-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-api-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-core-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-beans-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-persist-jdbc-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-entities-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-persist-jpa-am-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-persist-jpa-cm-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-web-1.0.0-incubating-SNAPSHOT.jar@start
+ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml Thu Feb
25 01:36:40 2010
@@ -78,38 +78,38 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                          <artifactItems>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-util</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-core</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-api</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-beans</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                              <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-persist-jdbc</artifactId>
-                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                            <artifactItem>
-                                <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                <artifactId>ariestrader-web</artifactId>
-                                <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                            </artifactItem>
-                          </artifactItems>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-util</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-core</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-api</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-beans</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-persist-jdbc</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
+                                    <artifactId>ariestrader-web</artifactId>
+                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
@@ -155,6 +155,28 @@
                 </executions>
             </plugin>
 
+            <!-- Use the build-helper-maven-plugin to push the eba to the maven repo 
-->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/${project.build.finalName}.eba</file>
+                                    <type>eba</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/pom.xml?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/pom.xml Thu
Feb 25 01:36:40 2010
@@ -86,6 +86,10 @@
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.fileinstall</artifactId>
+        </dependency>
 
 
         <!--
@@ -106,45 +110,56 @@
             <artifactId>org.apache.aries.jndi</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
-
-
-        <!--
-            Aries Trader Dependencies
-        -->
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-derby-ds</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction.blueprint</artifactId>
+            <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-util</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction.manager</artifactId>
+            <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-core</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.install</artifactId>
+            <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-api</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.api</artifactId>
+            <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-beans</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.management</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.runtime</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
+            <version>${ariesVersion}</version>
         </dependency>
+
+
+        <!--
+            Aries Trader Dependencies
+        -->
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-persist-jdbc</artifactId>
+            <artifactId>ariestrader-derby-ds</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-web</artifactId>
+            <groupId>org.apache.aries.ariestrader.assemblies</groupId>
+            <artifactId>ariestrader-jdbc-eba</artifactId>
             <version>${pom.version}</version>
+            <type>eba</type>
         </dependency>
     </dependencies>
 

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/configuration/config.ini?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/configuration/config.ini
(original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/configuration/config.ini
Thu Feb 25 01:36:40 2010
@@ -7,15 +7,15 @@
 pax-web-jetty-bundle-0.7.2.jar@start,\
 pax-web-extender-war-0.7.2.jar@start,\
 pax-web-jsp-0.7.2.jar@start,\
+org.apache.aries.application.install-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.management-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.api-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.utils-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.felix.fileinstall-2.0.8.jar@start,\
+org.apache.aries.application.runtime-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.jndi-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.util-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.blueprint-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-util-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-beans-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-api-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-core-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-persist-jdbc-1.0.0-incubating-SNAPSHOT.jar@start,\
-ariestrader-web-1.0.0-incubating-SNAPSHOT.jar@start
+ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml Thu Feb 25 01:36:40 2010
@@ -31,10 +31,10 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>ariestrader-jdbc-equinox</module>
         <module>ariestrader-jdbc-eba</module>
-        <module>ariestrader-all-equinox</module>
         <module>ariestrader-all-eba</module>
+        <module>ariestrader-jdbc-equinox</module>
+        <module>ariestrader-all-equinox</module>
     </modules>
 
 </project>

Modified: incubator/aries/trunk/ariestrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/pom.xml?rev=916084&r1=916083&r2=916084&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/pom.xml Thu Feb 25 01:36:40 2010
@@ -129,6 +129,11 @@
                 <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
                 <version>2.1_3_2</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.fileinstall</artifactId>
+                <version>2.0.8</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message