You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/09/16 22:35:52 UTC
svn commit: r696044 - in /geronimo/samples/branches/2.1/samples: ./
bank/bank-war/ customer/customer-war/ dbtester/dbtester-war/
inventory/inventory-war/ jms-mdb/jms-mdb-war/
jsp-examples/jsp-examples-war/ myphonebook/myphonebook-war/
mytime/mytime-war...
Author: jbohn
Date: Tue Sep 16 13:35:52 2008
New Revision: 696044
URL: http://svn.apache.org/viewvc?rev=696044&view=rev
Log:
update poms to match release processing format when doing release:prepare
Modified:
geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml
geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml
geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml
geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml
geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml
geronimo/samples/branches/2.1/samples/pom.xml
geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml
geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml
geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml
Modified: geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -84,7 +84,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -61,7 +61,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -79,7 +79,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -52,7 +52,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -61,7 +61,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -49,58 +49,56 @@
<tasks>
<!-- Add sources for examples -->
<echo>Generating view source html files based on .java and .jsp files</echo>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
- <echo message="plugin classpath: ${plugin_classpath}"/>
- <taskdef name="txt2html"
- classname="org.apache.geronimo.samples.buildutil.Txt2Html"
- classpath="${plugin_classpath}" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <echo message="plugin classpath: ${plugin_classpath}" />
+ <taskdef name="txt2html" classname="org.apache.geronimo.samples.buildutil.Txt2Html" classpath="${plugin_classpath}" />
<txt2html todir="src/main/webapp/jsp2/simpletag">
<fileset dir="src/main/java/jsp2/examples">
- <include name="BookBean.java"/>
+ <include name="BookBean.java" />
</fileset>
<fileset dir="src/main/java/jsp2/examples/simpletag">
- <include name="FindBookSimpleTag.java"/>
- <include name="RepeatSimpleTag.java"/>
- <include name="HelloWorldSimpleTag.java"/>
+ <include name="FindBookSimpleTag.java" />
+ <include name="RepeatSimpleTag.java" />
+ <include name="HelloWorldSimpleTag.java" />
</fileset>
<fileset dir="src/main/java/jsp2/examples/el">
- <include name="Functions.java"/>
+ <include name="Functions.java" />
</fileset>
</txt2html>
<txt2html todir="src/main/webapp/jsp2/jspattribute">
<fileset dir="src/main/java/jsp2/examples">
- <include name="FooBean.java"/>
+ <include name="FooBean.java" />
</fileset>
<fileset dir="src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag">
- <include name="ShuffleSimpleTag.java"/>
- <include name="TileSimpleTag.java"/>
- <include name="HelloWorldSimpleTag.java"/>
+ <include name="ShuffleSimpleTag.java" />
+ <include name="TileSimpleTag.java" />
+ <include name="HelloWorldSimpleTag.java" />
</fileset>
</txt2html>
<txt2html todir="src/main/webapp/cal">
<fileset dir="src/main/webapp/WEB-INF/classes/cal">
- <include name="Entries.java"/>
- <include name="Entry.java"/>
- <include name="JspCalendar.java"/>
- <include name="TableBean.java"/>
+ <include name="Entries.java" />
+ <include name="Entry.java" />
+ <include name="JspCalendar.java" />
+ <include name="TableBean.java" />
</fileset>
</txt2html>
<txt2html todir="src/main/webapp/jsptoserv">
<fileset dir="src/main/webapp/WEB-INF/classes">
- <include name="servletToJsp.java"/>
+ <include name="servletToJsp.java" />
</fileset>
</txt2html>
<txt2html todir="src/main/webapp/jsp2/misc">
<fileset dir="src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag">
- <include name="EchoAttributesTag.java"/>
+ <include name="EchoAttributesTag.java" />
</fileset>
</txt2html>
@@ -117,14 +115,14 @@
<include name="**/*.jsp" />
<include name="**/*.jspx" />
<include name="**/*.jspf" />
- <exclude name="error/errorpge.jsp"/>
- <exclude name="forward/one.jsp"/>
- <exclude name="include/foo.jsp"/>
- <exclude name="jsptoserv/hello.jsp"/>
- <exclude name="security/protected/error.jsp"/>
- <exclude name="security/protected/index.jsp"/>
- <exclude name="security/protected/login.jsp"/>
- <exclude name="source.jsp"/>
+ <exclude name="error/errorpge.jsp" />
+ <exclude name="forward/one.jsp" />
+ <exclude name="include/foo.jsp" />
+ <exclude name="jsptoserv/hello.jsp" />
+ <exclude name="security/protected/error.jsp" />
+ <exclude name="security/protected/index.jsp" />
+ <exclude name="security/protected/login.jsp" />
+ <exclude name="source.jsp" />
</fileset>
</txt2html>
</tasks>
@@ -140,23 +138,16 @@
<tasks>
<!-- Remove sources for examples from /src - they have already been included in the war -->
<echo>Remove view source html files based on .java and .jsp files from src</echo>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
- <echo message="plugin classpath: ${plugin_classpath}"/>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <echo message="plugin classpath: ${plugin_classpath}" />
<delete>
- <fileset dir="src/main/webapp/jsp2/simpletag"
- includes="**/*.java.html"/>
- <fileset dir="src/main/webapp/jsp2/jspattribute"
- includes="**/*.java.html"/>
- <fileset dir="src/main/webapp/cal"
- includes="**/*.java.html"/>
- <fileset dir="src/main/webapp/jsptoserv"
- includes="**/*.java.html"/>
- <fileset dir="src/main/webapp/jsp2/misc"
- includes="**/*.java.html"/>
- <fileset dir="src/main/webapp/jsp2/tagfiles"
- includes="**/*.tag.html"/>
- <fileset dir="src/main/webapp"
- includes="**/*.jsp.html,**/*.jspx.html,**/*.jspf.html"/>
+ <fileset dir="src/main/webapp/jsp2/simpletag" includes="**/*.java.html" />
+ <fileset dir="src/main/webapp/jsp2/jspattribute" includes="**/*.java.html" />
+ <fileset dir="src/main/webapp/cal" includes="**/*.java.html" />
+ <fileset dir="src/main/webapp/jsptoserv" includes="**/*.java.html" />
+ <fileset dir="src/main/webapp/jsp2/misc" includes="**/*.java.html" />
+ <fileset dir="src/main/webapp/jsp2/tagfiles" includes="**/*.tag.html" />
+ <fileset dir="src/main/webapp" includes="**/*.jsp.html,**/*.jspx.html,**/*.jspf.html" />
</delete>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -61,7 +61,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -61,7 +61,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Tue Sep 16 13:35:52 2008
@@ -223,7 +223,7 @@
<version>2.0.1</version>
<reportSets>
<reportSet>
- <reports/>
+ <reports />
</reportSet>
</reportSets>
</plugin>
@@ -321,21 +321,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>
Modified: geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml Tue Sep 16 13:35:52 2008
@@ -19,18 +19,23 @@
-->
<!-- $Rev$ $Date$ -->
-<project>
+<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>
<artifactId>samples</artifactId>
<groupId>org.apache.geronimo.samples</groupId>
<version>2.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sample-datasource</artifactId>
<packaging>car</packaging>
<name>Geronimo Samples :: sample-datasource</name>
+
<description>Geronimo Samples. sample-datasource plugin</description>
+
<dependencies>
<dependency>
<groupId>org.tranql</groupId>
@@ -67,6 +72,7 @@
<version>${geronimoVersion}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -55,7 +55,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>
Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml?rev=696044&r1=696043&r2=696044&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml Tue Sep 16 13:35:52 2008
@@ -55,7 +55,7 @@
<tasks>
<echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs"/>
+ <fileset dir="${pom.basedir}/../docs" />
</copy>
</tasks>
</configuration>