geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1124265 - in /geronimo/samples/trunk/samples/javaee5: ./ DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/ dbtester/dbtester-war/ jms-mdb/jms-mdb-jetty/src/main/plan/ jms-mdb/jms-mdb-tomcat/src/main/plan/ myphonebook/myphonebook-tomcat/
Date Wed, 18 May 2011 13:45:19 GMT
Author: xiaming
Date: Wed May 18 13:45:19 2011
New Revision: 1124265

URL: http://svn.apache.org/viewvc?rev=1124265&view=rev
Log:
Reenable some comment-out samples, first commit, more coming

Modified:
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml
    geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee5/pom.xml

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml?rev=1124265&r1=1124264&r2=1124265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
Wed May 18 13:45:19 2011
@@ -21,8 +21,9 @@
         <dep:dependencies>
             <dep:dependency>
                 <dep:groupId>org.apache.geronimo.samples</dep:groupId>
-                        <dep:artifactId>sample-datasource</dep:artifactId>
-                        <dep:type>car</dep:type>
+                <dep:artifactId>sample-datasource</dep:artifactId>
+		<dep:version>${geronimoVersion}</dep:version>
+                <dep:type>car</dep:type>
             </dep:dependency>
         </dep:dependencies>
     </dep:environment>

Modified: geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml?rev=1124265&r1=1124264&r2=1124265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml Wed May 18 13:45:19
2011
@@ -54,13 +54,7 @@
             <artifactId>geronimo-management</artifactId>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
+        </dependency>        
     </dependencies>
 
 </project>

Modified: geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml?rev=1124265&r1=1124264&r2=1124265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml Wed
May 18 13:45:19 2011
@@ -36,7 +36,7 @@
 
     </module>
     <module>
-        <connector>activemq-ra-${geronimoVersion}.rar</connector>
+        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
             <resourceadapter>
                 <resourceadapter-instance>

Modified: geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml?rev=1124265&r1=1124264&r2=1124265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml Wed
May 18 13:45:19 2011
@@ -36,7 +36,7 @@
 
     </module>
     <module>
-        <connector>activemq-ra-${geronimoVersion}.rar</connector>
+        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
             <resourceadapter>
                 <resourceadapter-instance>

Modified: geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml?rev=1124265&r1=1124264&r2=1124265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml Wed May
18 13:45:19 2011
@@ -78,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>

Modified: geronimo/samples/trunk/samples/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/pom.xml?rev=1124265&r1=1124264&r2=1124265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/pom.xml Wed May 18 13:45:19 2011
@@ -93,24 +93,24 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>                
-                <!--<module>customer</module>-->
+                <module>customer</module>
                 <!--<module>async-http</module>-->
-                <!--<module>bank</module>-->
-                <!--<module>calculator</module>-->
+                <module>bank</module>
+                <module>calculator</module>
                 <module>dbtester</module>
                 <module>inventory</module>
-                <!--<module>jaxws-calculator</module>-->
-                <!--<module>jms-mdb</module>-->
+                <module>jaxws-calculator</module>
+                <module>jms-mdb</module>
                 <module>ldap-sample-app</module>
-                <!--<module>myphonebook</module>-->
-                <!--<module>mytime</module>-->
-                <!--<module>sendmail</module>-->
+                <module>myphonebook</module>
+                <module>mytime</module>
+                <module>sendmail</module>
                 <module>timereport</module>
                 <module>jsp-examples</module>
                 <module>servlet-examples</module>
                 <!--<module>app-per-port</module>-->
                 <!--<module>csa-activemq</module>-->
-                <!--<module>DataCDInfo</module>-->
+                <module>DataCDInfo</module>
             </modules>
         </profile>
         <profile>



Mime
View raw message