empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r688321 - in /incubator/empire-db/trunk: core/DBSample/ core/DBSample/Output/ core/Empire-db/ struts2-ext/Empire-struts2-ext/
Date Sat, 23 Aug 2008 13:40:44 GMT
Author: doebele
Date: Sat Aug 23 06:40:43 2008
New Revision: 688321

URL: http://svn.apache.org/viewvc?rev=688321&view=rev
Log: (empty)

Added:
    incubator/empire-db/trunk/core/DBSample/SampleOutput.txt   (contents, props changed)
      - copied, changed from r688304, incubator/empire-db/trunk/core/DBSample/Output/SampleOutput.txt
Removed:
    incubator/empire-db/trunk/core/DBSample/Output/
Modified:
    incubator/empire-db/trunk/core/DBSample/readme.txt
    incubator/empire-db/trunk/core/DBSample/tutorial.pdf
    incubator/empire-db/trunk/core/Empire-db/CHANGELOG.txt
    incubator/empire-db/trunk/core/Empire-db/README.txt
    incubator/empire-db/trunk/core/Empire-db/build.xml
    incubator/empire-db/trunk/core/Empire-db/buildRelease.xml
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/CHANGELOG.txt
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/build.xml
    incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/buildRelease.xml

Copied: incubator/empire-db/trunk/core/DBSample/SampleOutput.txt (from r688304, incubator/empire-db/trunk/core/DBSample/Output/SampleOutput.txt)
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/DBSample/SampleOutput.txt?p2=incubator/empire-db/trunk/core/DBSample/SampleOutput.txt&p1=incubator/empire-db/trunk/core/DBSample/Output/SampleOutput.txt&r1=688304&r2=688321&rev=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/DBSample/Output/SampleOutput.txt (original)
+++ incubator/empire-db/trunk/core/DBSample/SampleOutput.txt Sat Aug 23 06:40:43 2008
@@ -1,3 +1,10 @@
+Apache Empire-db
+Copyright 2008 The Apache Software Foundation
+
+This is the console output of the DBSample application. 
+See the file tutorial.pdf for further information.
+-------------------------------------------------------------------------------------------------------------------
+
 log4j:WARN No appenders could be found for logger (org.apache.empire.commons.ErrorType).
 log4j:WARN Please initialize the log4j system properly.
 

Propchange: incubator/empire-db/trunk/core/DBSample/SampleOutput.txt
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/empire-db/trunk/core/DBSample/readme.txt
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/DBSample/readme.txt?rev=688321&r1=688320&r2=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/DBSample/readme.txt (original)
+++ incubator/empire-db/trunk/core/DBSample/readme.txt Sat Aug 23 06:40:43 2008
@@ -1,4 +1,7 @@
-In order to run / debug the Empire-db SampleApp please do the following:
+Apache Empire-db
+Copyright 2008 The Apache Software Foundation
+
+In order to run / debug the Empire-db SampleApp from the Eclipse IDE please do the following:
 
 1. In Eclipse IDE use File -> Import -> Existing Projects into Workspace to import
the Sample Project
 

Modified: incubator/empire-db/trunk/core/DBSample/tutorial.pdf
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/DBSample/tutorial.pdf?rev=688321&r1=688320&r2=688321&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/empire-db/trunk/core/Empire-db/CHANGELOG.txt
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/CHANGELOG.txt?rev=688321&r1=688320&r2=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/CHANGELOG.txt (original)
+++ incubator/empire-db/trunk/core/Empire-db/CHANGELOG.txt Sat Aug 23 06:40:43 2008
@@ -1,3 +1,6 @@
+Apache Empire-db
+Copyright 2008 The Apache Software Foundation
+
 --------------
 Release 2.0.3:
 --------------

Modified: incubator/empire-db/trunk/core/Empire-db/README.txt
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/README.txt?rev=688321&r1=688320&r2=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/README.txt (original)
+++ incubator/empire-db/trunk/core/Empire-db/README.txt Sat Aug 23 06:40:43 2008
@@ -11,4 +11,9 @@
 Getting Started
 ===============
 
+For a good introdution to Empire-db please read the tutorial.pdf, that can be found in the
root directory.  
+
 This component requires a Java 5 JDK (or higher).
+
+=== Building ===
+If you'd like to build Empire-db please run the ant script "build.xml".

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=688321&r1=688320&r2=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/build.xml (original)
+++ incubator/empire-db/trunk/core/Empire-db/build.xml Sat Aug 23 06:40:43 2008
@@ -28,7 +28,7 @@
 	<property name="this.deploy.dir" location="${deploy.dir}/empire-db"/>
 	<property name="out.dir" location="${this.deploy.dir}/out"/>
 	<property name="jar.file" location="${this.deploy.dir}/empire-db.jar"/>
-	<property name="jar.version.file" location="${this.deploy.dir}/empire-db-2.0.3-incubating.jar"/>
+	<property name="jar.version.file" location="${this.deploy.dir}/empire-db-2.0.3.jar"/>
 	
 	<!-- 
 		target build
@@ -63,11 +63,6 @@
 		target jar
 	 -->
 	<target name="jar">
-		<jar destfile="${jar.file}" compress="true">
-			<fileset dir="${out.dir}" />
-			<fileset dir="${src.dir}" />
-			<fileset dir="" includes="*.txt" />
-		</jar>
 		<jar destfile="${jar.version.file}" compress="true">
 			<fileset dir="${out.dir}" />
 			<fileset dir="${src.dir}" />

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=688321&r1=688320&r2=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/buildRelease.xml (original)
+++ incubator/empire-db/trunk/core/Empire-db/buildRelease.xml Sat Aug 23 06:40:43 2008
@@ -34,7 +34,7 @@
 	<property name="empire.db.out.dir" location="${empire.db.this.deploy.dir}/out"/>	
 	<property name="empire.db.out.metaInf.dir" location="${empire.db.out.dir}/META-INF" />
 	<property name="empire.db.lib.deploy.dir" location="${empire.db.this.deploy.dir}/lib"
/>
-	<property name="empire.db.src.deploy.dir" location="/src" />
+	<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"/>
 
@@ -111,7 +111,7 @@
 	 -->
 	 <target name="createEclipseExample" description="creates an Eclipse example">
 		<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>
+	 	<concat destfile="${empire.db.examples.deploy.dir}/readme.txt">For an Empire-db
introcution tutorial see tutorial.pdf in the root direcotry.</concat>
 		<copy todir="${empire.db.examples.deploy.dir}">
 	 		<fileset dir="../" includes="DBSample/**/*.*" >
 	 			<exclude name="**/.settings/**" />
@@ -123,6 +123,7 @@
 				<include name="DBSample/classpath_delivery-version"/>
 			</fileset>
 	 	</copy>
+	 	<move file="${empire.db.examples.deploy.dir}/DBSample/tutorial.pdf" tofile="${empire.db.this.deploy.dir}/tutorial.pdf"
overwrite="true" />
 	 	<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/**/*.*" >
@@ -195,6 +196,7 @@
 	  			<include name="LICENSE*.txt" />
 	  			<include name="CHANGELOG.txt" />
 	  			<include name="README.txt" />
+	  			<include name="build.xml" />
 	  		</fileset>
 	  	</copy>
 	  </target>

Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/CHANGELOG.txt
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/CHANGELOG.txt?rev=688321&r1=688320&r2=688321&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/CHANGELOG.txt (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/CHANGELOG.txt Sat Aug 23 06:40:43
2008
@@ -1,3 +1,6 @@
+Apache Empire-db
+Copyright 2008 The Apache Software Foundation
+
 --------------
 Release 1.0.3:
 --------------

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=688321&r1=688320&r2=688321&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 Sat Aug 23 06:40:43
2008
@@ -22,23 +22,22 @@
 <project name="empire-struts2-ext" default="build" basedir=".">
 	<description>Builds the jar</description>
 	<!-- set properties for this build -->
-	<property name="servletapi.lib.dir" location="../ServletAPI2.4/lib" />
 
 	<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"/>
 	<property name="out.dir" location="${this.deploy.dir}/out"/>
-	<property name="jar.file" location="${this.deploy.dir}/empire-struts2-ext.jar"/>
-	<property name="jar.version.file" location="${this.deploy.dir}/empire-struts2-ext-1.0.3-incubating.jar"/>
+	<property name="jar.version.file" location="${this.deploy.dir}/empire-struts2-ext-1.0.3.jar"/>
 
-	<property name="empiredb.deploy.dir" location="${deploy.dir}/empire-db"/>
-	<property name="struts.lib.dir" location="../Struts2.0.11/lib" />
+	<property name="servletapi.lib.dir" location="${lib.dir}" />
+	<property name="empiredb.lib.dir" location="${lib.dir}"/>
+	<property name="struts.lib.dir" location="${lib.dir}" />
 	
 	<!-- 
 		target build
 	 -->
-	<target name="build" depends="clean,compile empire-db,compile,jar,dependjars,tidy" />
+	<target name="build" depends="clean,compile,jar,dependjars,tidy" />
 	
 	<!-- 
 		target clean
@@ -67,11 +66,12 @@
 	    		<pathelement location="${servletapi.lib.dir}/servlet-api.jar"/>
 	    		<pathelement location="${servletapi.lib.dir}/jsp-api.jar"/>
 
-	    		<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-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="${empiredb.lib.dir}/empire-db-2.0.3.jar"/>	
+	    		
+	    		<pathelement location="${empiredb.lib.dir}/commons-beanutils-1.7.0.jar"/>
+	    		<pathelement location="${empiredb.lib.dir}/commons-collections-3.2.1.jar"/>
+	    		<pathelement location="${empiredb.lib.dir}/commons-logging-1.0.4.jar"/>	
+	    		<pathelement location="${empiredb.lib.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"/>
@@ -97,14 +97,9 @@
 		target jar
 	 -->
 	<target name="jar">
-		<jar destfile="${jar.file}" compress="true">
-			<fileset dir="${out.dir}" />
-			<fileset dir="${src.dir}" /><!-- includes="META-INF/*.tld" -->
-			<fileset dir="" includes="*.txt" />
-		</jar>
 		<jar destfile="${jar.version.file}" compress="true">
 			<fileset dir="${out.dir}" />
-			<fileset dir="${src.dir}" />
+			<fileset dir="${src.dir}" /><!-- includes="META-INF/*.tld" -->
 			<fileset dir="" includes="*.txt" />
 		</jar>
 	</target>
@@ -113,10 +108,10 @@
 	 -->
 	<target name="dependjars" description="copy dependancies to deploy dir">
 		<copy todir="${this.deploy.dir}">
-<!--			<fileset dir="${lib.dir}" includes="*.jar"/>				-->
-			<fileset dir="${empiredb.deploy.dir}" includes="*.jar"/>
-			<fileset dir="${struts.lib.dir}" includes="*.jar"/>
-			
+			<fileset dir="${lib.dir}" includes="*.jar">	
+				<exclude name="servlet-api.jar" />
+				<exclude name="jsp-api.jar" />
+			</fileset>
 		</copy>
 	</target>
 	<!-- 

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=688321&r1=688320&r2=688321&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 Sat Aug 23 06:40:43
2008
@@ -199,6 +199,7 @@
 	  			<include name="LICENSE*.txt" />
 	  			<include name="README.txt" />
 	  			<include name="CHANGELOG.txt" />
+	  			<include name="build.xml" />
 	  		</fileset>
 	  	</copy>
 	  </target>
@@ -226,6 +227,7 @@
 			<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" />
+			<fileset dir="${empire.struts2.ext.servletapi.lib.dir}" includes="*.jar" />
 		</copy>
 
 	</target>



Mime
View raw message