Index: glassfish.xml =================================================================== --- glassfish.xml (revision 25423) +++ glassfish.xml (working copy) @@ -609,6 +609,10 @@ <copy file="${repository}/${tomcat.jasper_jdt.name}/jars/${tomcat.jasper_jdt.name}-${tomcat.jasper_jdt.version}.jar" tofile="${glassfish.home}/lib/${tomcat.jasper_jdt.name}.jar"/> + <!-- Unzip xalan binaries into unzipped folder --> + <mkdir dir="${repository}/${apache.xalan.name}/unzipped"/> + <unzip src="${repository}/${apache.xalan.name}/binaries/${apache.xalan.name}_${apache.xalan.version}.zip" dest="${repository}/${apache.xalan.name}/unzipped"/> + <!-- Initialize pwc.jar --> <!-- "duplicate" attribute has to be "preserve" such that the multiple copies of META-INF/LICENSE.txt can be @@ -628,6 +632,13 @@ <zipfileset src="${jakarta-regexp.jar}" excludes="META-INF/**"/> </jar> + <!-- Copy the xalan jar files to publish/pwc folder --> + <copy todir="${glassfish.home}/../pwc" > + <fileset dir="${repository}/${apache.xalan.name}/unzipped"> + <include name="**/*.jar" /> + </fileset> + </copy> + </target> <target name="unzip-pwc.jars"> Index: project.properties =================================================================== --- project.properties (revision 25423) +++ project.properties (working copy) @@ -49,6 +49,8 @@ repo.remote2=http://dlc.sun.com.edgesuite.net/javaee5/external/${glassfish.os.name} repo.remote3=http://dlc.sun.com.edgesuite.net/javaee5/external/shared repo.remote4=http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat +#repo.remote5=http://archive.apache.org/dist/xml +repo.remote5=/export/home/xalan271_solbuild glassfish.module.name=bootstrap @@ -99,6 +101,8 @@ glassfish.javahelp.version=2.0_01-fcs tomcat.jasper_jdt.name=jasper-jdt tomcat.jasper_jdt.version=6.0.26 +apache.xalan.name=xalan-j +apache.xalan.version=2_7_1 ## Webservice related binaries glassfish.jax_common_api.name=jax-common-api @@ -198,6 +202,10 @@ appserv-jstl.jar=${glassfish.home}/lib/appserv-jstl.jar appserv-rt.jar=${glassfish.home}/lib/appserv-rt.jar pwc.jar=${glassfish.home}/../pwc/pwc.jar +xalan.jar=${maven.repo.local}/${apache.xalan.name}/unzipped/xalan.jar +xerces-impl.jar=${maven.repo.local}/${apache.xalan.name}/unzipped/xercesImpl.jar +serializer.jar=${maven.repo.local}/${apache.xalan.name}/unzipped/serializer.jar +xml-apis.jar=${maven.repo.local}/${apache.xalan.name}/unzipped/xml-apis.jar appserv-launch.jar=${glassfish.home}/lib/appserv-launch.jar cc.jar=${glassfish.admingui.home}/WEB-INF/lib/cc.jar webui.jar=${glassfish.admingui.home}/WEB-INF/lib/webui.jar Index: maven.xml =================================================================== --- maven.xml (revision 25423) +++ maven.xml (working copy) @@ -100,6 +100,7 @@ <goal name="bootstrap-pwc"> <attainGoal name="clobber"/> <attainGoal name="bootstrap-jdt"/> + <attainGoal name="bootstrap-xalan"/> <maven:reactor basedir="${glassfish.maven}" includes="**/project-pwc.xml" banner="Downloading binaries for building from source project" @@ -115,6 +116,15 @@ <ant:get src="${repo.remote4}/${tomcat.jasper_jdt.name}/${tomcat.jasper_jdt.version}/${tomcat.jasper_jdt.name}-${tomcat.jasper_jdt.version}.jar" dest="${maven.repo.local}/${tomcat.jasper_jdt.name}/jars/${tomcat.jasper_jdt.name}-${tomcat.jasper_jdt.version}.jar" usetimestamp="true" /> </goal> + <goal name="bootstrap-xalan"> + <ant:echo message="Downloading Binary at: ${maven.repo.local}/jars/${apache.xalan.name}_${apache.xalan.version}.zip"/> + <ant:mkdir dir="${maven.repo.local}/${apache.xalan.name}/binaries"/> + <j:if test="${maven.proxy.host} !=null"> + <ant:setproxy proxyhost="${maven.proxy.host}" proxyport="${maven.proxy.port}"/> + </j:if> + <ant:copy file="${repo.remote5}/${apache.xalan.name}_${apache.xalan.version}.zip" todir="${maven.repo.local}/${apache.xalan.name}/binaries" /> + </goal> + <postGoal name="bootstrap-pwc"> <ant:ant dir="." target="post-bootstrap-pwc"/> </postGoal>