You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/01/21 10:27:50 UTC
svn commit: r901612 - in /geronimo/samples/branches/2.2/samples/DataCDInfo:
./ DataCDInfo-JTA-ear/ DataCDInfo-JTA-ear/src/main/resources/META-INF/
DataCDInfo-JTA-ejb/ DataCDInfo-JTA-ejb/src/main/resources/META-INF/
DataCDInfo-JTA-jetty/ DataCDInfo-JTA-...
Author: delos
Date: Thu Jan 21 09:26:53 2010
New Revision: 901612
URL: http://svn.apache.org/viewvc?rev=901612&view=rev
Log:
Correct some version info in DataCDInfo pom files, patch provided by Forrest
Modified:
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml Thu Jan 21 09:26:53 2010
@@ -21,11 +21,10 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo</artifactId>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>2.2.1-SNAPSHOT</version>
<name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: EAR</name>
<packaging>ear</packaging>
@@ -45,7 +44,7 @@
<artifactId>DataCDInfo-JTA-ejb</artifactId>
<version>${version}</version>
<type>ejb</type>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -66,7 +65,7 @@
<webModule>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-war</artifactId>
- <contextRoot>/DataCDInfoJTAStruts1</contextRoot>
+ <contextRoot>/DataCDInfo</contextRoot>
<bundleFileName>DataCDInfo-JTA-war.war</bundleFileName>
</webModule>
</modules>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml Thu Jan 21 09:26:53 2010
@@ -21,7 +21,7 @@
<module>
<web>
<web-uri>DataCDInfo-JTA-war.war</web-uri>
- <context-root>DataCDInfoJTAStruts1</context-root>
+ <context-root>DataCDInfo</context-root>
</web>
</module>
<module>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml Thu Jan 21 09:26:53 2010
@@ -21,14 +21,19 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.samples</dep:groupId>
<dep:artifactId>DataCDInfoJTA</dep:artifactId>
- <dep:version>1.0</dep:version>
+ <dep:version>${version}</dep:version>
<dep:type>car</dep:type>
</dep:moduleId>
- <dep:dependencies>
+ <dep:dependencies>
+ <!--By default, DataCDInfo sample uses derby. To use MySQL as database, you need to:
+ 1. install this dependency to geronimo library via administrative console
+ 2. rename this file to geronimo-application.xml
+ 3. make a build
+ -->
<dep:dependency>
<dep:groupId>mysql</dep:groupId>
<dep:artifactId>mysql-connector-java</dep:artifactId>
- <dep:version>5.1.7</dep:version>
+ <dep:version>5.1.10</dep:version>
<dep:type>jar</dep:type>
</dep:dependency>
</dep:dependencies>
@@ -46,6 +51,13 @@
</persistence-unit>
</persistence>
</openejb-jar>
+ </module>
+ <module>
+ <web>DataCDInfo-JTA-war.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <context-root>/DataCDInfo</context-root>
+ <security-realm-name>geronimo-admin</security-realm-name>
+ </web-app>
</module>
<ext-module>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml Thu Jan 21 09:26:53 2010
@@ -21,7 +21,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.samples</dep:groupId>
<dep:artifactId>DataCDInfoJTA</dep:artifactId>
- <dep:version>1.0</dep:version>
+ <dep:version>${version}</dep:version>
<dep:type>car</dep:type>
</dep:moduleId>
<dep:dependencies>
@@ -45,6 +45,13 @@
</persistence-unit>
</persistence>
</openejb-jar>
+ </module>
+ <module>
+ <web>DataCDInfo-JTA-war.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <context-root>/DataCDInfo</context-root>
+ <security-realm-name>geronimo-admin</security-realm-name>
+ </web-app>
</module>
<ext-module>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml Thu Jan 21 09:26:53 2010
@@ -21,11 +21,10 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo</artifactId>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>DataCDInfo-JTA-ejb</artifactId>
- <version>2.2.1-SNAPSHOT</version>
<name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: EJB</name>
<packaging>jar</packaging>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml Thu Jan 21 09:26:53 2010
@@ -26,7 +26,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.samples</dep:groupId>
<dep:artifactId>DataCDInfo-JTA-ejb</dep:artifactId>
- <dep:version>1.0</dep:version>
+ <dep:version>${version}</dep:version>
<dep:type>car</dep:type>
</dep:moduleId>
</dep:environment>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml Thu Jan 21 09:26:53 2010
@@ -32,7 +32,6 @@
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-jetty</artifactId>
- <version>2.2.1-SNAPSHOT</version>
<name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Jetty</name>
<packaging>car</packaging>
@@ -96,6 +95,8 @@
</resources>
<plugins>
+ <!--Because JIRA https://issues.apache.org/jira/browse/GERONIMO-5020, the plugin build is actually failed
+ So skip its deployment -->
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
@@ -111,7 +112,7 @@
<module>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>2.2</version>
+ <version>${version}</version>
<type>ear</type>
</module>
<useMavenDependencies>
@@ -121,6 +122,13 @@
<category>Sample</category>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml Thu Jan 21 09:26:53 2010
@@ -45,6 +45,12 @@
</persistence-unit>
</persistence>
</openejb-jar>
+ </module>
+ <module>
+ <web>DataCDInfo-JTA-war.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <security-realm-name>geronimo-admin</security-realm-name>
+ </web-app>
</module>
<ext-module>
@@ -123,9 +129,9 @@
</security>
<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
- <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
- <reference name="DataSource">
- <name>jdbc/NoTxDataCDInfoDS</name>
- </reference>
- </gbean>
+ <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
+ <reference name="DataSource">
+ <name>jdbc/NoTxDataCDInfoDS</name>
+ </reference>
+ </gbean>
</application>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml Thu Jan 21 09:26:53 2010
@@ -27,12 +27,11 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo</artifactId>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-tomcat</artifactId>
- <version>2.2.1-SNAPSHOT</version>
<name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Tomcat</name>
<packaging>car</packaging>
@@ -96,6 +95,8 @@
</resources>
<plugins>
+ <!--Because JIRA https://issues.apache.org/jira/browse/GERONIMO-5020, the plugin build is actually failed
+ So skip its deployment -->
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
@@ -111,7 +112,7 @@
<module>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>2.2</version>
+ <version>${version}</version>
<type>ear</type>
</module>
<useMavenDependencies>
@@ -121,6 +122,13 @@
<category>Sample</category>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml Thu Jan 21 09:26:53 2010
@@ -45,6 +45,12 @@
</persistence-unit>
</persistence>
</openejb-jar>
+ </module>
+ <module>
+ <web>DataCDInfo-JTA-war.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <security-realm-name>geronimo-admin</security-realm-name>
+ </web-app>
</module>
<ext-module>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml Thu Jan 21 09:26:53 2010
@@ -21,11 +21,10 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo</artifactId>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>DataCDInfo-JTA-war</artifactId>
- <version>2.2.1-SNAPSHOT</version>
<name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: WAR</name>
<packaging>war</packaging>
@@ -85,12 +84,7 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.10</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
@@ -229,6 +223,14 @@
<include>META-INF/DISCLAIMER*</include>
</includes>
</resource>
+ <resource>
+ <directory>${pom.basedir}/src/main/webapp/WEB-INF</directory>
+ <targetPath>WEB-INF</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </resource>
</webResources>
</configuration>
</plugin>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jan 21 09:26:53 2010
@@ -27,8 +27,8 @@
<dep:environment>
<dep:moduleId>
<dep:groupId>org.apache.geronimo.samples</dep:groupId>
- <dep:artifactId>DataCDInfo</dep:artifactId>
- <dep:version>1.0</dep:version>
+ <dep:artifactId>DataCDInfo-JTA-war</dep:artifactId>
+ <dep:version>${version}</dep:version>
<dep:type>car</dep:type>
</dep:moduleId>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml?rev=901612&r1=901611&r2=901612&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml Thu Jan 21 09:26:53 2010
@@ -33,7 +33,6 @@
<artifactId>DataCDInfo</artifactId>
<name>Geronimo Samples :: DataCDInfo</name>
<packaging>pom</packaging>
- <version>2.2</version>
<description>
Geronimo DataCDInfo sample created from an archetype.