2002/css-validator build.xml,1.8,1.9 web.xml,1.5,1.6

Update of /sources/public/2002/css-validator
In directory hutz:/tmp/cvs-serv12806

Modified Files:
	build.xml web.xml 
Log Message:
enhanced target war

Index: build.xml
===================================================================
RCS file: /sources/public/2002/css-validator/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- build.xml	29 Feb 2008 10:40:22 -0000	1.8
+++ build.xml	19 Jan 2009 16:59:37 -0000	1.9
@@ -8,7 +8,6 @@
       
   <property file="build.properties"/>
   <property name="servlet.lib" value="/usr/share/java/servlet-2.3.jar"/>
-  <property name="jigsaw.lib" value="/usr/share/java/jigsaw-2.2.5a.jar"/>
 
   <!-- =================================================================== -->
   <!-- Project-wide properties                                           -->
@@ -25,7 +24,9 @@
 
 	<path id="build.class.path">
 		<pathelement location="${servlet.lib}"/>
-		<pathelement location="${jigsaw.lib}"/>
+    <fileset dir="lib">
+        <include name="*.jar"/>
+    </fileset>
 	</path>
 	
 	<target name="build" description="Builds the validator">
@@ -33,22 +34,14 @@
 		<javac 
 			classpathref="build.class.path"
 			destdir="./build" 
-			encoding="ISO-8859-15"
+			encoding="UTF-8"
 			debug="yes">
 			<src path="./org/w3c"/>
 		</javac>
 		<copy todir="./build">
 		    <fileset dir="./">
-		      <exclude name="**/*.java"/>
-		      <exclude name="*.html*"/>
-		      <exclude name="*.css"/>
-		      <exclude name="*.bat"/>
-		      <exclude name="*.bat"/>
-		      <exclude name="*.xml"/>
-		      <exclude name="*.ico"/>
-		      <exclude name="*.cvs"/>
-		      <exclude name="**/style/*"/>
-		      <exclude name="**/images/*"/>
+		      <exclude name="*"/>
+		      <exclude name="**"/>
 		    </fileset>
 		</copy>
 	</target>
@@ -77,12 +70,13 @@
 
 	<target name="war" depends="build" description="Creates the webapp module">
 		<delete file="${war.file}"/>
-		<war warfile="${war.file}"
-			webxml="web.xml"
-			basedir="."
-			excludes="**/src/**,**/docs/**,**/build/**,**/*.tmp,*.jar,*.war,**/org/**,**/html/**"
-		>
+		<war warfile="${war.file}" webxml="web.xml" basedir="." includes="*html*,favicon.ico,images/**,style/**,scripts/**,tabtastic/**" excludes="html">
 			<classes dir="build"/>
+      <classes dir=".">
+        <exclude name="org/**/*.java"/>
+        <include name="org/**"/>
+      </classes>
+      <lib dir="lib"/>
 		</war>
 	</target>
 

Index: web.xml
===================================================================
RCS file: /sources/public/2002/css-validator/web.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- web.xml	8 Jul 2008 15:42:10 -0000	1.5
+++ web.xml	19 Jan 2009 16:59:37 -0000	1.6
@@ -15,6 +15,9 @@
        <url-pattern>/validator</url-pattern>
    </servlet-mapping>
 
+   <welcome-file-list>
+     <welcome-file>validator.html.en</welcome-file>
+   </welcome-file-list>
 
 <!-- ===================== Additional MIME Type Mappings =================== -->
 <!-- tomcat does not know language file extensions, we have to force them    -->

Received on Monday, 19 January 2009 16:59:47 UTC