incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r908257 - in /incubator/aries/trunk/ariestrader-sample: ./ assemblies/ariestrader-all-equinox/ assemblies/ariestrader-all-equinox/src/main/resources/configuration/ assemblies/ariestrader-jdbc-equinox/ assemblies/ariestrader-jdbc-equinox/src...
Date Tue, 09 Feb 2010 22:22:03 GMT
Author: jbohn
Date: Tue Feb  9 22:22:03 2010
New Revision: 908257

URL: http://svn.apache.org/viewvc?rev=908257&view=rev
Log:
ARIES-143 Some more progress toward an equinox assembly for the application managed jpa persistence - still more to go

Added:
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/   (with props)
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml   (with props)
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml   (with props)
Modified:
    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-equinox/pom.xml
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/configuration/config.ini
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaAm.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/ariestrader-sample/modules/pom.xml
    incubator/aries/trunk/ariestrader-sample/pom.xml

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=908257&r1=908256&r2=908257&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 Tue Feb  9 22:22:03 2010
@@ -1,115 +1,163 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		* Licensed to the Apache Software Foundation (ASF) under one * or more
-		contributor license agreements. See the NOTICE file * distributed with
-		this work for additional information * regarding copyright ownership.
-		The ASF licenses this file * to you under the Apache License, Version
-		2.0 (the * "License"); you may not use this file except in compliance
-		* with the License. You may obtain a copy of the License at * *
-		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-		applicable law or agreed to in writing, * software distributed under
-		the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
-		OR CONDITIONS OF ANY * KIND, either express or implied. See the
-		License for the * specific language governing permissions and
-		limitations * under the License.
-	-->
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one * or more
+    contributor license agreements. See the NOTICE file * distributed with
+    this work for additional information * regarding copyright ownership.
+    The ASF licenses this file * to you under the Apache License, Version
+    2.0 (the * "License"); you may not use this file except in compliance
+    * with the License. You may obtain a copy of the License at * *
+    http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+    applicable law or agreed to in writing, * software distributed under
+    the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY * KIND, either express or implied. See the
+    License for the * specific language governing permissions and
+    limitations * under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.ariestrader</groupId>
-		<artifactId>assemblies</artifactId>
-		<version>1.0.0-incubating-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.ariestrader</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
     <groupId>org.apache.aries.ariestrader.assemblies</groupId>
-	<artifactId>ariestrader-all-equinox</artifactId>
-	<name>Apache Aries AriesTrader ALL sample assembly using Equinox</name>
-	<packaging>pom</packaging>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.eclipse</groupId>
-			<artifactId>osgi</artifactId>
-			<version>3.5.0.v20090520</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>cm</artifactId>
-			<version>3.2.0-v20070116</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>services</artifactId>
-			<version>3.1.200-v20070605</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-api</artifactId>
-			<version>1.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-service</artifactId>
-			<version>1.4</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-extender-war</artifactId>
-			<version>0.7.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-jetty-bundle</artifactId>
-			<version>0.7.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-jsp</artifactId>
-			<version>0.7.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.5.3.0_1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries.blueprint</groupId>
-			<artifactId>org.apache.aries.blueprint</artifactId>
-			<version>${ariesVersion}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries</groupId>
-			<artifactId>org.apache.aries.util</artifactId>
-			<version>${ariesVersion}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries.jndi</groupId>
-			<artifactId>org.apache.aries.jndi</artifactId>
-			<version>${ariesVersion}</version>
-		</dependency>
+    <artifactId>ariestrader-all-equinox</artifactId>
+    <name>Apache Aries AriesTrader ALL sample assembly using Equinox</name>
+    <packaging>pom</packaging>
 
+    <dependencies>
 
+        <!--
+            External Dependencies
+        -->
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>cm</artifactId>
+            <version>3.2.0-v20070116</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>services</artifactId>
+            <version>3.1.200-v20070605</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+            <version>1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-extender-war</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jetty-bundle</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jsp</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+        </dependency>
 
+
+        <!--
+            Aries Dependencies
+        -->
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jndi</groupId>
+            <artifactId>org.apache.aries.jndi</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>jpa-container</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>jpa-container-context</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <artifactId>org.apache.aries.application.api</artifactId>
+            <groupId>org.apache.aries.application</groupId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <artifactId>org.apache.aries.application.utils</artifactId>
+            <groupId>org.apache.aries.application</groupId>
+            <version>${ariesVersion}</version>
+        </dependency>
+
+
+        <!--
+            Aries Trader Dependencies
+        -->
+        <dependency>
+            <groupId>org.apache.aries.ariestrader.modules</groupId>
+            <artifactId>ariestrader-openjpa-provider</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
             <artifactId>ariestrader-derby-ds</artifactId>
@@ -150,55 +198,55 @@
             <artifactId>ariestrader-persist-jpa-am</artifactId>
             <version>${pom.version}</version>
         </dependency>
-	</dependencies>
+    </dependencies>
 
-	<build>
+    <build>
 
-		<resources>
-			<resource>
-				<directory>${pom.basedir}/src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<outputDirectory>${project.build.directory}</outputDirectory>
-				</configuration>
-				<executions>
-					<execution>
-						<id>filter</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>resources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeTransitive>true</excludeTransitive>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <excludeTransitive>true</excludeTransitive>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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=908257&r1=908256&r2=908257&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 Tue Feb  9 22:22:03 2010
@@ -1,3 +1,33 @@
-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-derby-ds-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
+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,\
+commons-collections-3.2.1.jar@start,\
+commons-lang-2.4.jar@start,\
+commons-pool-1.5.3.jar@start,\
+openjpa-2.0.0-beta.jar@start,\
+geronimo-jpa_2.0_spec-1.0.jar@start,\
+geronimo-jta_1.1_spec-1.1.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,\
+jpa-container-1.0.0-incubating-SNAPSHOT.jar@start,\
+jpa-container-context-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,\
+org.apache.aries.application.api-1.0.0-incubating-SNAPSHOT.jar@start,\
+org.apache.aries.application.utils-1.0.0-incubating-SNAPSHOT.jar@start,\
+ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start,\
+ariestrader-openjpa-provider-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/ariestrader-jdbc-equinox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/pom.xml?rev=908257&r1=908256&r2=908257&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 Tue Feb  9 22:22:03 2010
@@ -1,115 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		* Licensed to the Apache Software Foundation (ASF) under one * or more
-		contributor license agreements. See the NOTICE file * distributed with
-		this work for additional information * regarding copyright ownership.
-		The ASF licenses this file * to you under the Apache License, Version
-		2.0 (the * "License"); you may not use this file except in compliance
-		* with the License. You may obtain a copy of the License at * *
-		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-		applicable law or agreed to in writing, * software distributed under
-		the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
-		OR CONDITIONS OF ANY * KIND, either express or implied. See the
-		License for the * specific language governing permissions and
-		limitations * under the License.
-	-->
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one * or more
+    contributor license agreements. See the NOTICE file * distributed with
+    this work for additional information * regarding copyright ownership.
+    The ASF licenses this file * to you under the Apache License, Version
+    2.0 (the * "License"); you may not use this file except in compliance
+    * with the License. You may obtain a copy of the License at * *
+    http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+    applicable law or agreed to in writing, * software distributed under
+    the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY * KIND, either express or implied. See the
+    License for the * specific language governing permissions and
+    limitations * under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.ariestrader</groupId>
-		<artifactId>assemblies</artifactId>
-		<version>1.0.0-incubating-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.ariestrader</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
     <groupId>org.apache.aries.ariestrader.assemblies</groupId>
-	<artifactId>ariestrader-jdbc-equinox</artifactId>
-	<name>Apache Aries AriesTrader JDBC sample assembly using Equinox</name>
-	<packaging>pom</packaging>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.eclipse</groupId>
-			<artifactId>osgi</artifactId>
-			<version>3.5.0.v20090520</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>cm</artifactId>
-			<version>3.2.0-v20070116</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>services</artifactId>
-			<version>3.1.200-v20070605</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-api</artifactId>
-			<version>1.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-service</artifactId>
-			<version>1.4</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-extender-war</artifactId>
-			<version>0.7.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-jetty-bundle</artifactId>
-			<version>0.7.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-jsp</artifactId>
-			<version>0.7.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.5.3.0_1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries.blueprint</groupId>
-			<artifactId>org.apache.aries.blueprint</artifactId>
-			<version>${ariesVersion}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries</groupId>
-			<artifactId>org.apache.aries.util</artifactId>
-			<version>${ariesVersion}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.aries.jndi</groupId>
-			<artifactId>org.apache.aries.jndi</artifactId>
-			<version>${ariesVersion}</version>
-		</dependency>
+    <artifactId>ariestrader-jdbc-equinox</artifactId>
+    <name>Apache Aries AriesTrader JDBC sample assembly using Equinox</name>
+    <packaging>pom</packaging>
 
+    <dependencies>
+
+        <!--
+            External Dependencies
+        -->
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>cm</artifactId>
+            <version>3.2.0-v20070116</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>services</artifactId>
+            <version>3.1.200-v20070605</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+            <version>1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-extender-war</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jetty-bundle</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-jsp</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+
+
+        <!--
+            Aries Dependencies
+        -->
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jndi</groupId>
+            <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>
@@ -145,55 +144,55 @@
             <artifactId>ariestrader-web</artifactId>
             <version>${pom.version}</version>
         </dependency>
-	</dependencies>
+    </dependencies>
 
-	<build>
+    <build>
 
-		<resources>
-			<resource>
-				<directory>${pom.basedir}/src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<outputDirectory>${project.build.directory}</outputDirectory>
-				</configuration>
-				<executions>
-					<execution>
-						<id>filter</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>resources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<excludeTransitive>true</excludeTransitive>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <excludeTransitive>true</excludeTransitive>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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=908257&r1=908256&r2=908257&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 Tue Feb  9 22:22:03 2010
@@ -1,3 +1,21 @@
-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-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
+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-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
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-derby-ds/pom.xml Tue Feb  9 22:22:03 2010
@@ -53,20 +53,17 @@
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${pom.version}</Bundle-Version>
                         <Bundle-Activator>org.apache.aries.ariestrader.datasource.derby.DerbyActivator</Bundle-Activator>
-						<Export-Service>javax.sql.DataSource</Export-Service>
-
+                        <Export-Service>javax.sql.DataSource</Export-Service>
                         <Export-Package>
                             <!--org.apache.aries.samples.ariestrader.datasource.derby;version="${pom.version}"-->
                         </Export-Package>
                         <Import-Package>
-                            <!--org.apache.aries.samples.ariestrader.datasource.derby,-->
                             org.osgi.framework,
                             javax.sql,
                             org.apache.derby.jdbc
                         </Import-Package>
                         <Private-Package>
                             org.apache.aries.ariestrader.datasource.derby
-                            <!--org.apache.aries.samples.ariestrader.datasource.derby"-->
                         </Private-Package>
                     </instructions>
                 </configuration>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml Tue Feb  9 22:22:03 2010
@@ -28,7 +28,7 @@
     <artifactId>ariestrader-entities</artifactId>
     <packaging>bundle</packaging>
     <name>AriesTrader :: Modules - Entities</name>
-    <description>AriesTrader JPA Enhanced Enttities Module</description>
+    <description>AriesTrader JPA Enhanced Entities Module</description>
 
     <dependencies>
         <dependency>
@@ -48,11 +48,18 @@
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>    
+<!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
@@ -131,9 +138,9 @@
                             org.apache.aries.samples.ariestrader.beans,
                             org.apache.aries.samples.ariestrader.util,
                             org.apache.aries.samples.ariestrader.persistence.api,
-                            org.apache.openjpa.enhance,
-                            org.apache.openjpa.util,
-                            javax.persistence
+                            org.apache.openjpa.enhance;version="[1.0.0,2.1.0)",
+                            org.apache.openjpa.util;version="[1.0.0,2.1.0)",
+                            javax.persistence;version="[1.0.0,2.1.0)"
                         </Import-Package>
                     </instructions>
                 </configuration>

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb  9 22:22:03 2010
@@ -0,0 +1,3 @@
+.classpath
+.project
+.settings

Added: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml?rev=908257&view=auto
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml (added)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml Tue Feb  9 22:22:03 2010
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.aries.ariestrader</groupId>
+        <artifactId>modules</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.aries.ariestrader.modules</groupId>
+    <artifactId>ariestrader-openjpa-provider</artifactId>
+    <packaging>bundle</packaging>
+    <name>AriesTrader :: Modules - OpenJPA Persistence Provider</name>
+    <description>AriesTrader OpenJPA Persistence Provider</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
+                        <Export-Package>
+                            <!--org.apache.aries.samples.ariestrader.openjpa.provider;version="${pom.version}"-->
+                        </Export-Package>
+                        <Import-Package>
+                            <!--org.apache.aries.samples.ariestrader.openjpa.provider;version="${pom.version}"-->
+                            javax.persistence.spi,
+                            org.apache.openjpa.persistence
+                        </Import-Package>
+                        <Private-Package>
+                            <!--org.apache.aries.samples.ariestrader.openjpa.provider;version="${pom.version}"-->
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=908257&view=auto
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Feb  9 22:22:03 2010
@@ -0,0 +1,19 @@
+<blueprint  default-activation="lazy" 
+            xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+  <service>
+      <interfaces>
+          <value>javax.persistence.spi.PersistenceProvider</value>
+          <value>org.apache.openjpa.persistence.PersistenceProviderImpl</value>
+      </interfaces>
+      <service-properties>
+          <entry key="osgi.jpa.provider.version" value="1.0.0" />
+          <entry key="javax.persistence.provider" value="org.apache.openjpa.persistence.PersistenceProviderImpl" />
+      </service-properties>    
+      <bean class="org.apache.openjpa.persistence.PersistenceProviderImpl" />
+  </service>
+  
+</blueprint>
+

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-openjpa-provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/pom.xml Tue Feb  9 22:22:03 2010
@@ -49,11 +49,18 @@
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
+<!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -80,7 +87,7 @@
                             org.apache.aries.samples.ariestrader.beans,
                             org.apache.aries.samples.ariestrader.persistence.api,
                             org.apache.aries.samples.ariestrader.util,
-                            javax.persistence
+                            javax.persistence;version="[1.0.0,2.1.0)"
                         </Import-Package>
                         <Private-Package>
                             org.apache.aries.samples.ariestrader.persist.jpa

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaAm.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaAm.java?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaAm.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaAm.java Tue Feb  9 22:22:03 2010
@@ -61,7 +61,7 @@
 
 public class TradeJpaAm implements TradeServices {
 
-    @PersistenceUnit(unitName="ariestrader-am")
+//    @PersistenceUnit(unitName="ariestrader-am")
     private static EntityManagerFactory emf;
 
     private static BigDecimal ZERO = new BigDecimal(0.0);
@@ -74,8 +74,8 @@
     public TradeJpaAm() {
     }
 
-    public void setEmf (EntityManagerFactory em) { 
-        emf = em;
+    public void setEmf (EntityManagerFactory emf) { 
+        this.emf = emf;
     }
 
     public void init() {

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Feb  9 22:22:03 2010
@@ -1,9 +1,11 @@
 <blueprint  default-activation="lazy" 
             xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+            xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0">
 
   <bean id="tradeServicesBeanJPA-AM" class="org.apache.aries.samples.ariestrader.persist.jpa.TradeJpaAm" init-method="init"> 
+      <jpa:unit property="emf" unitname="ariestrader-am" />
   </bean>
   
   <service id="tradeServicesJPA-AM" ref="tradeServicesBeanJPA-AM" interface="org.apache.aries.samples.ariestrader.api.TradeServices">

Modified: incubator/aries/trunk/ariestrader-sample/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/pom.xml?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/pom.xml Tue Feb  9 22:22:03 2010
@@ -38,6 +38,7 @@
         <module>ariestrader-beans</module>
         <module>ariestrader-entities</module>
         <module>ariestrader-derby-ds</module>
+        <module>ariestrader-openjpa-provider</module>
         <module>ariestrader-persist-jdbc</module>
         <module>ariestrader-persist-jpa-am</module>
     </modules>

Modified: incubator/aries/trunk/ariestrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/pom.xml?rev=908257&r1=908256&r2=908257&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/pom.xml Tue Feb  9 22:22:03 2010
@@ -59,11 +59,18 @@
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
                 <version>1.1.1</version>
             </dependency>
+<!--
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_1.0_spec</artifactId>
                 <version>1.1.2</version>
             </dependency>
+-->
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>jstl</artifactId>
@@ -77,12 +84,14 @@
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
-                <version>1.2.1</version>
+                <!--<version>1.2.1</version>-->
+                <version>2.0.0-beta</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-persistence-jdbc</artifactId>
-                <version>1.2.1</version>
+                <!--<version>1.2.1</version>-->
+                <version>2.0.0-beta</version>
             </dependency>
             <dependency>
                 <groupId>net.sourceforge.serp</groupId>
@@ -95,6 +104,11 @@
                 <version>2.4</version>
             </dependency>
             <dependency>
+                <groupId>commons-pool</groupId>
+                <artifactId>commons-pool</artifactId>
+                <version>1.5.3</version>
+            </dependency>
+            <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
                 <version>3.2.1</version>



Mime
View raw message