M build.xml
add a target to build zip file containing the portlet library so
that it can be released as a separate bundle on java.net.
M jsf-demo/build.xml
remove jsf-portlet.jar as well as the portlet-guessNumber from
the distribution.
M jsf-ri/build.xml
don't build jsf-portlet.jar with RI. remove all references to portlet
library.
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/build.xml,v
retrieving revision 1.2
diff -u -r1.2 build.xml
--- build.xml 6 Aug 2004 00:51:40 -0000 1.2
+++ build.xml 6 Aug 2004 17:35:49 -0000
@@ -57,6 +57,7 @@
<delete file="${basedir}/javaserverfaces_binary_${version}.zip" />
<delete file="${basedir}/javaserverfaces_source_${version}.zip" />
<delete file="${basedir}/javaserverfaces_source_${version}.class" />
+ <delete file="jsf-portlet.zip" />
</target>
<!-- Create the source distribution -->
@@ -97,5 +98,44 @@
classFile="javaserverfaces_source_${version}.class"
licenseFile="${installer.home}/jrl_1_3.txt"
zipFile="${basedir}/javaserverfaces_source_${version}.zip" />
+ </target>
+
+ <!--
+ ===================================================================
+ Create the Portlet Integration library
+ ===================================================================
+ -->
+ <target name="build-portletLibrary"
+ description="Build Portlet Integration Library">
+ <mkdir dir="${jsf-portlet.home}/dist"/>
+ <mkdir dir="${jsf-portlet.home}/dist/samples"/>
+ <mkdir dir="${jsf-portlet.home}/dist/lib"/>
+ <echo>
+ jsf-portlet is ${jsf-portlet.home}
+ </echo>
+
+ <delete file="jsf-portlet.zip" />
+ <delete dir="${jsf-portlet.home}/dist" />
+ <delete dir="${jsf-portlet.home}/build" />
+
+ <ant dir="${jsf-portlet.home}" inheritall="false" target="main"/>
+ <copy file="${jsf-portlet.home}/portlet-lib/build/lib/jsf-portlet.jar"
+ todir="${jsf-portlet.home}/dist/lib" />
+
+ <!-- copy the portlet-guessNumber.war and source -->
+ <ant dir="${jsf-demo.home}/portlet-guessNumber" inheritAll="false">
+ </ant>
+ <copy todir="${jsf-portlet.home}/dist/samples"
+ file="${jsf-demo.home}/portlet-guessNumber/build/portlet-guessNumber.war"/>
+
+ <copy todir="${jsf-portlet.home}/dist/samples/portlet-guessNumber"
+ includeEmptyDirs="false">
+ <fileset dir="${jsf-demo.home}/portlet-guessNumber" excludes="**/build/**"/>
+ </copy>
+ <zip zipfile="jsf-portlet.zip">
+ <fileset dir="${jsf-portlet.home}"
+ includes="dist/**"/>
+ </zip>
+
</target>
</project>
Index: jsf-demo/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-demo/build.xml,v
retrieving revision 1.79
diff -u -r1.79 build.xml
--- jsf-demo/build.xml 19 Jul 2004 20:41:40 -0000 1.79
+++ jsf-demo/build.xml 6 Aug 2004 17:35:49 -0000
@@ -118,7 +118,6 @@
<ant target="clean" dir="carstore"/>
<ant target="clean" dir="nonjsp"/>
<ant target="clean" dir="standard"/>
- <ant target="clean" dir="portlet-guessNumber"/>
<ant target="clean" dir="test/mappingDemo"/>
</target>
@@ -277,8 +276,6 @@
file="${basedir}/carstore/build/jsf-cardemo.war"/>
<copy todir="${dist.home}/samples"
file="${basedir}/guessNumber/build/jsf-guessNumber.war"/>
- <copy todir="${dist.home}/samples"
- file="${basedir}/portlet-guessNumber/build/portlet-guessNumber.war"/>
<copy todir="${dist.home}/samples"
file="${basedir}/nonjsp/dist/jsf-nonjsp.war"/>
<echo> copy the demo-components.jar </echo>
@@ -324,9 +321,6 @@
</copy>
<copy file="${basedir}/components/wspack-build.xml"
tofile="${dist.home}/samples/components/build.xml" />
- <copy todir="${dist.home}/samples/portlet-guessNumber" includeEmptyDirs="false">
- <fileset dir="${basedir}/portlet-guessNumber"/>
- </copy>
</target>
@@ -334,7 +328,6 @@
<echo> copy the necessary libs </echo>
<copy file="${jsf-api.jar}" todir="${dist.home}/lib"/>
<copy file="${jsf-impl.jar}" todir="${dist.home}/lib"/>
- <copy file="${jsf-portlet.jar}" todir="${dist.home}/lib"/>
<copy file="${jsf-ri.home}/build/generate/conf/share/html_basic.tld" todir="${dist.home}/lib"/>
<copy file="${jsf-ri.home}/conf/share/jsf_core.tld" todir="${dist.home}/lib"/>
</target>
@@ -451,8 +444,6 @@
<ant dir="${basedir}/helloDuke" inheritAll="false">
</ant>
<ant dir="${basedir}/guessNumber" inheritAll="false">
- </ant>
- <ant dir="${basedir}/portlet-guessNumber" inheritAll="false">
</ant>
<ant dir="${basedir}/nonjsp" inheritAll="false">
</ant>
Index: jsf-ri/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.162
diff -u -r1.162 build.xml
--- jsf-ri/build.xml 16 Jun 2004 19:48:04 -0000 1.162
+++ jsf-ri/build.xml 6 Aug 2004 17:35:50 -0000
@@ -45,9 +45,6 @@
<property name="jsf-tools.dir" value="${basedir}/../jsf-tools"/>
- <property name="jsf-portlet.dir" value="${basedir}/../jsf-portlet"/>
-
-
<!-- The base directory for distribution targets -->
<property name="dist.home" value="${basedir}/dist"/>
@@ -95,7 +92,6 @@
<property name="standard.jar"
value="${tomcat.home}/jstl/lib/standard.jar"/>
<property name="jsf-api.jar" value="${jsf-api.home}/build/lib/jsf-api.jar"/>
- <property name="jsf-portlet.jar" value="${jsf-portlet.dir}/portlet-lib/build/lib/jsf-portlet.jar"/>
<property name="jsf-api.dtd" value="${jsf-api.home}/build/lib/web-facesconfig_1_1.dtd"/>
<property name="tlddoc.jar" value="${tomcat.home}/../tlddoc-1_0/tlddoc.jar"/>
<property name="jcov.jar"
@@ -422,7 +418,6 @@
<ant dir="${basedir}/systest-per-webapp" inheritall="false" target="remove"/>
<ant dir="${basedir}/systest-per-webapp" inheritall="false" target="clean"/>
<ant antfile="build-tests.xml" target="remove.jsp.incompat.workaround"/>
- <ant dir="${jsf-portlet.dir}" inheritall="false" target="clean"/>
</target>
<target name="all" depends="clean,prepare,compile"
@@ -609,19 +604,6 @@
basedir="${build.coverage}/jar" />
</target>
- <!--
- ===================================================================
- Create the Portlet Integration library
- ===================================================================
- -->
- <target name="build-jsf-portlet.jar" depends="jars">
- <echo>
- jsf-portlet is ${jsf-portlet.dir}
- </echo>
- <ant dir="${jsf-portlet.dir}" inheritall="false" target="main"/>
- <copy file="${jsf-portlet.jar}" todir="${build.home}/lib" />
- </target>
-
<!--
==================================================================
TCK related
@@ -665,7 +647,7 @@
</target>
- <target name="main" depends="jars,build-jsf-portlet.jar,copy.to.tck"/>
+ <target name="main" depends="jars,copy.to.tck"/>
<!--
===================================================================
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net