10:19 a.m.
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-16 11:19:10 -0400 (Tue, 16 Aug 2011)
New Revision: 1816
Modified:
branches/2.1.x/build.properties.default
branches/2.1.x/build.xml
branches/2.1.x/dist.xml
Log:
Add sources and use archive.
Modified: branches/2.1.x/build.properties.default
===================================================================
--- branches/2.1.x/build.properties.default 2011-08-16 11:45:00 UTC (rev 1815)
+++ branches/2.1.x/build.properties.default 2011-08-16 15:19:10 UTC (rev 1816)
@@ -40,8 +40,13 @@
jdt.home=${base.path}/eclipse/plugins
jdt.lib=${jdt.home}
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.4.2.v_883_R34x.jar
-jdt.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-JDT-3.4.1.zip
+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-JDT-3.4.1.zip
+jdt-src.home=${base.path}/eclipse/plugins
+jdt-src.lib=${jdt.home}
+jdt-src.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-sourceBuild-srcIncluded-3.4.1.zip
+
+
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
Modified: branches/2.1.x/build.xml
===================================================================
--- branches/2.1.x/build.xml 2011-08-16 11:45:00 UTC (rev 1815)
+++ branches/2.1.x/build.xml 2011-08-16 15:19:10 UTC (rev 1816)
@@ -59,6 +59,8 @@
<property name="jasper-jdt.home"
value="${base.path}/jbossweb-deps/jdt" />
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar"
value="${jasper-jdt.home}/jasper-jdt.jar"/>
+ <property name="jasper-jdt-src.home"
value="${base.path}/jbossweb-deps/jdt-src" />
+ <property name="jasper-jdt-src.jar"
value="${jasper-jdt-src.home}/jasper-jdt-src.jar"/>
<!-- Classpath -->
<path id="tomcat.classpath">
@@ -573,8 +575,9 @@
<copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
file="RELEASE-NOTES"
filtering="true" />
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
/>
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
/>
<copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib"
/>
+ <copy file="${jasper-jdt-src.jar}" todir="${tomcat.jars}"
/>
<!-- JBoss Web Main JAR File -->
<jar jarfile="${tomcat.jars}/jbossweb.jar" index="true">
@@ -620,6 +623,22 @@
<include name="javax/el/**" />
</fileset>
</zip>
+ <zip destfile="${tomcat.jars}/el-api-src.zip">
+ <fileset dir="${basedir}/java">
+ <include name="javax/el/**" />
+ </fileset>
+ </zip>
+ <zip destfile="${tomcat.jars}/servlet-api-src.zip">
+ <fileset dir="${basedir}/java">
+ <include name="javax/servlet/**" />
+ <exclude name="javax/servlet/jsp/**" />
+ </fileset>
+ </zip>
+ <zip destfile="${tomcat.jars}/jsp-api-src.zip">
+ <fileset dir="${basedir}/java">
+ <include name="javax/servlet/jsp/**" />
+ </fileset>
+ </zip>
</target>
@@ -719,7 +738,6 @@
<!-- Build Jasper JDT bundle -->
<antcall target="downloadzip">
<param name="sourcefile" value="${jdt.loc}"/>
- <param name="destfile" value="${jdt.jar}"/>
<param name="destdir" value="${base.path}"/>
</antcall>
<mkdir dir="${jasper-jdt.home}"/>
@@ -727,7 +745,17 @@
<param name="basedir" value="${jasper-jdt.home}" />
</antcall>
+ <!-- Build Jasper JDT sources bundle -->
<antcall target="downloadzip">
+ <param name="sourcefile" value="${jdt-src.loc}"/>
+ <param name="destdir" value="${jasper-jdt-src.home}"/>
+ </antcall>
+ <mkdir dir="${jasper-jdt-src.home}"/>
+ <antcall target="build-jasper-jdt-src">
+ <param name="basedir" value="${jasper-jdt-src.home}" />
+ </antcall>
+
+ <antcall target="downloadzip">
<param name="sourcefile" value="${jbossnative.loc}"/>
<param name="destfile" value="${jbossnative.openssl}"/>
<param name="destdir" value="${jbossnative.home}"/>
@@ -813,6 +841,16 @@
</jar>
</target>
+ <target name="build-jasper-jdt-src">
+ <jar destfile="${jasper-jdt-src.jar}" index="true">
+ <fileset
dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model">
+ <include name="org/eclipse/jdt/core/compiler/**"/>
+ <include name="org/eclipse/jdt/internal/compiler/**"/>
+ <include
name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="tests">
<antcall target="downloadgz">
<param name="sourcefile" value="${dojo-js.loc}"/>
Modified: branches/2.1.x/dist.xml
===================================================================
--- branches/2.1.x/dist.xml 2011-08-16 11:45:00 UTC (rev 1815)
+++ branches/2.1.x/dist.xml 2011-08-16 15:19:10 UTC (rev 1816)
@@ -317,10 +317,26 @@
<arg value="-c" />
<arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar
-DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id}"/>
</exec>
- <exec dir="." executable="/bin/sh" os="Linux">
+ <exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
<arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip
-Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}
-DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version}
-Dclassifier=sources"/>
</exec>
+ <exec dir="." executable="/bin/sh" os="Linux">
+ <arg value="-c" />
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api-src.zip
-Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}
-DgroupId=jboss.web -DartifactId=el-api -Dversion=${version}
-Dclassifier=sources"/>
+ </exec>
+ <exec dir="." executable="/bin/sh" os="Linux">
+ <arg value="-c" />
+ <arg value="mvn deploy:deploy-file
-Dfile=${tomcat.jars}/servlet-api-src.zip -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=servlet-api
-Dversion=${version} -Dclassifier=sources"/>
+ </exec>
+ <exec dir="." executable="/bin/sh" os="Linux">
+ <arg value="-c" />
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api-src.zip
-Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}
-DgroupId=jboss.web -DartifactId=jsp-api -Dversion=${version}
-Dclassifier=sources"/>
+ </exec>
+ <exec dir="." executable="/bin/sh" os="Linux">
+ <arg value="-c" />
+ <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt-src.jar
-Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}
-DgroupId=jboss.web -DartifactId=jasper-jdt -Dversion=${version}
-Dclassifier=sources"/>
+ </exec>
<!-- Windows exec -->
<exec dir="." executable="cmd" os="Windows NT">