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 2010/04/13 11:19:00 UTC
svn commit: r933525 - in /geronimo/samples/trunk/samples: ./ javaee5/
javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/ javaee6/
Author: xiaming
Date: Tue Apr 13 09:18:59 2010
New Revision: 933525
URL: http://svn.apache.org/viewvc?rev=933525&view=rev
Log:
Add resources filtering config to proper level of pom and update DataCDInfo using version filtering
Modified:
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/trunk/samples/javaee5/pom.xml
geronimo/samples/trunk/samples/javaee6/pom.xml
geronimo/samples/trunk/samples/pom.xml
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml?rev=933525&r1=933524&r2=933525&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml Tue Apr 13 09:18:59 2010
@@ -17,7 +17,7 @@
-->
<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:application="http://java.sun.com/xml/ns/javaee/application_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" id="Application_ID" version="5">
<display-name>
-DataCDInfo-JTA</display-name>
+${pom.name}</display-name>
<module>
<web>
<web-uri>DataCDInfo-JTA-war.war</web-uri>
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml?rev=933525&r1=933524&r2=933525&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml Tue Apr 13 09:18:59 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>
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml?rev=933525&r1=933524&r2=933525&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml Tue Apr 13 09:18:59 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>
Modified: geronimo/samples/trunk/samples/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/pom.xml?rev=933525&r1=933524&r2=933525&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/pom.xml Tue Apr 13 09:18:59 2010
@@ -120,13 +120,7 @@
<!-- Java EE 5 specs common for all samples -->
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
<pluginManagement>
<plugins>
<plugin>
Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=933525&r1=933524&r2=933525&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Tue Apr 13 09:18:59 2010
@@ -71,13 +71,7 @@
<!-- Java EE 6 specs common for all samples -->
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
<pluginManagement>
<plugins>
<plugin>
@@ -116,7 +110,8 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <modules>
+ <modules>
+ <module>cviewer-javaee6</module>
</modules>
</profile>
<profile>
@@ -128,7 +123,8 @@
<value>false</value>
</property>
</activation>
- <modules>
+ <modules>
+ <module>cviewer-javaee6</module>
</modules>
</profile>
</profiles>
Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=933525&r1=933524&r2=933525&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Tue Apr 13 09:18:59 2010
@@ -16,10 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.samples</groupId>
@@ -33,7 +30,18 @@
Geronimo Samples.
</description>
- <build>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <!--To filter config files in ear project-->
+ <resource>
+ <directory>${pom.basedir}/src/main/application</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<pluginManagement>
<plugins>
<plugin>
@@ -66,6 +74,14 @@
<include>META-INF/DISCLAIMER*</include>
</includes>
</resource>
+ <!--To filter config files in war project. For some reason, maven-war-plugin cannot handle common resources as above-->
+ <resource>
+ <directory>${pom.basedir}/src/main/webapp</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>*/*.xml</include>
+ </includes>
+ </resource>
</webResources>
</configuration>
</plugin>
@@ -158,21 +174,21 @@
<configuration>
<tasks>
<condition property="mvn.exe" value="mvn.bat" else="mvn">
- <os family="windows" />
+ <os family="windows"/>
</condition>
<exec executable="${mvn.exe}">
- <arg value="archetype:create" />
- <arg value="-DarchetypeGroupId=org.apache.geronimo.samples" />
- <arg value="-DarchetypeArtifactId=geronimo-samples-archetype" />
- <arg value="-DarchetypeVersion=${version}" />
- <arg value="-DartifactId=${sampleName}" />
- <arg value="-Dversion=${sampleVersion}" />
+ <arg value="archetype:create"/>
+ <arg value="-DarchetypeGroupId=org.apache.geronimo.samples"/>
+ <arg value="-DarchetypeArtifactId=geronimo-samples-archetype"/>
+ <arg value="-DarchetypeVersion=${version}"/>
+ <arg value="-DartifactId=${sampleName}"/>
+ <arg value="-Dversion=${sampleVersion}"/>
</exec>
- <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear" />
- <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb" />
- <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war" />
- <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty" />
- <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat" />
+ <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear"/>
+ <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb"/>
+ <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war"/>
+ <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty"/>
+ <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat"/>
</tasks>
</configuration>
<goals>
@@ -213,5 +229,5 @@
<module>daytrader</module>
</modules>
</profile>
- </profiles>
+ </profiles>
</project>