empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rei...@apache.org
Subject svn commit: r685880 - in /incubator/empire-db/trunk: core/DBSample/ core/DBSampleAdv/ core/Empire-db/ core/Empire-db/lib/ struts2-ext/DBWebSample/ struts2-ext/DBWebSample/.settings/ struts2-ext/Empire-struts2-ext/
Date Thu, 14 Aug 2008 13:10:27 GMT
Author: reiher
Date: Thu Aug 14 06:10:23 2008
New Revision: 685880

URL: http://svn.apache.org/viewvc?rev=685880&view=rev
Log:
refactored buildRelease.xml so the release name/release jar name can be set in one place (except
for javadoc)

Added:
    incubator/empire-db/trunk/core/Empire-db/KEYS
    incubator/empire-db/trunk/core/Empire-db/lib/commons-collections-3.2.1.jar   (with props)
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/KEYS
Removed:
    incubator/empire-db/trunk/core/Empire-db/lib/commons-collections-2.1.1.jar
Modified:
    incubator/empire-db/trunk/core/DBSample/classpath_delivery-version
    incubator/empire-db/trunk/core/DBSampleAdv/classpath_delivery-version
    incubator/empire-db/trunk/core/Empire-db/.classpath
    incubator/empire-db/trunk/core/Empire-db/build.xml
    incubator/empire-db/trunk/core/Empire-db/buildRelease.xml
    incubator/empire-db/trunk/core/Empire-db/javadoc.xml
    incubator/empire-db/trunk/struts2-ext/DBWebSample/.settings/org.eclipse.wst.common.component
    incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin
    incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version
    incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/build.xml
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/buildRelease.xml
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/javadoc.xml

Modified: incubator/empire-db/trunk/core/DBSample/classpath_delivery-version
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/DBSample/classpath_delivery-version?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/DBSample/classpath_delivery-version (original)
+++ incubator/empire-db/trunk/core/DBSample/classpath_delivery-version Thu Aug 14 06:10:23
2008
@@ -4,9 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/hsqldb.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
-	<classpathentry kind="lib" path="lib/empire-db-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/@empire.db.deploy.jar.name@.jar"/>
 	<classpathentry kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file

Modified: incubator/empire-db/trunk/core/DBSampleAdv/classpath_delivery-version
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/DBSampleAdv/classpath_delivery-version?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/DBSampleAdv/classpath_delivery-version (original)
+++ incubator/empire-db/trunk/core/DBSampleAdv/classpath_delivery-version Thu Aug 14 06:10:23
2008
@@ -4,9 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/hsqldb.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
-	<classpathentry kind="lib" path="lib/empire-db-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/@empire.db.deploy.jar.name@.jar"/>
 	<classpathentry kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file

Modified: incubator/empire-db/trunk/core/Empire-db/.classpath
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/.classpath?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/.classpath (original)
+++ incubator/empire-db/trunk/core/Empire-db/.classpath Thu Aug 14 06:10:23 2008
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections-2.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="D:/DevTools/Frameworks/commons-beanutils-1.7.0-src/src/java">
 		<attributes>

Added: incubator/empire-db/trunk/core/Empire-db/KEYS
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/KEYS?rev=685880&view=auto
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/KEYS (added)
+++ incubator/empire-db/trunk/core/Empire-db/KEYS Thu Aug 14 06:10:23 2008
@@ -0,0 +1,31 @@
+pub   1024D/AE5BC905 2008-08-13
+uid                  Jörg Reiher (CODE SIGNING KEY) <reiher@apache.org>
+sig 3        AE5BC905 2008-08-13  Jörg Reiher (CODE SIGNING KEY) <reiher@apache.org>
+sub   1024g/72B89B1E 2008-08-13
+sig          AE5BC905 2008-08-13  Jörg Reiher (CODE SIGNING KEY) <reiher@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (MingW32)
+
+mQGiBEii0IYRBADfTMIH8W5/3mn+RvFDjjUYGNDRxxyhVlevhAml7KwnMIVMKRBx
+T8OcWPbBE+DQIQWmYdCJR0wNfKGWl14dq1gI8gmgZI8ES/4izysOZwNNDTGzEzPX
+bZvO1HdYQMkCk0rGNcTmuI3L5Dq07BzKC99uDhG2C7r00vk7O/IVvlURbwCg4Gl/
+c3B5dae5PogiOiiEfQn3VtkD/1XcxpDPmEs04SUjjM88BkpnwOjHt1juMYXg9Bwm
+TVbTPyowDVtNrFHETrg2AQ1IPXkB+aA22yPmbpu6qG9UmOnMSuq0ENc9472+nlvW
+IXBxmHcMJPsD2iDUSDKzUCb5LCBAuRLdZyhP11kDcNGKJVErsFu37RYpsH9Sdwed
+OC6aBACeBWLiguZERDVg5TgzSsX6plngKqMdRe9zZN8mb3uvf5L7dl2Y2CtZ1tfo
+TZFxBWlsP/lT0BBSh9nolpgkR2GGn6SwVuEyKgmX7pSfxvuEN2sC2NXBwKiOlKoD
+xhZd/mAizM8cD/smPC3uuqwyQcPUxGPKKmHL0hdaFFWW8Ga2NLQzSsO2cmcgUmVp
+aGVyIChDT0RFIFNJR05JTkcgS0VZKSA8cmVpaGVyQGFwYWNoZS5vcmc+iGAEExEC
+ACAFAkii0IYCGyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBkxsbNrlvJBagA
+AJkBVO+nxA5sW5gclyBEWe0RWCTgAgCgttPrboRhgJC0xpfXJnCDKfmnPp65AQ0E
+SKLQjhAEAIc1Iuq81w8bQyk0HdopQLtwWoz1DgAszUITb+RHm7XgMPhCE0f7FdUx
+nWFz0yKaYk/5UvhMm+pc+FbFw7gDCj74LUJsL8cYiNzmAXObnIgggW1YcJvrmzRF
+o0Ici0Mfov7mIK+9HLq6+Oxl992sbUVmOvOhgcHxO86DDTfgUq5jAAMFA/wK1x1U
+EMqvjDYHy/22Y8ui9Dpm9oxIEm4Z7krA5Ujt9TiaVFG+7rhaAVoA9xSHfCSFIawZ
+ge8G8GpzefYioIgooaJkCKaHbJriAVhx+hymSpWko89KUPr9PNXLi90DT1RUg5b0
+sX4MKK1cg9tkJscIYjCXOz0DS9kfCy8GNp0UsYhJBBgRAgAJBQJIotCOAhsMAAoJ
+EGTGxs2uW8kFktgAn3bwTweJpebH0RuDMcT8opm3CTCVAJ0bexIbIkmtW9GzxCYv
+vJet3CydZA==
+=Eh6F
+-----END PGP PUBLIC KEY BLOCK-----

Modified: incubator/empire-db/trunk/core/Empire-db/build.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/build.xml?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/build.xml (original)
+++ incubator/empire-db/trunk/core/Empire-db/build.xml Thu Aug 14 06:10:23 2008
@@ -52,7 +52,7 @@
 	    <javac srcdir="${src.dir}" destdir="${out.dir}" listfiles="false" debug="on">
 	    	<classpath>
 	    		<pathelement location="${lib.dir}/commons-beanutils-1.7.0.jar"/>
-	    		<pathelement location="${lib.dir}/commons-collections-2.1.1.jar"/>
+	    		<pathelement location="${lib.dir}/commons-collections-3.2.1.jar"/>
 	    		<pathelement location="${lib.dir}/commons-logging-1.0.4.jar"/>	
 	    		<pathelement location="${lib.dir}/log4j-1.2.14.jar"/>	
 			</classpath>

Modified: incubator/empire-db/trunk/core/Empire-db/buildRelease.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/buildRelease.xml?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/buildRelease.xml (original)
+++ incubator/empire-db/trunk/core/Empire-db/buildRelease.xml Thu Aug 14 06:10:23 2008
@@ -19,42 +19,47 @@
  * under the License.
  */
  --> 
-<project name="buildRelease" default="build" basedir=".">
+<project name="buildEmpireDb" default="build" basedir=".">
 	<description>Builds the download folder</description>
 	<!-- set properties for this build -->
-	<property name="src.dir" location="src"/>
-	<property name="lib.dir" location="lib"/>
-	<property name="deploy.dir" location="../deploy"/>
-	<property name="this.deploy.dir" location="${deploy.dir}/empire-db-2.0.3-incubating"/>
-	<property name="out.dir" location="${this.deploy.dir}/out"/>
-	<property name="lib.deploy.dir" location="${this.deploy.dir}/lib" />
-	<property name="src.deploy.dir" location="${this.deploy.dir}/src" />
-	<property name="examples.deploy.dir" location="${this.deploy.dir}/examples" />
-	<property name="jar.version.file" location="${this.deploy.dir}/empire-db-2.0.3-incubating.jar"/>
+	<property name="empire.db.deploy.jar.name" value="empire-db-2.0.3" />
+	<property name="empire.db.deploy.name" value="apache-empire-db-2.0.3-incubating" />
+	
+	<property name="empire.db.src.dir" location="src"/>
+	<property name="empire.db.lib.dir" location="lib"/>
+	<property name="empire.db.deploy.dir" location="../deploy"/>
+	<property name="empire.db.this.deploy.dir" location="${empire.db.deploy.dir}/${empire.db.deploy.name}"/>
+	<property name="empire.db.out.dir" location="${empire.db.this.deploy.dir}/out"/>
+	<property name="empire.db.lib.deploy.dir" location="${empire.db.this.deploy.dir}/lib"
/>
+	<property name="empire.db.src.deploy.dir" location="${empire.db.this.deploy.dir}/src"
/>
+	<property name="empire.db.examples.deploy.dir" location="${empire.db.this.deploy.dir}/examples"
/>
+	<property name="empire.db.jar.version.file" location="${empire.db.this.deploy.dir}/${empire.db.deploy.jar.name}.jar"/>
 	
 	<!-- 
 		target build
 	 -->
-	<target name="build" depends="clean,compile,jar,dependjars,copySourceFolder,generateJavadocs,createEclipseExample,miscellaneous,tidy"
/>
+	<target name="build" depends="clean,compile,jar,dependjars,copySourceFolder,generateJavadocs,createEclipseExample,miscellaneous,tidy,zip,tar"
/>
 	
 	<!-- 
 		target clean
 	 -->
 	<target name="clean" description="delete everything">
-		<delete dir="${this.deploy.dir}"/>
+		<delete dir="${empire.db.this.deploy.dir}"/>
+		<delete file="${empire.db.deploy.name}.zip" />
+		<delete file="${empire.db.deploy.name}.tar.gz" />
 	</target>
 	<!-- 
 		target compile
 	 -->
 	<target name="compile" description="delete class folder, compiling all source files of
the packages">
-		<delete dir="${this.deploy.dir}"/>
-		<mkdir dir="${this.deploy.dir}"/>
-		<mkdir dir="${out.dir}" />
+		<delete dir="${empire.db.this.deploy.dir}"/>
+		<mkdir dir="${empire.db.this.deploy.dir}"/>
+		<mkdir dir="${empire.db.out.dir}" />
 		
-	    <javac srcdir="${src.dir}" destdir="${out.dir}" listfiles="false" debug="on">
+	    <javac srcdir="${empire.db.src.dir}" destdir="${empire.db.out.dir}" listfiles="false"
debug="on">
 	    	<classpath>
 	    		<path>
-	    			<fileset dir="${lib.dir}"/>
+	    			<fileset dir="${empire.db.lib.dir}"/>
 	    		</path>
 			</classpath>
 		</javac>
@@ -63,9 +68,9 @@
 		target jar
 	 -->
 	<target name="jar">
-		<jar destfile="${jar.version.file}" compress="true">
-			<fileset dir="${out.dir}" />
-			<fileset dir="${src.dir}" />
+		<jar destfile="${empire.db.jar.version.file}" compress="true">
+			<fileset dir="${empire.db.out.dir}" />
+			<fileset dir="${empire.db.src.dir}" />
 			<fileset dir="" includes="*.txt" />
 		</jar>
 	</target>
@@ -73,9 +78,9 @@
 		dependjars
 	 -->
 	<target name="dependjars" description="copy dependancies to deploy dir">
-		<mkdir dir="${lib.deploy.dir}"/>
-		<copy todir="${lib.deploy.dir}">
-			<fileset dir="${lib.dir}" includes="*.jar"/>		
+		<mkdir dir="${empire.db.lib.deploy.dir}"/>
+		<copy todir="${empire.db.lib.deploy.dir}">
+			<fileset dir="${empire.db.lib.dir}" includes="*.jar"/>		
 		</copy>
 	</target>
 	
@@ -83,9 +88,9 @@
 		copySourceFolder
 	 -->
 	 <target name="copySourceFolder" description="copies dependancies to deploy dir">
-		<mkdir dir="${src.deploy.dir}"/>
-		<copy todir="${src.deploy.dir}">
-	 		<fileset dir="${src.dir}" includes="**/*.*" />
+		<mkdir dir="${empire.db.src.deploy.dir}"/>
+		<copy todir="${empire.db.src.deploy.dir}">
+	 		<fileset dir="${empire.db.src.dir}" includes="**/*.*" />
 	 	</copy>
 	 </target>
 	 
@@ -93,9 +98,9 @@
 		createEclipseExample
 	 -->
 	 <target name="createEclipseExample" description="creates an Eclipse example">
-		<mkdir dir="${examples.deploy.dir}"/>
-	 	<concat destfile="${examples.deploy.dir}/readme.txt">For an Empire-db introcution
tutorial see tutorial.pdf in the DBSample subdirecotry.</concat>
-		<copy todir="${examples.deploy.dir}">
+		<mkdir dir="${empire.db.examples.deploy.dir}"/>
+	 	<concat destfile="${empire.db.examples.deploy.dir}/readme.txt">For an Empire-db
introcution tutorial see tutorial.pdf in the DBSample subdirecotry.</concat>
+		<copy todir="${empire.db.examples.deploy.dir}">
 	 		<fileset dir="../" includes="DBSample/**/*.*" >
 	 			<exclude name="**/.settings/**" />
 	 			<exclude name="**/build.xml" />
@@ -106,8 +111,8 @@
 				<include name="DBSample/classpath_delivery-version"/>
 			</fileset>
 	 	</copy>
-	 	<move file="${examples.deploy.dir}/DBSample/classpath_delivery-version" tofile="${examples.deploy.dir}/DBSample/.classpath"
overwrite="true" />
-		<copy todir="${examples.deploy.dir}">
+	 	<move file="${empire.db.examples.deploy.dir}/DBSample/classpath_delivery-version" tofile="${empire.db.examples.deploy.dir}/DBSample/.classpath"
overwrite="true" />
+		<copy todir="${empire.db.examples.deploy.dir}">
 	 		<fileset dir="../" includes="DBSampleAdv/**/*.*" >
 	 			<exclude name="**/.settings/**" />
 	 			<exclude name="**/build.xml" />
@@ -118,23 +123,27 @@
 				<include name="DBSampleAdv/classpath_delivery-version"/>
 			</fileset>
 	 	</copy>
-	 	<move file="${examples.deploy.dir}/DBSampleAdv/classpath_delivery-version" tofile="${examples.deploy.dir}/DBSampleAdv/.classpath"
overwrite="true" />
-		<copy todir="${examples.deploy.dir}/DBSample/lib">
-			<fileset dir="${this.deploy.dir}/">
+	 	<move file="${empire.db.examples.deploy.dir}/DBSampleAdv/classpath_delivery-version"
tofile="${empire.db.examples.deploy.dir}/DBSampleAdv/.classpath" overwrite="true" />
+	 	<!-- Replace place holders by actual empire-db deploy jar name -->
+	 	<replace file="${empire.db.examples.deploy.dir}/DBSample/.classpath" token="@empire.db.deploy.jar.name@"
 value="${empire.db.deploy.jar.name}" />
+	 	<replace file="${empire.db.examples.deploy.dir}/DBSampleAdv/.classpath" token="@empire.db.deploy.jar.name@"
value="${empire.db.deploy.jar.name}" />
+	 	
+		<copy todir="${empire.db.examples.deploy.dir}/DBSample/lib">
+			<fileset dir="${empire.db.this.deploy.dir}/">
 				<include name="*.jar"/>
 			</fileset>
-			<fileset dir="${this.deploy.dir}/lib/">
+			<fileset dir="${empire.db.this.deploy.dir}/lib/">
 				<include name="*.jar"/>
 			</fileset>
 			<fileset dir="../JDBCDrivers/lib/">
 				<include name="hsqldb.jar"/>
 			</fileset>
 		</copy>
-		<copy todir="${examples.deploy.dir}/DBSampleAdv/lib">
-			<fileset dir="${this.deploy.dir}/">
+		<copy todir="${empire.db.examples.deploy.dir}/DBSampleAdv/lib">
+			<fileset dir="${empire.db.this.deploy.dir}/">
 				<include name="*.jar"/>
 			</fileset>
-			<fileset dir="${this.deploy.dir}/lib/">
+			<fileset dir="${empire.db.this.deploy.dir}/lib/">
 				<include name="*.jar"/>
 			</fileset>
 			<fileset dir="../JDBCDrivers/lib/">
@@ -154,19 +163,34 @@
 	 	miscellaneous
 	  -->
 	  <target name="miscellaneous">
-	  	<copy todir="${this.deploy.dir}">
-	  		<fileset dir=".">
+	  	<copy todir="${empire.db.deploy.dir}" file="KEYS" />	  		
+	  	<copy todir="${empire.db.this.deploy.dir}">
+	  		<fileset dir=".">	  			
 	  			<include name="NOTICE.txt" />
-	  			<include name="LICENSE.txt" />
+	  			<include name="LICENSE*.txt" />
 	  			<include name="CHANGELOG.txt" />
 	  		</fileset>
 	  	</copy>
 	  </target>
 	  
+	 <!-- 
+	 	generate zip
+	  -->
+	  <target name="zip">
+	  	<zip basedir="${empire.db.deploy.dir}" destfile="${empire.db.deploy.dir}/${empire.db.deploy.name}.zip"
includes="${empire.db.deploy.name}/**" />
+	  </target>
+	  
+	 <!-- 
+	 	generate tar.gz
+	  -->
+	  <target name="tar">
+	  	<tar basedir="${empire.db.deploy.dir}" destfile="${empire.db.deploy.dir}/${empire.db.deploy.name}.tar.gz"
includes="${empire.db.deploy.name}/**" compression="gzip"/>
+	  </target>
+
 	<!-- 
 		target tidy
 	 -->
 	<target name="tidy" description="delete temp files">
-		<delete dir="${out.dir}"/>
+		<delete dir="${empire.db.out.dir}"/>
 	</target>
 </project>

Modified: incubator/empire-db/trunk/core/Empire-db/javadoc.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/javadoc.xml?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/javadoc.xml (original)
+++ incubator/empire-db/trunk/core/Empire-db/javadoc.xml Thu Aug 14 06:10:23 2008
@@ -21,7 +21,7 @@
  --> 
 <project default="javadoc">
 	<property name="lib.dir" location="lib"/>
-	<property name="dest.dir" location="../deploy/empire-db-2.0.3-incubating/docs"/>
+	<property name="dest.dir" location="../deploy/apache-empire-db-2.0.3-incubating/docs"/>
 	<property name="sourcepath" location="src"/>
 <target name="javadoc">
 <javadoc access="public" author="true" destdir="${dest.dir}" doctitle="Empire-db API Specification"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false"


Added: incubator/empire-db/trunk/core/Empire-db/lib/commons-collections-3.2.1.jar
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/lib/commons-collections-3.2.1.jar?rev=685880&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/empire-db/trunk/core/Empire-db/lib/commons-collections-3.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/.settings/org.eclipse.wst.common.component?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/.settings/org.eclipse.wst.common.component
(original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/.settings/org.eclipse.wst.common.component
Thu Aug 14 06:10:23 2008
@@ -6,7 +6,7 @@
 <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Struts2.0.8/lib/commons-beanutils-1.7.0.jar">
 <dependency-type>uses</dependency-type>
 </dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Struts2.0.8/lib/commons-collections-2.1.1.jar">
+<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Struts2.0.8/lib/commons-collections-3.2.1.jar">
 <dependency-type>uses</dependency-type>
 </dependent-module>
 <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Struts2.0.8/lib/commons-digester-1.8.jar">

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin Thu Aug 14 06:10:23 2008
@@ -12,7 +12,7 @@
         <webClassPathEntry>/DBWebSample/build/classes</webClassPathEntry>
         <webClassPathEntry>/Empire-db/bin</webClassPathEntry>
         <webClassPathEntry>/Empire-db/lib/commons-beanutils-1.7.0.jar</webClassPathEntry>
-        <webClassPathEntry>/Empire-db/lib/commons-collections-2.1.1.jar</webClassPathEntry>
+        <webClassPathEntry>/Empire-db/lib/commons-collections-3.2.1.jar</webClassPathEntry>
         <webClassPathEntry>/Empire-db/lib/commons-logging-1.0.4.jar</webClassPathEntry>
         <webClassPathEntry>/Empire-db/lib/log4j-1.2.14.jar</webClassPathEntry>
         <webClassPathEntry>/Empire-struts2-ext/bin</webClassPathEntry>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version Thu Aug 14
06:10:23 2008
@@ -4,8 +4,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache
Tomcat v5.5"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/empire-db-2.0.3.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/empire-struts2-ext-1.0.3.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/@empire.db.deploy.jar.name@.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/@empire.struts2.ext.deploy.jar.name@.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar"/>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version Thu Aug
14 06:10:23 2008
@@ -9,8 +9,8 @@
     <extraInfo></extraInfo>
     <webPath>DBWebSample</webPath>
     <webClassPathEntries>
-        <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/empire-db-2.0.3.jar</webClassPathEntry>
-        <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/empire-struts2-ext-1.0.3.jar</webClassPathEntry>
+        <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/@empire.db.deploy.jar.name@.jar</webClassPathEntry>
+        <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/@empire.struts2.ext.deploy.jar.name@.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/commons-beanutils-1.7.0.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/commons-collections-3.2.1.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar</webClassPathEntry>

Added: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/KEYS
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/KEYS?rev=685880&view=auto
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/KEYS (added)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/KEYS Thu Aug 14 06:10:23 2008
@@ -0,0 +1,31 @@
+pub   1024D/AE5BC905 2008-08-13
+uid                  Jörg Reiher (CODE SIGNING KEY) <reiher@apache.org>
+sig 3        AE5BC905 2008-08-13  Jörg Reiher (CODE SIGNING KEY) <reiher@apache.org>
+sub   1024g/72B89B1E 2008-08-13
+sig          AE5BC905 2008-08-13  Jörg Reiher (CODE SIGNING KEY) <reiher@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (MingW32)
+
+mQGiBEii0IYRBADfTMIH8W5/3mn+RvFDjjUYGNDRxxyhVlevhAml7KwnMIVMKRBx
+T8OcWPbBE+DQIQWmYdCJR0wNfKGWl14dq1gI8gmgZI8ES/4izysOZwNNDTGzEzPX
+bZvO1HdYQMkCk0rGNcTmuI3L5Dq07BzKC99uDhG2C7r00vk7O/IVvlURbwCg4Gl/
+c3B5dae5PogiOiiEfQn3VtkD/1XcxpDPmEs04SUjjM88BkpnwOjHt1juMYXg9Bwm
+TVbTPyowDVtNrFHETrg2AQ1IPXkB+aA22yPmbpu6qG9UmOnMSuq0ENc9472+nlvW
+IXBxmHcMJPsD2iDUSDKzUCb5LCBAuRLdZyhP11kDcNGKJVErsFu37RYpsH9Sdwed
+OC6aBACeBWLiguZERDVg5TgzSsX6plngKqMdRe9zZN8mb3uvf5L7dl2Y2CtZ1tfo
+TZFxBWlsP/lT0BBSh9nolpgkR2GGn6SwVuEyKgmX7pSfxvuEN2sC2NXBwKiOlKoD
+xhZd/mAizM8cD/smPC3uuqwyQcPUxGPKKmHL0hdaFFWW8Ga2NLQzSsO2cmcgUmVp
+aGVyIChDT0RFIFNJR05JTkcgS0VZKSA8cmVpaGVyQGFwYWNoZS5vcmc+iGAEExEC
+ACAFAkii0IYCGyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBkxsbNrlvJBagA
+AJkBVO+nxA5sW5gclyBEWe0RWCTgAgCgttPrboRhgJC0xpfXJnCDKfmnPp65AQ0E
+SKLQjhAEAIc1Iuq81w8bQyk0HdopQLtwWoz1DgAszUITb+RHm7XgMPhCE0f7FdUx
+nWFz0yKaYk/5UvhMm+pc+FbFw7gDCj74LUJsL8cYiNzmAXObnIgggW1YcJvrmzRF
+o0Ici0Mfov7mIK+9HLq6+Oxl992sbUVmOvOhgcHxO86DDTfgUq5jAAMFA/wK1x1U
+EMqvjDYHy/22Y8ui9Dpm9oxIEm4Z7krA5Ujt9TiaVFG+7rhaAVoA9xSHfCSFIawZ
+ge8G8GpzefYioIgooaJkCKaHbJriAVhx+hymSpWko89KUPr9PNXLi90DT1RUg5b0
+sX4MKK1cg9tkJscIYjCXOz0DS9kfCy8GNp0UsYhJBBgRAgAJBQJIotCOAhsMAAoJ
+EGTGxs2uW8kFktgAn3bwTweJpebH0RuDMcT8opm3CTCVAJ0bexIbIkmtW9GzxCYv
+vJet3CydZA==
+=Eh6F
+-----END PGP PUBLIC KEY BLOCK-----

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/build.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/build.xml?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/build.xml (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/build.xml Thu Aug 14 06:10:23
2008
@@ -69,7 +69,7 @@
 
 	    		<pathelement location="${empiredb.deploy.dir}/empire-db.jar"/>	
 	    		<pathelement location="${empiredb.deploy.dir}/commons-beanutils-1.7.0.jar"/>
-	    		<pathelement location="${empiredb.deploy.dir}/commons-collections-2.1.1.jar"/>
+	    		<pathelement location="${empiredb.deploy.dir}/commons-collections-3.2.1.jar"/>
 	    		<pathelement location="${empiredb.deploy.dir}/commons-logging-1.0.4.jar"/>	
 	    		<pathelement location="${empiredb.deploy.dir}/log4j-1.2.14.jar"/>	
 

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/buildRelease.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/buildRelease.xml?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/buildRelease.xml (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/buildRelease.xml Thu Aug 14 06:10:23
2008
@@ -19,32 +19,37 @@
  * under the License.
  */
  --> 
-<project name="buildRelease" default="build" basedir=".">
+<project name="buildEmpireStruts2Ext" default="build" basedir=".">
+    <import file="../Empire-db/buildRelease.xml" />
 	<description>Builds EmpireStruts2Ext download folder</description>
 	<!-- set properties for this build -->
-	<property name="src.dir" location="src"/>
-	<property name="lib.dir" location="lib"/>
-	<property name="deploy.dir" location="../deploy"/>
-	<property name="this.deploy.dir" location="${deploy.dir}/empire-struts2-ext-1.0.3-incubating"/>
-	<property name="out.dir" location="${this.deploy.dir}/out"/>
-	<property name="lib.deploy.dir" location="${this.deploy.dir}/lib" />
-	<property name="src.deploy.dir" location="${this.deploy.dir}/src" />
-	<property name="examples.deploy.dir" location="${this.deploy.dir}/examples" />
-	<property name="jar.version.file" location="${this.deploy.dir}/empire-struts2-ext-1.0.3-incubating.jar"/>
-	<property name="servletapi.lib.dir" location="../ServletAPI2.4/lib" />
-	<property name="empiredb.deploy.dir" location="${deploy.dir}/empire-db-2.0.3-incubating/lib"/>
-	<property name="struts.lib.dir" location="../Struts2.0.11/lib" />
+	<property name="empire.struts2.ext.deploy.jar.name" value="empire-struts2-ext-1.0.3"/>
+	<property name="empire.struts2.ext.deploy.name" value="apache-empire-struts2-ext-1.0.3-incubating"/>
+	
+	<property name="empire.struts2.ext.src.dir" location="src"/>
+	<property name="empire.struts2.ext.lib.dir" location="lib"/>
+	<property name="empire.struts2.ext.deploy.dir" location="../deploy"/>
+	<property name="empire.struts2.ext.this.deploy.dir" location="${empire.struts2.ext.deploy.dir}/${empire.struts2.ext.deploy.name}"/>
+	<property name="empire.struts2.ext.out.dir" location="${empire.struts2.ext.this.deploy.dir}/out"/>
+	<property name="empire.struts2.ext.lib.deploy.dir" location="${empire.struts2.ext.this.deploy.dir}/lib"
/>
+	<property name="empire.struts2.ext.src.deploy.dir" location="${empire.struts2.ext.this.deploy.dir}/src"
/>
+	<property name="empire.struts2.ext.examples.deploy.dir" location="${empire.struts2.ext.this.deploy.dir}/examples"
/>
+	<property name="empire.struts2.ext.jar.version.file" location="${empire.struts2.ext.this.deploy.dir}/${empire.struts2.ext.deploy.jar.name}.jar"/>
+	<property name="empire.struts2.ext.servletapi.lib.dir" location="../ServletAPI2.4/lib"
/>
+	<property name="empire.struts2.ext.struts.lib.dir" location="../Struts2.0.11/lib" />
 	
 	<!-- 
 		target build
 	 -->
-	<target name="build" depends="clean,compile empire-db,compile,jar,dependjars,createEclipseExample,copySourceFolder,generateJavadocs,miscellaneous,tidy"
/>
+	<target name="build" depends="clean,compile empire-db,compile,jar,dependjars,createEclipseExample,copySourceFolder,generateJavadocs,miscellaneous,tidy,zip,tar"
/>
 	
 	<!-- 
 		target clean
 	 -->
 	<target name="clean" description="delete everything">
-		<delete dir="${this.deploy.dir}"/>
+		<delete dir="${empire.struts2.ext.this.deploy.dir}"/>
+		<delete file="${empire.struts2.ext.deploy.name}.zip" />
+		<delete file="${empire.struts2.ext.deploy.name}.tar.gz" />
 	</target>
 	
 	<!-- 
@@ -58,37 +63,37 @@
 		target compile
 	 -->
 	<target name="compile" description="delete class folder, compiling all source files of
the packages">
-		<delete dir="${this.deploy.dir}"/>
-		<mkdir dir="${this.deploy.dir}"/>
-		<mkdir dir="${out.dir}" />
+		<delete dir="${empire.struts2.ext.this.deploy.dir}"/>
+		<mkdir dir="${empire.struts2.ext.this.deploy.dir}"/>
+		<mkdir dir="${empire.struts2.ext.out.dir}" />
 		
-	    <javac srcdir="${src.dir}" destdir="${out.dir}" listfiles="false" debug="on">
+	    <javac srcdir="${empire.struts2.ext.src.dir}" destdir="${empire.struts2.ext.out.dir}"
listfiles="false" debug="on">
 	    	<classpath>
-	    		<pathelement location="${servletapi.lib.dir}/servlet-api.jar"/>
-	    		<pathelement location="${servletapi.lib.dir}/jsp-api.jar"/>
+	    		<pathelement location="${empire.struts2.ext.servletapi.lib.dir}/servlet-api.jar"/>
+	    		<pathelement location="${empire.struts2.ext.servletapi.lib.dir}/jsp-api.jar"/>
 
-	    		<pathelement location="${deploy.dir}/empire-db-2.0.3-incubating/empire-db-2.0.3-incubating.jar"/>

+	    		<pathelement location="${empire.struts2.ext.deploy.dir}/${empire.db.deploy.name}/${empire.db.deploy.jar.name}.jar"/>

 	    		<pathelement location="${empiredb.deploy.dir}/commons-beanutils-1.7.0.jar"/>
-	    		<pathelement location="${empiredb.deploy.dir}/commons-collections-2.1.1.jar"/>
+	    		<pathelement location="${empiredb.deploy.dir}/commons-collections-3.2.1.jar"/>
 	    		<pathelement location="${empiredb.deploy.dir}/commons-logging-1.0.4.jar"/>	
 	    		<pathelement location="${empiredb.deploy.dir}/log4j-1.2.14.jar"/>	
 
-	    		<pathelement location="${struts.lib.dir}/commons-beanutils-1.7.0.jar"/>
-	    		<pathelement location="${struts.lib.dir}/commons-collections-3.2.1.jar"/>
-	    		<pathelement location="${struts.lib.dir}/commons-digester-1.8.jar"/>       
      
-	    		<pathelement location="${struts.lib.dir}/commons-fileupload-1.2.1.jar"/>
-	    		<pathelement location="${struts.lib.dir}/commons-io-1.4.jar"/>
-	    		<pathelement location="${struts.lib.dir}/commons-logging-1.0.4.jar"/>
-	    		<pathelement location="${struts.lib.dir}/freemarker-2.3.8.jar"/>
-	    		<pathelement location="${struts.lib.dir}/ognl-2.6.11.jar"/>                
      
-	    		<pathelement location="${struts.lib.dir}/struts2-codebehind-plugin-2.0.11.2.jar"/>
-	    		<pathelement location="${struts.lib.dir}/struts2-core-2.0.11.2.jar"/>      
         
-	    		<pathelement location="${struts.lib.dir}/struts2-sitemesh-plugin-2.0.11.2.jar"/>
-	    		<pathelement location="${struts.lib.dir}/struts2-tiles-plugin-2.0.11.2.jar"/>
       
-	    		<pathelement location="${struts.lib.dir}/tiles-api-2.0.4.jar"/>
-	    		<pathelement location="${struts.lib.dir}/tiles-core-2.0.4.jar"/>           
      
-	    		<pathelement location="${struts.lib.dir}/tiles-jsp-2.0.4.jar"/>
-	    		<pathelement location="${struts.lib.dir}/xwork-2.0.5.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/commons-beanutils-1.7.0.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/commons-collections-3.2.1.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/commons-digester-1.8.jar"/>
             
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/commons-fileupload-1.2.1.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/commons-io-1.4.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/commons-logging-1.0.4.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/freemarker-2.3.8.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/ognl-2.6.11.jar"/>
                      
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/struts2-codebehind-plugin-2.0.11.2.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/struts2-core-2.0.11.2.jar"/>
               
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/struts2-sitemesh-plugin-2.0.11.2.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/struts2-tiles-plugin-2.0.11.2.jar"/>
       
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/tiles-api-2.0.4.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/tiles-core-2.0.4.jar"/>
                 
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/tiles-jsp-2.0.4.jar"/>
+	    		<pathelement location="${empire.struts2.ext.struts.lib.dir}/xwork-2.0.5.jar"/>
 	    	</classpath>
 <!--    	<compilerarg value="-Xlint" /> -->
 		</javac>
@@ -97,9 +102,9 @@
 		target jar
 	 -->
 	<target name="jar">
-		<jar destfile="${jar.version.file}" compress="true">
-			<fileset dir="${out.dir}" />
-			<fileset dir="${src.dir}" />
+		<jar destfile="${empire.struts2.ext.jar.version.file}" compress="true">
+			<fileset dir="${empire.struts2.ext.out.dir}" />
+			<fileset dir="${empire.struts2.ext.src.dir}" />
 			<fileset dir="" includes="*.txt" />
 		</jar>
 	</target>
@@ -108,9 +113,9 @@
 		copySourceFolder
 	 -->
 	 <target name="copySourceFolder" description="copies dependancies to deploy dir">
-		<mkdir dir="${src.deploy.dir}"/>
-		<copy todir="${src.deploy.dir}">
-	 		<fileset dir="${src.dir}" includes="**/*.*" />
+		<mkdir dir="${empire.struts2.ext.src.deploy.dir}"/>
+		<copy todir="${empire.struts2.ext.src.deploy.dir}">
+	 		<fileset dir="${empire.struts2.ext.src.dir}" includes="**/*.*" />
 	 	</copy>
 	 </target>
 	 
@@ -118,8 +123,8 @@
 		createEclipseExample
 	 -->
 	 <target name="createEclipseExample" description="creates an Eclipse example">
-		<mkdir dir="${examples.deploy.dir}"/>
-		<copy todir="${examples.deploy.dir}">
+		<mkdir dir="${empire.struts2.ext.examples.deploy.dir}"/>
+		<copy todir="${empire.struts2.ext.examples.deploy.dir}">
 	 		<fileset dir="../" includes="DBWebSample/**/*.*" >
 	 			<exclude name="**/build.xml" />
 	 			<exclude name="**/hsqldb/**" />
@@ -130,13 +135,20 @@
 				<include name="DBWebSample/tomcatplugin_delivery-version"/>
 			</fileset>
 	 	</copy>
-	 	<move file="${examples.deploy.dir}/DBWebSample/classpath_delivery-version" tofile="${examples.deploy.dir}/DBWebSample/.classpath"
overwrite="true" />
-	 	<move file="${examples.deploy.dir}/DBWebSample/tomcatplugin_delivery-version" tofile="${examples.deploy.dir}/DBWebSample/.tomcatplugin"
overwrite="true" />
-		<copy todir="${examples.deploy.dir}/DBWebSample/WebRoot/WEB-INF/lib">
-			<fileset dir="${this.deploy.dir}/">
+	 	<move file="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/classpath_delivery-version"
tofile="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/.classpath" overwrite="true"
/>
+	 	<move file="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/tomcatplugin_delivery-version"
tofile="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/.tomcatplugin" overwrite="true"
/>
+	 	<!-- Replace place holders by actual empire-db and empire-struts-ext deploy jar name
-->
+	 	<replace file="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/.classpath" token="@empire.struts2.ext.deploy.jar.name@"
value="${empire.struts2.ext.deploy.jar.name}" />
+	 	<replace file="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/.tomcatplugin"
token="@empire.struts2.ext.deploy.jar.name@" value="${empire.struts2.ext.deploy.jar.name}"
/>
+
+	 	<replace file="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/.classpath" token="@empire.db.deploy.jar.name@"
value="${empire.db.deploy.jar.name}" />
+	 	<replace file="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/.tomcatplugin"
token="@empire.db.deploy.jar.name@" value="${empire.db.deploy.jar.name}" />
+	 	
+	 	<copy todir="${empire.struts2.ext.examples.deploy.dir}/DBWebSample/WebRoot/WEB-INF/lib">
+			<fileset dir="${empire.struts2.ext.this.deploy.dir}/">
 				<include name="*.jar"/>
 			</fileset>
-			<fileset dir="${this.deploy.dir}/lib">
+			<fileset dir="${empire.struts2.ext.this.deploy.dir}/lib">
 				<include name="*.jar"/>
 			</fileset>
 			<fileset dir="../JDBCDrivers/lib/">
@@ -156,25 +168,40 @@
 	 	miscellaneous
 	  -->
 	  <target name="miscellaneous">
-	  	<copy todir="${this.deploy.dir}">
+	  	<copy todir="${empire.struts2.ext.deploy.dir}" file="KEYS" />	  		
+	  	<copy todir="${empire.struts2.ext.this.deploy.dir}">
 	  		<fileset dir=".">
 	  			<include name="NOTICE.txt" />
-	  			<include name="LICENSE.txt" />
+	  			<include name="LICENSE*.txt" />
 	  			<include name="README.txt" />
 	  			<include name="CHANGELOG.txt" />
 	  		</fileset>
 	  	</copy>
 	  </target>
 
-	<!-- 
+	 <!-- 
+	 	generate zip
+	  -->
+	  <target name="zip">
+	  	<zip basedir="${empire.struts2.ext.deploy.dir}" destfile="${empire.struts2.ext.deploy.dir}/${empire.struts2.ext.deploy.name}.zip"
includes="${empire.struts2.ext.deploy.name}/**" />
+	  </target>
+	  
+	 <!-- 
+	 	generate tar.gz
+	  -->
+	  <target name="tar">
+	  	<tar basedir="${empire.struts2.ext.deploy.dir}" destfile="${empire.struts2.ext.deploy.dir}/${empire.struts2.ext.deploy.name}.tar.gz"
includes="${empire.struts2.ext.deploy.name}/**" compression="gzip"/>
+	  </target>
+
+	  	<!-- 
 		dependjars
 	 -->
 	<target name="dependjars" description="copy dependancies to deploy dir">
-		<mkdir dir="${lib.deploy.dir}"/>
-		<copy todir="${lib.deploy.dir}">
-			<fileset dir="${deploy.dir}/empire-db-2.0.3-incubating/" includes="*.jar"/>
-			<fileset dir="${empiredb.deploy.dir}" includes="*.jar" />
-			<fileset dir="${struts.lib.dir}" includes="*.jar"/>
+		<mkdir dir="${empire.struts2.ext.lib.deploy.dir}"/>
+		<copy todir="${empire.struts2.ext.lib.deploy.dir}">
+			<fileset dir="${empire.struts2.ext.deploy.dir}/${empire.db.deploy.name}/" includes="*.jar"/>
+			<fileset dir="${empire.db.lib.deploy.dir}" includes="*.jar"/>
+			<fileset dir="${empire.struts2.ext.struts.lib.dir}" includes="*.jar" />
 		</copy>
 
 	</target>
@@ -183,6 +210,6 @@
 		target tidy
 	 -->
 	<target name="tidy" description="delete temp files">
-		<delete dir="${out.dir}"/>
+		<delete dir="${empire.struts2.ext.out.dir}"/>
 	</target>
 </project>

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/javadoc.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/javadoc.xml?rev=685880&r1=685879&r2=685880&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/javadoc.xml (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/javadoc.xml Thu Aug 14 06:10:23
2008
@@ -21,7 +21,7 @@
  --> 
 <project default="javadoc" basedir=".">
 	<property name="lib.dir" location="lib"/>
-	<property name="dest.dir" location="../deploy/empire-struts2-ext-1.0.3-incubating/docs"/>
+	<property name="dest.dir" location="../deploy/apache-empire-struts2-ext-1.0.3-incubating/docs"/>
 	<property name="sourcepath" location="src"/>
 	<property name="struts.lib.dir" location="../Struts2.0.8/lib" />
 	<property name="servletapi.lib.dir" location="../ServletAPI2.4/lib" />
@@ -34,12 +34,12 @@
 
 		<pathelement location="${deploy.dir}/empire-db/empire-db-2.0.1.jar"/>	
 		<pathelement location="${empiredb.deploy.dir}/commons-beanutils-1.7.0.jar"/>
-		<pathelement location="${empiredb.deploy.dir}/commons-collections-2.1.1.jar"/>
+		<pathelement location="${empiredb.deploy.dir}/commons-collections-3.2.1.jar"/>
 		<pathelement location="${empiredb.deploy.dir}/commons-logging-1.0.4.jar"/>	
 		<pathelement location="${empiredb.deploy.dir}/log4j-1.2.14.jar"/>	
 
 		<pathelement location="${struts.lib.dir}/commons-beanutils-1.7.0.jar"/>
-		<pathelement location="${struts.lib.dir}/commons-collections-2.1.1.jar"/>
+		<pathelement location="${struts.lib.dir}/commons-collections-3.2.1.jar"/>
 		<pathelement location="${struts.lib.dir}/commons-digester-1.8.jar"/>            
 
 		<pathelement location="${struts.lib.dir}/commons-logging-1.0.4.jar"/>
 		<pathelement location="${struts.lib.dir}/freemarker-2.3.8.jar"/>



Mime
View raw message