2006/unicorn build.xml,1.7,1.8 remote_log4j.xml,1.1,NONE log4j.xml,1.6,NONE

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

Modified Files:
	build.xml 
Removed Files:
	remote_log4j.xml log4j.xml 
Log Message:
properties files now in a single directory org/w3c/unicorn/conf/
only one unicorn properties file (no more local and remote)

Index: build.xml
===================================================================
RCS file: /sources/public/2006/unicorn/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- build.xml	23 Sep 2008 13:53:52 -0000	1.7
+++ build.xml	23 Jul 2009 13:00:41 -0000	1.8
@@ -70,6 +70,9 @@
             <exclude name="lib/"/>
             <classpath refid="project.classpath"/>
         </javac>
+        <copy file="./org/w3c/unicorn/conf/log4j_Jigsaw.xml"
+              tofile="./log4j.xml"
+              overwrite="true"/>
     </target>
     <target name="index">
         <java fork="yes" classname="org.w3c.unicorn.index.IndexGenerator" failonerror="true">
@@ -81,37 +84,24 @@
       <echo message="Please run: $ ant -v -projecthelp"/>
     </target>
     
-    <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"
+    <target name="copyConfiguration"  depends="build" description="Workspace configuration">
+      <copy file="./org/w3c/unicorn/conf/unicorn.properties"
+            tofile="./build/org/w3c/unicorn/conf/unicorn.properties"
             overwrite="true"/>
-      <copy file="./remote_log4j.xml"
+      <copy file="./org/w3c/unicorn/conf/log4j_Tomcat.xml"
             tofile="./build/log4j.xml"
             overwrite="true"/>
-      <copy file="./org/w3c/unicorn/extensions.properties"
-            tofile="./build/org/w3c/unicorn/extensions.properties" 
-            overwrite="true"/>
-      <copy file="./org/w3c/unicorn/responseParsers.properties"
-            tofile="./build/org/w3c/unicorn/responseParsers.properties" 
-            overwrite="true"/>
-      <copy file="./org/w3c/unicorn/output/specialFormaters.properties" 
-            tofile="./build/org/w3c/unicorn/output/specialFormaters.properties"
-            overwrite="true"/>
-    </target>
-    
-    <target name="localConfiguration" depends="war" >
-      <copy file="./org/w3c/unicorn/util/local-unicorn.properties" 
-            tofile="./build/org/w3c/unicorn/util/unicorn.properties"
+      <copy file="./org/w3c/unicorn/conf/extensions.properties"
+            tofile="./build/org/w3c/unicorn/conf/extensions.properties" 
             overwrite="true"/>
-      <copy file="./log4j.xml" tofile="./build/log4j.xml" overwrite="true"/>
-      <copy file="./org/w3c/unicorn/extensions.properties" 
-            tofile="./build/org/w3c/unicorn/extensions.properties" 
+      <copy file="./org/w3c/unicorn/conf/responseParsers.properties"
+            tofile="./build/org/w3c/unicorn/conf/responseParsers.properties" 
             overwrite="true"/>
-      <copy file="./org/w3c/unicorn/responseParsers.properties"
-            tofile="./build/org/w3c/unicorn/responseParsers.properties" 
+      <copy file="./org/w3c/unicorn/vonf/specialFormaters.properties" 
+            tofile="./build/org/w3c/unicorn/conf/specialFormaters.properties"
             overwrite="true"/>
-      <copy file="./org/w3c/unicorn/output/specialFormaters.properties" 
-            tofile="./build/org/w3c/unicorn/output/specialFormaters.properties" 
+      <copy file="./org/w3c/unicorn/conf/velocity.properties" 
+            tofile="./build/org/w3c/unicorn/conf/velocity.properties"
             overwrite="true"/>
     </target>
     
@@ -139,7 +129,7 @@
       </war>
     </target>
     
-    <target name="war" depends="remoteConfiguration,make-war" />
+    <target name="war" depends="copyConfiguration,make-war" />
     
     <target name="jar" depends="build" description="Creates the unicorn library">
       <delete file="${jar.file}" />

--- log4j.xml DELETED ---

--- remote_log4j.xml DELETED ---

Received on Thursday, 23 July 2009 13:00:57 UTC