You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/06/10 08:49:07 UTC
svn commit: r953225 - in /geronimo/samples/branches/2.2/samples/DataCDInfo:
./ DataCDInfo-JTA-jetty/ DataCDInfo-JTA-jetty/src/main/history/
DataCDInfo-JTA-jetty/src/main/plan/ DataCDInfo-JTA-tomcat/
DataCDInfo-JTA-tomcat/src/main/history/ DataCDInfo-JT...
Author: xuhaihong
Date: Thu Jun 10 06:49:07 2010
New Revision: 953225
URL: http://svn.apache.org/viewvc?rev=953225&view=rev
Log:
Make the car-maven-plugin work for the sample
Modified:
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.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/history/dependencies.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml
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=953225&r1=953224&r2=953225&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 Jun 10 06:49:07 2010
@@ -43,6 +43,7 @@
<artifactId>DataCDInfo-JTA-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -84,6 +85,41 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>${jetty}</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
</dependencies>
<build>
@@ -95,8 +131,6 @@
</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>
@@ -122,13 +156,6 @@
<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/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml?rev=953225&r1=953224&r2=953225&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml Thu Jun 10 06:49:07 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-jetty</artifactId>
@@ -7,8 +7,28 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-ear</artifactId>
- <type>ear</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty7</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <type>car</type>
</dependency>
</plugin-artifact>
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=953225&r1=953224&r2=953225&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 Jun 10 06:49:07 2010
@@ -17,22 +17,6 @@
-->
<application application-name="DataCDInfo-JTA"
xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.samples</dep:groupId>
- <dep:artifactId>DataCDInfoJTA</dep:artifactId>
- <dep:version>1.0</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>system-database</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- </dep:environment>
-
<module>
<ejb>DataCDInfo-JTA-ejb.jar</ejb>
<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
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=953225&r1=953224&r2=953225&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 Jun 10 06:49:07 2010
@@ -43,8 +43,9 @@
<artifactId>DataCDInfo-JTA-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -84,6 +85,41 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
</dependencies>
<build>
@@ -95,8 +131,6 @@
</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>
@@ -122,15 +156,7 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml?rev=953225&r1=953224&r2=953225&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml Thu Jun 10 06:49:07 2010
@@ -1,14 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
- <module-id>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-tomcat</artifactId>
- <version>2.2</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-ear</artifactId>
- <type>ear</type>
- </dependency>
-</plugin-artifact>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+ <module-id>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-tomcat</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
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=953225&r1=953224&r2=953225&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 Jun 10 06:49:07 2010
@@ -17,22 +17,6 @@
-->
<application application-name="DataCDInfo-JTA"
xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.samples</dep:groupId>
- <dep:artifactId>DataCDInfoJTA</dep:artifactId>
- <dep:version>1.0</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>system-database</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- </dep:environment>
-
<module>
<ejb>DataCDInfo-JTA-ejb.jar</ejb>
<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
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=953225&r1=953224&r2=953225&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/pom.xml Thu Jun 10 06:49:07 2010
@@ -39,9 +39,9 @@
</description>
<modules>
- <module>DataCDInfo-JTA-ejb</module>
+ <module>DataCDInfo-JTA-ejb</module>
<module>DataCDInfo-JTA-war</module>
- <module>DataCDInfo-JTA-ear</module>
+ <module>DataCDInfo-JTA-ear</module>
<module>DataCDInfo-JTA-jetty</module>
<module>DataCDInfo-JTA-tomcat</module>
</modules>