You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2011/05/19 07:45:08 UTC
svn commit: r1124541 - in /geronimo/samples/trunk/samples: ./
all-samples/all-samples-jetty/ all-samples/all-samples-tomcat/
javaee5/DataCDInfo/ javaee6/
javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/
javaee6/restfulorder-javaee6/restfulorder...
Author: xiaming
Date: Thu May 19 05:45:07 2011
New Revision: 1124541
URL: http://svn.apache.org/viewvc?rev=1124541&view=rev
Log:
Reenable some comment-out samples, second commit
Modified:
geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
geronimo/samples/trunk/samples/javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/pom.xml
Modified: geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml Thu May 19 05:45:07 2011
@@ -45,7 +45,7 @@
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>bank-jetty</artifactId>
<version>${project.version}</version>
@@ -64,7 +64,7 @@
<artifactId>customer-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -80,7 +80,7 @@
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator-jetty</artifactId>
<version>${project.version}</version>
@@ -92,7 +92,7 @@
<artifactId>jms-mdb-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -108,7 +108,7 @@
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-jetty</artifactId>
<version>${project.version}</version>
@@ -120,14 +120,14 @@
<artifactId>mytime-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sendmail-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -174,7 +174,7 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>webfragment-javaee6-jetty</artifactId>
<version>${project.version}</version>
@@ -203,7 +203,7 @@
<artifactId>restfulorder-javaee6-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<!--Daytrader
<dependency>
Modified: geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml Thu May 19 05:45:07 2011
@@ -53,7 +53,7 @@
<type>car</type>
</dependency>-->
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>bank-tomcat</artifactId>
<version>${project.version}</version>
@@ -72,7 +72,7 @@
<artifactId>customer-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -88,7 +88,7 @@
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator-tomcat</artifactId>
<version>${project.version}</version>
@@ -100,7 +100,7 @@
<artifactId>jms-mdb-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -116,7 +116,7 @@
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-tomcat</artifactId>
<version>${project.version}</version>
@@ -128,14 +128,14 @@
<artifactId>mytime-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sendmail-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -181,7 +181,7 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>webfragment-javaee6-tomcat</artifactId>
<version>${project.version}</version>
@@ -210,7 +210,7 @@
<artifactId>restfulorder-javaee6-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
- </dependency>-->
+ </dependency>
<!--Daytrader
<dependency>
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml Thu May 19 05:45:07 2011
@@ -62,8 +62,9 @@
<module>DataCDInfo-JTA-ejb</module>
<module>DataCDInfo-JTA-war</module>
<module>DataCDInfo-JTA-ear</module>
+ <!-- https://issues.apache.org/jira/browse/GERONIMO-5965
<module>DataCDInfo-JTA-jetty</module>
- <module>DataCDInfo-JTA-tomcat</module>
+ <module>DataCDInfo-JTA-tomcat</module>-->
</modules>
</profile>
<profile>
Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Thu May 19 05:45:07 2011
@@ -142,12 +142,11 @@
<module>converter-javaee6</module>
<module>jarresource-javaee6</module>
<module>fileupload-javaee6</module>
- <!--<module>webfragment-javaee6</module>-->
- <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
- <!--<module>jpa20demo-javaee6</module>
+ <module>webfragment-javaee6</module>
+ <module>jpa20demo-javaee6</module>
<module>ejbtimer-javaee6</module>
<module>singletonejb-javaee6</module>
- <module>restfulorder-javaee6</module>-->
+ <module>restfulorder-javaee6</module>
</modules>
</profile>
<profile>
@@ -165,12 +164,11 @@
<module>converter-javaee6</module>
<module>jarresource-javaee6</module>
<module>fileupload-javaee6</module>
- <!--<module>webfragment-javaee6</module>-->
- <!--EJB 3.1 and JPA 2.0 samples, not work for 3.0-M1 yet-->
- <!--<module>jpa20demo-javaee6</module>
+ <module>webfragment-javaee6</module>
+ <module>jpa20demo-javaee6</module>
<module>ejbtimer-javaee6</module>
<module>singletonejb-javaee6</module>
- <module>restfulorder-javaee6</module>-->
+ <module>restfulorder-javaee6</module>
</modules>
</profile>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml Thu May 19 05:45:07 2011
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>cviewer-javaee6-war</artifactId>
+ <artifactId>restfulorder-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
@@ -75,6 +75,14 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>wink-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -97,6 +105,7 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
<deploymentConfig>${jpaDeployer}</deploymentConfig>
+ <deploymentConfig>${winkDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml Thu May 19 05:45:07 2011
@@ -39,14 +39,14 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>cviewer-javaee6-war</artifactId>
+ <artifactId>restfulorder-javaee6-war</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -75,7 +75,14 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>wink-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -98,6 +105,7 @@
<deploymentConfig>${jasperDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
<deploymentConfig>${jpaDeployer}</deploymentConfig>
+ <deploymentConfig>${winkDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.samples</groupId>
Modified: geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml Thu May 19 05:45:07 2011
@@ -35,6 +35,19 @@
<packaging>war</packaging>
<description>Geronimo Samples. WEB Module</description>
+
+ <!--<dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>wink</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>-->
<dependencies>
<dependency>
@@ -48,9 +61,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
- <version>1.5.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml Thu May 19 05:45:07 2011
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml Thu May 19 05:45:07 2011
@@ -57,9 +57,8 @@
<module>fragment2</module>
<module>fragment3</module>
<module>webfragment-javaee6-war</module>
- <!-- Plugin cannot be made caused by GERONIMO-5398 -->
- <!-- <module>webfragment-javaee6-tomcat</module>
- <module>webfragment-javaee6-jetty</module>-->
+ <module>webfragment-javaee6-tomcat</module>
+ <module>webfragment-javaee6-jetty</module>
</modules>
</profile>
<profile>
Modified: geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml Thu May 19 05:45:07 2011
@@ -30,7 +30,7 @@
<version>3.0-SNAPSHOT</version>
</parent>
- <artifactId>wefFragment-javaee6-tomcat</artifactId>
+ <artifactId>webfragment-javaee6-tomcat</artifactId>
<name>Geronimo Samples :: webfragment-javaee6 Plugin for Tomcat</name>
<packaging>car</packaging>
Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=1124541&r1=1124540&r2=1124541&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Thu May 19 05:45:07 2011
@@ -47,6 +47,7 @@
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${geronimoVersion}/car</jpaDeployer>
<myfacesDeployer>org.apache.geronimo.configs/myfaces-deployer/${geronimoVersion}/car</myfacesDeployer>
<ariesDeployer>org.apache.geronimo.configs/aries-deployer/${geronimoVersion}/car</ariesDeployer>
+ <winkDeployer>org.apache.geronimo.configs/wink-deployer/${project.version}/car</winkDeployer>
</properties>
<build>