Changes to make it build with glassfish head.
SECTION: RI Changes
M build.xml
- added target glassfish.deploy
+ <target name="glassfish.deploy" description="Replace JSF jars in a
glassfish instance">
M jsf-ri/systest/build.xml
M jsf-ri/systest-per-webapp/build.xml
- add catalina-ant.jar to classpath.
SECTION: RI diffs
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/build.xml,v
retrieving revision 1.11
diff -u -r1.11 build.xml
--- build.xml 8 Jun 2005 22:15:41 -0000 1.11
+++ build.xml 20 Jun 2005 20:20:39 -0000
@@ -205,4 +205,19 @@
<ant dir="${jsf-api.home}" target="test" inheritAll="false" />
<ant dir="${jsf-ri.home}" target="test" inheritAll="false" />
</target>
+
+ <target name="glassfish.deploy" description="Replace JSF jars in a
glassfish instance">
+ <antcall target="clean.jsf.from.glassfish" />
+ <copy todir="${j2ee.home}/lib"
+ file="${jsf-api.home}/build/lib/jsf-api.jar" />
+ <copy todir="${j2ee.home}/lib"
+ file="${jsf-ri.home}/build/lib/jsf-impl.jar" />
+
+ </target>
+
+ <target name="clean.jsf.from.glassfish">
+ <delete>
+ <fileset dir="${j2ee.home}/lib" includes="jsf-*.jar"/>
+ </delete>
+ </target>
</project>
Index: jsf-ri/systest/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- jsf-ri/systest/build.xml 10 May 2005 15:37:36 -0000 1.25
+++ jsf-ri/systest/build.xml 20 Jun 2005 20:20:41 -0000
@@ -115,6 +115,7 @@
<!-- Catalina Ant Custom Taskdef Classpath -->
<path id="catalina-ant.classpath">
<pathelement location="${tomcat.home}/server/lib/catalina-
ant.jar"/>
+ <pathelement location="${catalina-ant.jar}"/>
</path>
Index: jsf-ri/systest-per-webapp/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/
build.xml,v
retrieving revision 1.17
diff -u -r1.17 build.xml
--- jsf-ri/systest-per-webapp/build.xml 6 May 2005 22:02:01
-0000 1.17
+++ jsf-ri/systest-per-webapp/build.xml 20 Jun 2005 20:20:42 -0000
@@ -102,6 +102,7 @@
<!-- Catalina Ant Custom Taskdef Classpath -->
<path id="catalina-ant.classpath">
<pathelement location="${tomcat.home}/server/lib/catalina-
ant.jar"/>
+ <pathelement location="${catalina-ant.jar}"/>
</path>
--
| ed.burns_at_sun.com | {home: 407 869 9587, office: 408 884 9519 OR x31640}
| homepage: | http://purl.oclc.org/NET/edburns/
| aim: edburns0sunw | iim: ed.burns_at_sun.com