You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/02/18 18:12:40 UTC

svn commit: r911495 - in /incubator/aries/trunk/ariestrader-sample: assemblies/ariestrader-all-eba/ assemblies/ariestrader-all-eba/src/main/resources/META-INF/ assemblies/ariestrader-all-equinox/ assemblies/ariestrader-all-equinox/src/main/resources/co...

Author: jbohn
Date: Thu Feb 18 17:12:39 2010
New Revision: 911495

URL: http://svn.apache.org/viewvc?rev=911495&view=rev
Log:
ARIES-185 AriesTrader - create unique package for entity implementation classes

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/modules/ariestrader-entities/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.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-cm/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaCm.java
    incubator/aries/trunk/ariestrader-sample/modules/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=911495&r1=911494&r2=911495&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 18 17:12:39 2010
@@ -54,6 +54,11 @@
         </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>
@@ -67,6 +72,11 @@
             <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>
+            <version>${pom.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -106,6 +116,11 @@
                             </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>
@@ -119,6 +134,11 @@
                               <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>

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=911495&r1=911494&r2=911495&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 Thu Feb 18 17:12:39 2010
@@ -7,8 +7,10 @@
  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-beans;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-persist-jpa-am;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-jpa-am;version=1.0.0.incubating-SNAPSHOT,
+ org.apache.aries.ariestrader.modules.ariestrader-persist-jpa-cm;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=911495&r1=911494&r2=911495&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 18 17:12:39 2010
@@ -145,13 +145,13 @@
             <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <artifactId>org.apache.aries.application.api</artifactId>
             <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.api</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
         <dependency>
-            <artifactId>org.apache.aries.application.utils</artifactId>
             <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
 
@@ -186,7 +186,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.ariestrader.modules</groupId>
-            <artifactId>ariestrader-entities</artifactId>
+            <artifactId>ariestrader-beans</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
@@ -196,6 +196,11 @@
         </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>

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=911495&r1=911494&r2=911495&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 18 17:12:39 2010
@@ -23,10 +23,11 @@
 org.apache.aries.application.utils-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-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-web-1.0.0-incubating-SNAPSHOT.jar@start
 eclipse.ignoreApp=true

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=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/pom.xml Thu Feb 18 17:12:39 2010
@@ -133,10 +133,10 @@
                         <Bundle-Version>${pom.version}</Bundle-Version>
                         <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
                         <Export-Package>
-                            org.apache.aries.samples.ariestrader.beans;version="${pom.version}"
+                            org.apache.aries.samples.ariestrader.entities;version="${pom.version}"
                         </Export-Package>
                         <Import-Package>
-                            org.apache.aries.samples.ariestrader.beans,
+                            org.apache.aries.samples.ariestrader.entities,
                             org.apache.aries.samples.ariestrader.util,
                             org.apache.aries.samples.ariestrader.persistence.api,
                             org.apache.openjpa.enhance;version="[1.0.0,2.1.0)",

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java Thu Feb 18 17:12:39 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.aries.samples.ariestrader.beans;
+package org.apache.aries.samples.ariestrader.entities;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java Thu Feb 18 17:12:39 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.aries.samples.ariestrader.beans;
+package org.apache.aries.samples.ariestrader.entities;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java Thu Feb 18 17:12:39 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.aries.samples.ariestrader.beans;
+package org.apache.aries.samples.ariestrader.entities;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java Thu Feb 18 17:12:39 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.aries.samples.ariestrader.beans;
+package org.apache.aries.samples.ariestrader.entities;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java Thu Feb 18 17:12:39 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.aries.samples.ariestrader.beans;
+package org.apache.aries.samples.ariestrader.entities;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -47,7 +47,7 @@
     @NamedQuery(name = "quoteejb.findByChange1", query = "SELECT q FROM quoteejb q WHERE q.change1 = :change1")
 })
 @NamedNativeQueries({
-    @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClass=org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl.class)
+    @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClass=org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl.class)
 })
 
 public class QuoteDataBeanImpl implements QuoteDataBean, Serializable {

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml Thu Feb 18 17:12:39 2010
@@ -24,11 +24,11 @@
         <jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource)</jta-data-source>
         <non-jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource)</non-jta-data-source>
          
-        <class>org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.HoldingDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.OrderDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
        
         <properties>
@@ -45,11 +45,11 @@
         <jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/TradeDataSource)</jta-data-source>
         <non-jta-data-source>aries:services/javax.sql.DataSource/(osgi.jndi.serviceName=jdbc/NoTxTradeDataSource)</non-jta-data-source>
          
-        <class>org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl</class>
-        <class>org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.HoldingDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.OrderDataBeanImpl</class>
+        <class>org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
        
         <properties>

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=911495&r1=911494&r2=911495&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 Thu Feb 18 17:12:39 2010
@@ -83,7 +83,7 @@
                         </Export-Package>
                         <Import-Package>
                             org.apache.aries.samples.ariestrader.api,
-                            org.apache.aries.samples.ariestrader.beans,
+                            org.apache.aries.samples.ariestrader.entities,
                             org.apache.aries.samples.ariestrader.persistence.api,
                             org.apache.aries.samples.ariestrader.util,
                             javax.persistence;version="[1.0.0,2.1.0)",

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=911495&r1=911494&r2=911495&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 Thu Feb 18 17:12:39 2010
@@ -29,11 +29,11 @@
 import javax.persistence.Query;
 
 import org.apache.aries.samples.ariestrader.api.TradeServices;
-import org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.HoldingDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.OrderDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl;
 import org.apache.aries.samples.ariestrader.persistence.api.AccountDataBean;
 import org.apache.aries.samples.ariestrader.persistence.api.AccountProfileDataBean;
 import org.apache.aries.samples.ariestrader.persistence.api.HoldingDataBean;
@@ -515,7 +515,7 @@
                                                         + "a.OPENBALANCE, "
                                                         + "a.PROFILE_USERID "
                                                         + "from accountejb a where a.profile_userid = ?",
-                                                        org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl.class);
+                                                        org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl.class);
                 findaccountid.setParameter(1, userID);
                 AccountDataBeanImpl account = (AccountDataBeanImpl) findaccountid.getSingleResult();
                 Integer accountid = account.getAccountID();

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml Thu Feb 18 17:12:39 2010
@@ -83,7 +83,7 @@
                         </Export-Package>
                         <Import-Package>
                             org.apache.aries.samples.ariestrader.api,
-                            org.apache.aries.samples.ariestrader.beans,
+                            org.apache.aries.samples.ariestrader.entities,
                             org.apache.aries.samples.ariestrader.persistence.api,
                             org.apache.aries.samples.ariestrader.util,
                             javax.persistence;version="[1.0.0,2.1.0)",

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaCm.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaCm.java?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaCm.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/TradeJpaCm.java Thu Feb 18 17:12:39 2010
@@ -27,11 +27,11 @@
 import javax.persistence.Query;
 
 import org.apache.aries.samples.ariestrader.api.TradeServices;
-import org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl;
-import org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.HoldingDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.OrderDataBeanImpl;
+import org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl;
 import org.apache.aries.samples.ariestrader.persistence.api.AccountDataBean;
 import org.apache.aries.samples.ariestrader.persistence.api.AccountProfileDataBean;
 import org.apache.aries.samples.ariestrader.persistence.api.HoldingDataBean;
@@ -422,7 +422,7 @@
                                                         + "a.OPENBALANCE, "
                                                         + "a.PROFILE_USERID "
                                                         + "from accountejb a where a.profile_userid = ?",
-                                                        org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl.class);
+                                                        org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl.class);
                 findaccountid.setParameter(1, userID);
                 AccountDataBeanImpl account = (AccountDataBeanImpl) findaccountid.getSingleResult();
                 Integer accountid = account.getAccountID();

Modified: incubator/aries/trunk/ariestrader-sample/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/pom.xml?rev=911495&r1=911494&r2=911495&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/pom.xml Thu Feb 18 17:12:39 2010
@@ -40,6 +40,7 @@
         <module>ariestrader-derby-ds</module>
         <module>ariestrader-persist-jdbc</module>
         <module>ariestrader-persist-jpa-am</module>
+        <module>ariestrader-persist-jpa-cm</module>
     </modules>
 
 </project>