incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r911976 - in /incubator/aries/trunk/ariestrader-sample: ./ assemblies/ assemblies/ariestrader-all-eba/ assemblies/ariestrader-all-equinox/ assemblies/ariestrader-all-equinox/src/main/resources/ assemblies/ariestrader-all-equinox/src/main/re...
Date Fri, 19 Feb 2010 20:41:42 GMT
Author: jbohn
Date: Fri Feb 19 20:41:42 2010
New Revision: 911976

URL: http://svn.apache.org/viewvc?rev=911976&view=rev
Log:
ARIES-144 AriesTrader extended with JPA Container managed persistence and declarative transactions
- also fixed up some license headers

Modified:
    incubator/aries/trunk/ariestrader-sample/   (props changed)
    incubator/aries/trunk/ariestrader-sample/assemblies/   (props changed)
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/   (props changed)
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/   (props
changed)
    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-all-equinox/src/main/resources/tradeDB.sql
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/   (props changed)
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/   (props
changed)
    incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/tradeDB.sql
    incubator/aries/trunk/ariestrader-sample/modules/   (props changed)
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-entities/src/main/resources/META-INF/persistence.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-am/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    incubator/aries/trunk/ariestrader-sample/pom.xml

Propchange: incubator/aries/trunk/ariestrader-sample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-eba/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.classpath
+.project
+.settings

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.classpath
+.project
+.settings

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=911976&r1=911975&r2=911976&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 Fri
Feb 19 20:41:42 2010
@@ -114,6 +114,10 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.serp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+        </dependency>
 
 
         <!--
@@ -154,6 +158,11 @@
             <artifactId>org.apache.aries.application.utils</artifactId>
             <version>${ariesVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.transaction</groupId>
+            <artifactId>org.apache.aries.transaction</artifactId>
+            <version>${ariesVersion}</version>
+        </dependency>
 
 
         <!--
@@ -204,6 +213,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>

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=911976&r1=911975&r2=911976&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
Fri Feb 19 20:41:42 2010
@@ -8,6 +8,7 @@
 commons-lang-2.4.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,\
 geronimo-jpa_2.0_spec-1.0.jar@start,\
 geronimo-jta_1.1_spec-1.1.1.jar@start,\
@@ -21,6 +22,7 @@
 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,\
+org.apache.aries.transaction-1.0.0-incubating-SNAPSHOT.jar@start,\
 ariestrader-derby-ds-1.0.0-incubating-SNAPSHOT.jar@start,\
 ariestrader-util-1.0.0-incubating-SNAPSHOT.jar@start,\
 ariestrader-api-1.0.0-incubating-SNAPSHOT.jar@start,\
@@ -29,6 +31,7 @@
 ariestrader-persist-jdbc-1.0.0-incubating-SNAPSHOT.jar@start,\
 ariestrader-entities-1.0.0-incubating-SNAPSHOT.jar@start,\
 ariestrader-persist-jpa-am-1.0.0-incubating-SNAPSHOT.jar@start,\
+ariestrader-persist-jpa-cm-1.0.0-incubating-SNAPSHOT.jar@start,\
 ariestrader-web-1.0.0-incubating-SNAPSHOT.jar@start
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
\ No newline at end of file

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/tradeDB.sql
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/tradeDB.sql?rev=911976&r1=911975&r2=911976&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/tradeDB.sql
(original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-all-equinox/src/main/resources/tradeDB.sql
Fri Feb 19 20:41:42 2010
@@ -1,3 +1,20 @@
+--
+-- 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.
+--
+
 connect 'jdbc:derby:tradedb;create=true';
 create table holdingejb
   (purchaseprice decimal(10, 2),

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-eba/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.classpath
+.project
+.settings

Propchange: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.classpath
+.project
+.settings

Modified: incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/tradeDB.sql
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/tradeDB.sql?rev=911976&r1=911975&r2=911976&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/tradeDB.sql
(original)
+++ incubator/aries/trunk/ariestrader-sample/assemblies/ariestrader-jdbc-equinox/src/main/resources/tradeDB.sql
Fri Feb 19 20:41:42 2010
@@ -1,3 +1,20 @@
+--
+-- 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.
+--
+
 connect 'jdbc:derby:tradedb;create=true';
 create table holdingejb
   (purchaseprice decimal(10, 2),

Propchange: incubator/aries/trunk/ariestrader-sample/modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 20:41:42 2010
@@ -0,0 +1,3 @@
+.classpath
+.settings
+.project

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=911976&r1=911975&r2=911976&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
Fri Feb 19 20:41:42 2010
@@ -56,6 +56,7 @@
             <property name="openjpa.BrokerImpl" value="non-finalizing" /> 
             <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
             <property name="openjpa.jdbc.UpdateManager" value="org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager"/>
+            <property name="openjpa.ManagedRuntime" value="jndi(TransactionManagerName=aries:services/javax.transaction.TransactionManager)"/>
         </properties>
     </persistence-unit>
 

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=911976&r1=911975&r2=911976&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jdbc/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Fri Feb 19 20:41:42 2010
@@ -1,3 +1,22 @@
+<?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.
+
+-->
 <blueprint  default-activation="lazy" 
             xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

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=911976&r1=911975&r2=911976&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
Fri Feb 19 20:41:42 2010
@@ -1,3 +1,22 @@
+<?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.
+
+-->
 <blueprint  default-activation="lazy" 
             xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=911976&r1=911975&r2=911976&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Fri Feb 19 20:41:42 2010
@@ -1,11 +1,32 @@
+<?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.
+
+-->
 <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"
-            xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0">
+            xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0"
+            xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0">
 
   <bean id="tradeServicesBeanJPA-CM" class="org.apache.aries.samples.ariestrader.persist.jpa.TradeJpaCm"
init-method="init"> 
       <jpa:context property="entityManager" unitname="ariestrader-cm" />
+      <tx:transaction method="*" value="Required"/>
   </bean>
   
   <service id="tradeServicesJPA-CM" ref="tradeServicesBeanJPA-CM" interface="org.apache.aries.samples.ariestrader.api.TradeServices">

Modified: incubator/aries/trunk/ariestrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/pom.xml?rev=911976&r1=911975&r2=911976&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/pom.xml Fri Feb 19 20:41:42 2010
@@ -124,6 +124,11 @@
                 <artifactId>osgi</artifactId>
                 <version>3.5.0.v20090520</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+                <version>2.1_3_2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message