2006/unicorn build-user.xml,1.5,1.6 build.xml,1.5,1.6 log4j.xml,1.5,1.6

Update of /sources/public/2006/unicorn
In directory hutz:/tmp/cvs-serv11100

Modified Files:
	build-user.xml build.xml log4j.xml 
Log Message:
first version that works with Jigsaw + fixed a bug in cond handling + removed parse(InputStream)

Index: build.xml
===================================================================
RCS file: /sources/public/2006/unicorn/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build.xml	4 Sep 2008 13:26:04 -0000	1.5
+++ build.xml	12 Sep 2008 18:01:42 -0000	1.6
@@ -14,7 +14,7 @@
 	<property name="password" value="******"/>
 	
     <path id="project.classpath">
-        <pathelement location="build"/>
+        <pathelement location="."/>
         <pathelement location="${unicorn.location}/lib/activation.jar"/>
         <pathelement location="${unicorn.location}/lib/commons-collections-3.1.jar"/>
         <pathelement location="${unicorn.location}/lib/commons-fileupload-1.1.1.jar"/>
@@ -61,7 +61,7 @@
     </target>
     <target name="build" depends="init">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac destdir="build">
+        <javac destdir="." debug="on" debuglevel="lines,vars,source">
             <src path="."/>
             <exclude name="lib/"/>
             <classpath refid="project.classpath"/>

Index: log4j.xml
===================================================================
RCS file: /sources/public/2006/unicorn/log4j.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- log4j.xml	29 Nov 2007 15:37:33 -0000	1.5
+++ log4j.xml	12 Sep 2008 18:01:42 -0000	1.6
@@ -15,7 +15,7 @@
 	<!-- TEXT APPENDER - LEVEL APPENDER -->
 
 	<appender name="out-level-error-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/error.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/level/error.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="error" />
@@ -30,7 +30,7 @@
 	</appender>
 
 	<appender name="out-level-warning-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/warning.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/level/warning.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="warn" />
@@ -45,7 +45,7 @@
 	</appender>
 
 	<appender name="out-level-info-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/info.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/level/info.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="info" />
@@ -60,7 +60,7 @@
 	</appender>
 
 	<appender name="out-level-debug-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/debug.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/level/debug.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="debug" />
@@ -75,7 +75,7 @@
 	</appender>
 
 	<appender name="out-level-trace-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/trace.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/level/trace.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -94,7 +94,7 @@
 	<!-- TEXT APPENDER - PACKAGE APPENDER -->
 
 	<appender name="out-package-contract-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/contract.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/contract.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -104,7 +104,7 @@
 	</appender>
 
 	<appender name="out-package-index-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/index.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/index.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -114,7 +114,7 @@
 	</appender>
 
 	<appender name="out-package-input-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/input.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/input.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -124,7 +124,7 @@
 	</appender>
 
 	<appender name="out-package-output-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/output.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/output.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -134,7 +134,7 @@
 	</appender>
 
 	<appender name="out-package-request-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/request.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/request.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -144,7 +144,7 @@
 	</appender>
 
 	<appender name="out-package-servlet-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/servlet.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/servlet.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -154,7 +154,7 @@
 	</appender>
 
 	<appender name="out-package-tasklist-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/tasklist.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/tasklist.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -164,7 +164,7 @@
 	</appender>
 
 	<appender name="out-package-util-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/util.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/package/util.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />
@@ -174,7 +174,7 @@
 	</appender>
 
 	<appender name="out-package-unicorn-text" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="D:/w3c/unicorn/logs/all.log" />
+		<param name="File" value="/opt/Jigsaw/Jigsaw/WWW/unicorn/logs/all.log" />
 		<param name="MaxFileSize" value="1024KB" />
 		<param name="MaxBackupIndex" value="1" />
 		<param name="Threshold" value="trace" />

Index: build-user.xml
===================================================================
RCS file: /sources/public/2006/unicorn/build-user.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build-user.xml	10 Jun 2008 12:41:41 -0000	1.5
+++ build-user.xml	12 Sep 2008 18:01:42 -0000	1.6
@@ -6,7 +6,7 @@
     <echo message="Please run: $ ant -v -projecthelp"/>
 </target>
 
-<target name="remoteConfiguration" description="Workspace configuration for remote">
+<target name="remoteConfiguration"  depends="build" description="Workspace configuration for remote">
 	<copy file="./org/w3c/unicorn/util/remote-unicorn.properties"
         tofile="./build/org/w3c/unicorn/util/unicorn.properties"
         overwrite="true"/>
@@ -24,7 +24,7 @@
         overwrite="true"/>
 </target>
 
-<target name="localConfiguration" >
+<target name="localConfiguration" depends="war" >
 	<copy file="./org/w3c/unicorn/util/local-unicorn.properties" 
         tofile="./build/org/w3c/unicorn/util/unicorn.properties"
         overwrite="true"/>
@@ -65,7 +65,7 @@
     </war>
 </target>
 
-<target name="war" depends="remoteConfiguration,make-war,localConfiguration" />
+<target name="war" depends="remoteConfiguration,make-war" />
 
 <target name="jar" depends="build" description="Creates the unicorn library">
 	<delete file="${jar.file}" />

Received on Friday, 12 September 2008 18:02:44 UTC