Return-Path: 
 <aries-commits-return-716-apmail-incubator-aries-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org
Received: (qmail 70384 invoked from network); 1 Mar 2010 16:04:47 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 1 Mar 2010 16:04:47 -0000
Received: (qmail 82259 invoked by uid 500); 1 Mar 2010 16:04:46 -0000
Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org
Received: (qmail 82202 invoked by uid 500); 1 Mar 2010 16:04:46 -0000
Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:aries-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:aries-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:aries-commits@incubator.apache.org>
List-Id: <aries-commits.incubator.apache.org>
Reply-To: aries-dev@incubator.apache.org
Delivered-To: mailing list aries-commits@incubator.apache.org
Received: (qmail 82087 invoked by uid 99); 1 Mar 2010 16:04:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 16:04:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 16:04:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CC4972388900; Mon,  1 Mar 2010 16:04:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r917566 - in /incubator/aries/trunk/ariestrader-sample:
 assemblies/equinox-test-harness/pom.xml
 assemblies/equinox-test-harness/src/main/resources/configuration/config.ini
 pom.xml
Date: Mon, 01 Mar 2010 16:04:25 -0000
To: aries-commits@incubator.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100301160425.CC4972388900@eris.apache.org>

Author: jbohn
Date: Mon Mar  1 16:04:25 2010
New Revision: 917566

URL: http://svn.apache.org/viewvc?rev=917566&view=rev
Log:
AriesTrader updated to get some of the jpa code working again with the recent changes of ARIES-202  - this gets the jpa application managed persistence mode working again but not the jpa container managed

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

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml?rev=917566&r1=917565&r2=917566&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/pom.xml Mon Mar  1 16:04:25 2010
@@ -133,6 +133,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.api</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
             <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
             <version>${ariesVersion}</version>
         </dependency>

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini?rev=917566&r1=917565&r2=917566&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini (original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/equinox-test-harness/src/main/resources/configuration/config.ini Mon Mar  1 16:04:25 2010
@@ -5,11 +5,11 @@
 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-lang-2.5.jar@start,\
 commons-pool-1.5.3.jar@start,\
 org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
 org.apache.servicemix.bundles.cglib-2.1_3_2.jar@start,\
-openjpa-2.0.0-SNAPSHOT.jar@start,\
+openjpa-2.0.0-beta2.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,\
@@ -22,6 +22,7 @@
 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.api-1.0.0-incubating-SNAPSHOT.jar@start,\
 org.apache.aries.jpa.blueprint.aries-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,\

Modified: incubator/aries/trunk/ariestrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/pom.xml?rev=917566&r1=917565&r2=917566&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/pom.xml Mon Mar  1 16:04:25 2010
@@ -85,14 +85,12 @@
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
-                <!--<version>1.2.1</version>-->
-                <version>2.0.0-SNAPSHOT</version>
+                <version>2.0.0-beta2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-persistence-jdbc</artifactId>
-                <!--<version>1.2.1</version>-->
-                <version>2.0.0-beta</version>
+                <version>2.0.0-beta2</version>
             </dependency>
             <dependency>
                 <groupId>net.sourceforge.serp</groupId>
@@ -113,7 +111,7 @@
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
-                <version>1.5.4</version>
+                <version>1.5.3</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>