incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r906264 - in /incubator/aries/trunk/ariestrader-sample/assemblies: ./ ariestrader-all-eba/ ariestrader-all-eba/src/main/resources/META-INF/ ariestrader-all-equinox/ ariestrader-all-equinox/src/main/resources/configuration/
Date Wed, 03 Feb 2010 22:04:54 GMT
Author: jbohn
Date: Wed Feb  3 22:04:54 2010
New Revision: 906264

URL: http://svn.apache.org/viewvc?rev=906264&view=rev
Log:
ARIES-143 the start of some assemblies including the jpa bundles - these are most certainly
not working yet since I haven't even pulled in a jpa provider yet

Added:
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/
      - copied from r906236, incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/
      - copied from r906236, incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/
Modified:
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF
    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/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=906264&r1=906236&r2=906264&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 Wed Feb
 3 22:04:54 2010
@@ -26,10 +26,10 @@
 	</parent>
     
     <groupId>org.apache.aries.ariestrader.assemblies</groupId>
-    <artifactId>ariestrader-jdbc-eba</artifactId>    
+    <artifactId>ariestrader-all-eba</artifactId>    
     <packaging>pom</packaging>
-    <name>AriesTrader :: Assemblies - EBA - JDBC</name>
-    <description>An EBA version of AriesTrader JDBC</description>
+    <name>AriesTrader :: Assemblies - EBA - ALL</name>
+    <description>An EBA version of AriesTrader ALL</description>
     
     <dependencies>
         <dependency>
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-beans</artifactId>
+            <artifactId>ariestrader-web</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
@@ -59,7 +59,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-web</artifactId>
+            <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>
     </dependencies>
@@ -95,19 +100,24 @@
                               <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>
+                              <artifactId>ariestrader-persist-jdbc</artifactId>
                               <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>
                             <artifactItem>
                               <groupId>org.apache.aries.ariestrader.modules</groupId>
-                              <artifactId>ariestrader-persist-jdbc</artifactId>
+                              <artifactId>ariestrader-entities</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>
+                              <groupId>org.apache.aries.ariestrader.modules</groupId>
+                              <artifactId>ariestrader-persist-jpa-am</artifactId>
+                              <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>
                           </artifactItems>
                         </configuration>

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF?rev=906264&r1=906236&r2=906264&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF
(original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF
Wed Feb  3 22:04:54 2010
@@ -6,8 +6,9 @@
 Application-Content: org.apache.aries.ariestrader.modules.ariestrader-util;version=1.0.0-incubating-SNAPSHOT,
  org.apache.aries.ariestrader.modules.ariestrader-api;version=1.0.0-incubating-SNAPSHOT,
  org.apache.aries.ariestrader.modules.ariestrader-core;version=1.0.0-incubating-SNAPSHOT,
+ org.apache.aries.ariestrader.modules.ariestrader-web;version=1.0.0-incubating-SNAPSHOT,
+ org.apache.aries.ariestrader.modules.ariestrader-entities;version=1.0.0-incubating-SNAPSHOT,
  org.apache.aries.ariestrader.modules.ariestrader-persist-jdbc;version=1.0.0-incubating-SNAPSHOT,
- org.apache.aries.ariestrader.modules.ariestrader-beans;version=1.0.0-incubating-SNAPSHOT,
- org.apache.aries.ariestrader.modules.ariestrader-web;version=1.0.0-incubating-SNAPSHOT
+ org.apache.aries.ariestrader.modules.ariestrader-persist-jpa-am;version=1.0.0-incubating-SNAPSHOT
 
 

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=906264&r1=906236&r2=906264&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 Wed
Feb  3 22:04:54 2010
@@ -25,8 +25,8 @@
 	</parent>
 
     <groupId>org.apache.aries.ariestrader.assemblies</groupId>
-	<artifactId>ariestrader-jdbc-equinox</artifactId>
-	<name>Apache Aries AriesTrader JDBC sample assembly using Equinox</name>
+	<artifactId>ariestrader-all-equinox</artifactId>
+	<name>Apache Aries AriesTrader ALL sample assembly using Equinox</name>
 	<packaging>pom</packaging>
 
 	<dependencies>
@@ -127,7 +127,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-beans</artifactId>
+            <artifactId>ariestrader-web</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.ariestrader.modules</groupId>
+            <artifactId>ariestrader-entities</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
@@ -137,7 +142,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-web</artifactId>
+            <artifactId>ariestrader-persist-jpa-am</artifactId>
             <version>${pom.version}</version>
         </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=906264&r1=906236&r2=906264&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
Wed Feb  3 22:04:54 2010
@@ -1,3 +1,3 @@
-osgi.bundles=cm-3.2.0-v20070116.jar@start,services-3.1.200-v20070605.jar@start,pax-logging-api-1.4.jar@start,pax-logging-service-1.4.jar@start,derby-10.5.3.0_1.jar@start,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.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-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
+osgi.bundles=cm-3.2.0-v20070116.jar@start,services-3.1.200-v20070605.jar@start,pax-logging-api-1.4.jar@start,pax-logging-service-1.4.jar@start,derby-10.5.3.0_1.jar@start,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.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-util-1.0.0-incubating-SNAPSHOT.jar@start,ariestrader-entities-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-persist-jpa-am-1.0.0-incubating-SNAPSHOT.jar@start,ariestrader-web-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=906264&r1=906263&r2=906264&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/pom.xml Wed Feb  3 22:04:54 2010
@@ -33,6 +33,8 @@
     <modules>
         <module>ariestrader-jdbc-equinox</module>
         <module>ariestrader-jdbc-eba</module>
+        <module>ariestrader-all-equinox</module>
+        <module>ariestrader-all-eba</module>
     </modules>
 
 </project>



Mime
View raw message