W3C home > Mailing lists > Public > www-validator-cvs@w3.org > August 2009

2006/unicorn .cvsignore,1.1.1.1,1.2 .project,1.1,1.2 build.xml,1.9,1.10 .classpath,1.5,1.6 web.xml,1.1.1.1,NONE .umlproject,1.1.1.1,NONE

From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 28 Aug 2009 12:39:56 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1Mh0kk-0005tv-KQ@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn
In directory hutz:/tmp/cvs-serv22368

Modified Files:
	.cvsignore .project build.xml .classpath 
Removed Files:
	web.xml .umlproject 
Log Message:
Merging dev2 in HEAD

Index: .cvsignore
===================================================================
RCS file: /sources/public/2006/unicorn/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- .cvsignore	31 Aug 2006 09:05:16 -0000	1.1.1.1
+++ .cvsignore	28 Aug 2009 12:39:54 -0000	1.2
@@ -1,3 +1,2 @@
-logs
 build
-velocity.log.1
+dist
\ No newline at end of file

Index: .project
===================================================================
RCS file: /sources/public/2006/unicorn/.project,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .project	31 Aug 2006 09:05:16 -0000	1.1
+++ .project	28 Aug 2009 12:39:54 -0000	1.2
@@ -1,23 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>unicorn</name>
-	<comment>@key 32303036303332302D3130303020756E69636F726E2F6A65616E </comment>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.omondo.uml.std.Builder</name>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.omondo.uml.std.Nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>

Index: build.xml
===================================================================
RCS file: /sources/public/2006/unicorn/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build.xml	23 Jul 2009 13:21:23 -0000	1.9
+++ build.xml	28 Aug 2009 12:39:54 -0000	1.10
@@ -1,190 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="unicorn" default="build" basedir=".">
-  <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="******"/>
+<?xml version="1.0" ?>
+<project name="" basedir=".">
+	<property name="warfile" value="unicorn"/>
+	<property name="webapps" value="."/>
+	<property name="src" location="src"/>
+	<property name="build" location="build"/>
+	<property name="dist" location="dist"/>
 	
-    <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="${unicorn.location}/lib/catalina-ant.jar"/>
-    	<pathelement location="${unicorn.location}/lib/observationresponse.jar"/>
-    	<pathelement location="${unicorn.location}/lib/tasklist.jar"/>
-    	<pathelement location="${unicorn.location}/lib/xbean.jar"/>
-    	<pathelement location="${unicorn.location}/lib/xbean_xpath.jar"/>
-    	<pathelement location="${unicorn.location}/lib/xmlbeans-qname.jar"/>
-    	<pathelement location="${unicorn.location}/lib/xmlpublic.jar"/>
-    	<pathelement location="${unicorn.location}/lib/saxon8.jar"/>
-    	<pathelement location="${unicorn.location}/lib/saxon8-dom.jar"/>
-    	<pathelement location="${unicorn.location}/lib/saxon8-jdom.jar"/>
-    	<pathelement location="${unicorn.location}/lib/saxon8-xpath.jar"/>
-    </path>
+	<target name="all" depends="war, jigsaw, jar"/>
 	
-    <!-- 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="war" depends="compile" description="Generate unicorn.war">
+		<mkdir dir="${dist}"/>
+		<war destfile="${dist}/${warfile}.war" webxml="WebContent/WEB-INF/web.xml" update="true">
+			<classes dir="build\classes"/>
+			<fileset dir="WebContent">
+				<exclude name="WEB-INF/web.xml"/>
+			</fileset>
+		</war>
+	</target>
 	
-    <target name="init">
-        <mkdir dir="build"/>
-    </target>
-    <target name="clean">
-        <delete dir="build"/>
-    </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>
-        <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">
-            <classpath refid="project.classpath"/>
-        </java>
-    </target>
-
-    <target name="help">
-      <echo message="Please run: $ ant -v -projecthelp"/>
-    </target>
-    
-    <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="./org/w3c/unicorn/conf/log4j_Tomcat.xml"
-            tofile="./build/log4j.xml"
-            overwrite="true"/>
-      <copy file="./org/w3c/unicorn/conf/extensions.properties"
-            tofile="./build/org/w3c/unicorn/conf/extensions.properties" 
-            overwrite="true"/>
-      <copy file="./org/w3c/unicorn/conf/responseParsers.properties"
-            tofile="./build/org/w3c/unicorn/conf/responseParsers.properties" 
-            overwrite="true"/>
-      <copy file="./org/w3c/unicorn/conf/specialFormaters.properties" 
-            tofile="./build/org/w3c/unicorn/conf/specialFormaters.properties"
-            overwrite="true"/>
-      <copy file="./org/w3c/unicorn/conf/velocity.properties" 
-            tofile="./build/org/w3c/unicorn/conf/velocity.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="copyConfiguration,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"/>
-        </java>
-    </target>
-    <target name="DigesterDriver">
-        <java fork="yes" classname="bordel.DigesterDriver" failonerror="true">
-            <classpath refid="project.classpath"/>
-        </java>
-    </target>
-    <target name="WADLUnmarshallerXPath">
-        <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="ListFiles">
-        <java fork="yes" classname="org.w3c.unicorn.util.ListFiles" failonerror="true">
-            <classpath refid="project.classpath"/>
-        </java>
-    </target>
+	<target name="jigsaw" depends="compile" description="Generate folder for Jigsaw" >
+		<mkdir dir="${dist}/jigsaw"/>
+		<copy todir="${dist}/jigsaw" overwrite="true">
+			<fileset dir="WebContent"/>
+		</copy>
+		<copy todir="${dist}/jigsaw/WEB-INF" overwrite="true">
+			<fileset dir="${build}"/>
+		</copy>
+	</target>
+	
+	<target name="jar" depends="compile" description="Generate unicorn.jar" >
+		<mkdir dir="${dist}"/>
+		<jar jarfile="${dist}/unicorn.jar" basedir="${build}"/>
+	</target>
 
+	<target name="clean" description="clean up" >
+		<delete dir="${build}/classes"/>
+		<delete dir="${dist}"/>
+	</target>
+	
+	<target name="compile">
+		<mkdir dir="${build}/classes"/>
+		<javac srcdir="${src}" destdir="${build}/classes" debug="on" debuglevel="lines,vars,source">
+			<classpath>
+				<fileset dir="WebContent/WEB-INF/lib" includes="*.jar"/>
+			</classpath>
+        </javac>
+	</target>
+	
+	<target name="deploy" depends="war">
+		<copy todir="${webapps}" overwrite="true">
+			<fileset dir=".">
+				<include name="${dist}/unicorn.war"/>
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="xsd">
+		<xmlbean schema="WebContent/WEB-INF/resources/schemas/tasklist.xsd" destfile="WebContent/WEB-INF/lib/tasklist.jar" javasource="1.5" classpath="WebContent/WEB-INF/lib/xbean.jar"/>
+		<xmlbean schema="WebContent/WEB-INF/resources/schemas/observer-response.xsd" destfile="WebContent/WEB-INF/lib/observationresponse.jar" javasource="1.5" classpath="WebContent/WEB-INF/lib/xbean.jar"/>
+	</target>
+	
+	<taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpath="WebContent/WEB-INF/lib/xbean.jar"/>
+	
 </project>

Index: .classpath
===================================================================
RCS file: /sources/public/2006/unicorn/.classpath,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .classpath	11 Aug 2009 13:43:03 -0000	1.5
+++ .classpath	28 Aug 2009 12:39:54 -0000	1.6
@@ -1,25 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="lib/|buildsds/|conf/" kind="src" path=""/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/velocity-1.6.2.jar" sourcepath="E:/Unicorn/librairies/velocity-1.6.2/src/java">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/E:/Unicorn/librairies/velocity-1.6.2/docs/api/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/log4j-1.2.15.jar" sourcepath="E:/Unicorn/librairies/apache-log4j-1.2.15/src/main/java">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/E:/Unicorn/librairies/apache-log4j-1.2.15/src/main/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpcore-4.0.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpmime-4.0.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpclient-4.0.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/apache-mime4j-0.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/activation.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-fileupload-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-io-1.2.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/icu4j_3_4.jar"/>
-	<classpathentry kind="lib" path="lib/iri.jar"/>
-	<classpathentry kind="lib" path="lib/jena.jar"/>
-	<classpathentry kind="lib" path="lib/jsr173_1.0_api.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/>
-	<classpathentry kind="lib" path="lib/servlet.jar"/>
-	<classpathentry kind="lib" path="lib/velocity-1.5-dev.jar"/>
-	<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/catalina-ant.jar"/>
-	<classpathentry kind="lib" path="lib/observationresponse.jar"/>
-	<classpathentry kind="lib" path="lib/tasklist.jar"/>
-	<classpathentry kind="lib" path="lib/xbean_xpath.jar"/>
-	<classpathentry kind="lib" path="lib/xbean.jar"/>
-	<classpathentry kind="lib" path="lib/xmlbeans-qname.jar"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jsr173_1.0_api.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-lang-2.4.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/activation.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.1.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-io-1.2.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/icu4j_3_4.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/iri.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/jena.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/observationresponse.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/resolver.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-dom.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-jdom.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-sql.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-xom.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-xpath.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/servlet.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean_xpath.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlbeans-qname.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlpublic.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/tasklist.jar"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>

--- web.xml DELETED ---

--- .umlproject DELETED ---
Received on Friday, 28 August 2009 12:40:37 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:38 UTC