- From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 23 Sep 2008 13:53:54 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn
In directory hutz:/tmp/cvs-serv2224
Modified Files:
build.xml
Removed Files:
build-user.xml
Log Message:
Fixed encoding issues with Jigsaw + simplified build.xml and added a jigsaw task
Index: build.xml
===================================================================
RCS file: /sources/public/2006/unicorn/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- build.xml 12 Sep 2008 18:01:42 -0000 1.6
+++ build.xml 23 Sep 2008 13:53:52 -0000 1.7
@@ -1,33 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [<!ENTITY buildfile SYSTEM "./build-user.xml">]>
-<!-- WARNING: Eclipse autogenerated file.
- Any modifications will be overwritten.
- Please edit build-user.xml instead.
--->
<project name="unicorn" default="build" basedir=".">
- &buildfile;
- <property name="unicorn.location" value="."/>
-
- <!-- Configure properties to access the Manager application -->
- <property name="url" value="http://flyingman.sophia.w3.org:8180/manager"/>
+ <property name="unicorn.location" value="."/>
+
+ <property name="app.name" value="unicorn"/>
+ <property name="jar.file" value="${app.name}.jar"/>
+ <property name="war.file" value="${app.name}.war"/>
+
+ <!-- Configure properties to access the Manager application -->
+ <property name="url" value="http://flyingman.sophia.w3.org:8180/manager"/>
<property name="username" value="manager"/>
<property name="password" value="******"/>
<path id="project.classpath">
- <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"/>
- <pathelement location="${unicorn.location}/lib/commons-io-1.2.jar"/>
- <pathelement location="${unicorn.location}/lib/commons-logging-1.1.jar"/>
- <pathelement location="${unicorn.location}/lib/icu4j_3_4.jar"/>
- <pathelement location="${unicorn.location}/lib/iri.jar"/>
- <pathelement location="${unicorn.location}/lib/jena.jar"/>
- <pathelement location="${unicorn.location}/lib/jsr173_1.0_api.jar"/>
- <pathelement location="${unicorn.location}/lib/log4j-1.2.12.jar"/>
- <pathelement location="${unicorn.location}/lib/servlet.jar"/>
- <pathelement location="${unicorn.location}/lib/velocity-1.5-dev.jar"/>
- <pathelement location="${unicorn.location}/lib/xercesImpl.jar"/>
+ <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"/>
+ <pathelement location="${unicorn.location}/lib/commons-io-1.2.jar"/>
+ <pathelement location="${unicorn.location}/lib/commons-logging-1.1.jar"/>
+ <pathelement location="${unicorn.location}/lib/icu4j_3_4.jar"/>
+ <pathelement location="${unicorn.location}/lib/iri.jar"/>
+ <pathelement location="${unicorn.location}/lib/jena.jar"/>
+ <pathelement location="${unicorn.location}/lib/jsr173_1.0_api.jar"/>
+ <pathelement location="${unicorn.location}/lib/log4j-1.2.12.jar"/>
+ <pathelement location="${unicorn.location}/lib/servlet.jar"/>
+ <pathelement location="${unicorn.location}/lib/velocity-1.5-dev.jar"/>
+ <pathelement location="${unicorn.location}/lib/xercesImpl.jar"/>
<pathelement location="${unicorn.location}/lib/catalina-ant.jar"/>
<pathelement location="${unicorn.location}/lib/observationresponse.jar"/>
<pathelement location="${unicorn.location}/lib/tasklist.jar"/>
@@ -41,17 +39,15 @@
<pathelement location="${unicorn.location}/lib/saxon8-xpath.jar"/>
</path>
- <!-- Configure the custom Ant tasks for the Manager application -->
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="deploy" classname="org.apache.catalina.ant.DeployTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="list" classname="org.apache.catalina.ant.ListTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="resources" classname="org.apache.catalina.ant.ResourcesTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="roles" classname="org.apache.catalina.ant.RolesTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="start" classname="org.apache.catalina.ant.StartTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="stop" classname="org.apache.catalina.ant.StopTask"/>
- <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="undeploy" classname="org.apache.catalina.ant.UndeployTask"/>
-
-
+ <!-- Configure the custom Ant tasks for the Manager application -->
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="deploy" classname="org.apache.catalina.ant.DeployTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="list" classname="org.apache.catalina.ant.ListTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="resources" classname="org.apache.catalina.ant.ResourcesTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="roles" classname="org.apache.catalina.ant.RolesTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="start" classname="org.apache.catalina.ant.StartTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="stop" classname="org.apache.catalina.ant.StopTask"/>
+ <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="undeploy" classname="org.apache.catalina.ant.UndeployTask"/>
<target name="init">
<mkdir dir="build"/>
@@ -61,17 +57,120 @@
</target>
<target name="build" depends="init">
<echo message="${ant.project.name}: ${ant.file}"/>
+ <javac destdir="build" debug="on" debuglevel="lines,vars,source">
+ <src path="."/>
+ <exclude name="lib/"/>
+ <classpath refid="project.classpath"/>
+ </javac>
+ </target>
+ <target name="jigsaw">
+ <echo message="${ant.project.name}: ${ant.file}"/>
<javac destdir="." debug="on" debuglevel="lines,vars,source">
<src path="."/>
<exclude name="lib/"/>
<classpath refid="project.classpath"/>
</javac>
</target>
- <target name="Test (1)">
- <java fork="yes" classname="org.w3c.unicorn.generated.tasklist.Test" failonerror="true">
+ <target name="index">
+ <java fork="yes" classname="org.w3c.unicorn.index.IndexGenerator" failonerror="true">
<classpath refid="project.classpath"/>
</java>
</target>
+
+ <target name="help">
+ <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"
+ overwrite="true"/>
+ <copy file="./remote_log4j.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"
+ 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"
+ 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="make-war" depends="build" description="Creates the webapp module">
+ <delete file="${war.file}"/>
+ <war warfile="${war.file}" webxml="web.xml" basedir="." excludes="*,**">
+ <classes dir="build">
+ <include name="org/**"/>
+ </classes>
+ <classes dir=".">
+ <exclude name="build/**"/>
+ <include name="build/**/*.properties"/>
+ </classes>
+ <classes file="./build/log4j.xml"/>
+ <webinf dir=".">
+ <include name="uploaded-files/**"/>
+ <include name="logs/**"/>
+ </webinf>
+ <lib dir="lib"/>
+ <zipfileset dir="images" prefix="images"/>
+ <zipfileset dir="style" prefix="style"/>
+ <zipfileset dir="resources" prefix="WEB-INF/resources"/>
+ <zipfileset dir="tabtastic" prefix="tabtastic"/>
+ <zipfileset dir="temporary_files" prefix="temporary_files"/>
+ </war>
+ </target>
+
+ <target name="war" depends="remoteConfiguration,make-war" />
+
+ <target name="jar" depends="build" description="Creates the unicorn library">
+ <delete file="${jar.file}" />
+ <jar destfile="${jar.file}">
+ <fileset dir="build">
+ <include name="org/**/*.class" />
+ <include name="**/*.properties" />
+ <include name="log4j.xml" />
+ </fileset>
+ <fileset dir=".">
+ <include name="org/**/*.java" />
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="deploy" description="Install web application" depends="war">
+ <deploy url="${url}" username="${username}" password="${password}" path="/unicorn"
+ war="unicorn.war"/>
+ </target>
+
+ <target name="reload" description="Reload web application">
+ <reload url="${url}" username="${username}" password="${password}" path="/unicorn"/>
+ </target>
+
+ <target name="undeploy" description="Remove web application">
+ <undeploy url="${url}" username="${username}" password="${password}" path="/unicorn"/>
+ </target>
+
+
+ <!-- Local tests -->
+
<target name="CallParameter">
<java fork="yes" classname="org.w3c.unicorn.contract.methods.CallParameter" failonerror="true">
<classpath refid="project.classpath"/>
@@ -87,38 +186,15 @@
<classpath refid="project.classpath"/>
</java>
</target>
- <target name="WADLUnmarshallerXPath (1)">
- <java fork="yes" classname="org.w3c.unicorn.contract.wadl.WADLUnmarshallerXPath" failonerror="true">
- <classpath refid="project.classpath"/>
- </java>
- </target>
<target name="TaskListUnmarshallerBeans">
<java fork="yes" classname="org.w3c.unicorn.tasklist.TaskListUnmarshallerBeans" failonerror="true">
<classpath refid="project.classpath"/>
</java>
</target>
- <target name="IndexGenerator">
- <java fork="yes" classname="org.w3c.unicorn.index.IndexGenerator" failonerror="true">
- <classpath refid="project.classpath"/>
- </java>
- </target>
<target name="ListFiles">
<java fork="yes" classname="org.w3c.unicorn.util.ListFiles" failonerror="true">
<classpath refid="project.classpath"/>
</java>
</target>
-
- <target name="deploy" description="Install web application" depends="war">
- <deploy url="${url}" username="${username}" password="${password}" path="/unicorn"
- war="unicorn.war"/>
- </target>
-
- <target name="reload" description="Reload web application">
- <reload url="${url}" username="${username}" password="${password}" path="/unicorn"/>
- </target>
- <target name="undeploy" description="Remove web application">
- <undeploy url="${url}" username="${username}" password="${password}" path="/unicorn"/>
- </target>
-
</project>
--- build-user.xml DELETED ---
Received on Tuesday, 23 September 2008 13:54:36 UTC