Author: jfrederic.clere(a)jboss.com Date: 2011-07-29 06:02:59 -0400 (Fri, 29 Jul 2011) New Revision: 1797 Modified: tags/JBOSSWEB_3_0_0_CR2/build.properties.default tags/JBOSSWEB_3_0_0_CR2/build.xml Log: Add sources of the jdt otherwise nexus complains of missing sources. Modified: tags/JBOSSWEB_3_0_0_CR2/build.properties.default =================================================================== --- tags/JBOSSWEB_3_0_0_CR2/build.properties.default 2011-07-29 07:56:19 UTC (rev 1796) +++ tags/JBOSSWEB_3_0_0_CR2/build.properties.default 2011-07-29 10:02:59 UTC (rev 1797) @@ -38,6 +38,10 @@ jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.5.2.v_981_R35x.jar jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002... +jdt-src.home=${base.path}/eclipse/plugins +jdt-src.lib=${jdt.home} +jdt-src.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-sourceBuild-srcIncluded-3.5.2.zip + # ----- Dojo Toolkit (for test webapp) ----- dojo-js.home=${base.path}/dojo-release-1.4.3 dojo-js.loc=http://download.dojotoolkit.org/release-1.4.3/dojo-release-1.... Modified: tags/JBOSSWEB_3_0_0_CR2/build.xml =================================================================== --- tags/JBOSSWEB_3_0_0_CR2/build.xml 2011-07-29 07:56:19 UTC (rev 1796) +++ tags/JBOSSWEB_3_0_0_CR2/build.xml 2011-07-29 10:02:59 UTC (rev 1797) @@ -40,6 +40,9 @@ <property name="jasper-jdt.home" value="${base.path}/jbossweb-deps/jdt" /> <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"> <fileset dir="${basedir}/lib"> @@ -348,6 +351,7 @@ </jar> <copy file="${jasper-jdt.jar}" todir="${tomcat.jars}" /> + <copy file="${jasper-jdt-src.jar}" todir="${tomcat.jars}" /> <!-- Create a source jar of the jbossweb/servlet classes --> <jar destfile="${tomcat.jars}/jbossweb-src.jar" index="true"> @@ -364,6 +368,7 @@ <target name="clean-depend" description="Clean depend src components"> <delete dir="${jasper-jdt.home}"/> + <delete dir="${jasper-jdt-src.home}"/> </target> <target name="clean"> @@ -432,7 +437,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}"/> @@ -440,6 +444,16 @@ <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> + </target> <target name="build-jasper-jdt"> @@ -453,6 +467,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}"/> @@ -498,6 +522,10 @@ <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> </exec> + <exec dir="." executable="/bin/sh" os="Linux"> + <arg value="-c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt-src.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -Dclassifier=sources"/> + </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/>