JBossWeb SVN: r1817 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-17 03:27:50 -0400 (Wed, 17 Aug 2011)
New Revision: 1817
Modified:
trunk/build.properties.default
trunk/build.xml
Log:
Add jasper-jdt-src and use latest released eclipse.
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2011-08-16 15:19:10 UTC (rev 1816)
+++ trunk/build.properties.default 2011-08-17 07:27:50 UTC (rev 1817)
@@ -35,9 +35,13 @@
# ----- Eclipse JDT, version 3.2 or later -----
jdt.home=${base.path}/plugins
jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.7.0.v_B35.jar
-jdt.loc=http://download.eclipse.org/eclipse/downloads/drops/S-3.7M5-201101272034/org.eclipse.jdt-3.7M5.zip
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.7.0.v_B61.jar
+jdt.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/org.eclipse.jdt-3.7.zip
+jdt-src.home=${base.path}/eclipse/plugins
+jdt-src.lib=${jdt.home}
+jdt-src.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-sourceBuild-srcIncluded-3.7.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: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-08-16 15:19:10 UTC (rev 1816)
+++ trunk/build.xml 2011-08-17 07:27:50 UTC (rev 1817)
@@ -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}"/>
12 years, 10 months
JBossWeb SVN: r1816 - branches/2.1.x.
by jbossweb-commits＠lists.jboss.org
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">
12 years, 10 months
JBossWeb SVN: r1815 - tags/JBOSSWEB_2_1_12_GA.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-16 07:45:00 -0400 (Tue, 16 Aug 2011)
New Revision: 1815
Modified:
tags/JBOSSWEB_2_1_12_GA/build.properties.default
tags/JBOSSWEB_2_1_12_GA/build.xml
tags/JBOSSWEB_2_1_12_GA/dist.xml
Log:
Add jasper-jdt-src.
Modified: tags/JBOSSWEB_2_1_12_GA/build.properties.default
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/build.properties.default 2011-08-16 09:49:57 UTC (rev 1814)
+++ tags/JBOSSWEB_2_1_12_GA/build.properties.default 2011-08-16 11:45:00 UTC (rev 1815)
@@ -40,8 +40,12 @@
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://archive.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-JDT-3.5.2.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: tags/JBOSSWEB_2_1_12_GA/build.xml
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/build.xml 2011-08-16 09:49:57 UTC (rev 1814)
+++ tags/JBOSSWEB_2_1_12_GA/build.xml 2011-08-16 11:45:00 UTC (rev 1815)
@@ -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">
@@ -735,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}"/>
@@ -743,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}"/>
@@ -829,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: tags/JBOSSWEB_2_1_12_GA/dist.xml
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/dist.xml 2011-08-16 09:49:57 UTC (rev 1814)
+++ tags/JBOSSWEB_2_1_12_GA/dist.xml 2011-08-16 11:45:00 UTC (rev 1815)
@@ -333,6 +333,10 @@
<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">
12 years, 10 months
JBossWeb SVN: r1814 - tags/JBOSSWEB_2_1_12_GA.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-16 05:49:57 -0400 (Tue, 16 Aug 2011)
New Revision: 1814
Modified:
tags/JBOSSWEB_2_1_12_GA/build.properties.default
Log:
Use archive.eclipse.org to have a more reproducable build.
Modified: tags/JBOSSWEB_2_1_12_GA/build.properties.default
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/build.properties.default 2011-08-16 09:27:19 UTC (rev 1813)
+++ tags/JBOSSWEB_2_1_12_GA/build.properties.default 2011-08-16 09:49:57 UTC (rev 1814)
@@ -40,7 +40,7 @@
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.5.2.zip
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
12 years, 10 months
JBossWeb SVN: r1813 - tags/JBOSSWEB_2_1_12_GA.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-16 05:27:19 -0400 (Tue, 16 Aug 2011)
New Revision: 1813
Modified:
tags/JBOSSWEB_2_1_12_GA/build.xml
tags/JBOSSWEB_2_1_12_GA/dist.xml
Log:
Add missing sources.
Modified: tags/JBOSSWEB_2_1_12_GA/build.xml
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/build.xml 2011-08-15 15:56:36 UTC (rev 1812)
+++ tags/JBOSSWEB_2_1_12_GA/build.xml 2011-08-16 09:27:19 UTC (rev 1813)
@@ -620,6 +620,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>
Modified: tags/JBOSSWEB_2_1_12_GA/dist.xml
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/dist.xml 2011-08-15 15:56:36 UTC (rev 1812)
+++ tags/JBOSSWEB_2_1_12_GA/dist.xml 2011-08-16 09:27:19 UTC (rev 1813)
@@ -317,10 +317,22 @@
<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>
<!-- Windows exec -->
<exec dir="." executable="cmd" os="Windows NT">
12 years, 10 months
JBossWeb SVN: r1812 - tags/JBOSSWEB_2_1_12_GA.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-15 11:56:36 -0400 (Mon, 15 Aug 2011)
New Revision: 1812
Modified:
tags/JBOSSWEB_2_1_12_GA/build.properties.default
Log:
Ooos needed GA.
Modified: tags/JBOSSWEB_2_1_12_GA/build.properties.default
===================================================================
--- tags/JBOSSWEB_2_1_12_GA/build.properties.default 2011-08-15 15:22:58 UTC (rev 1811)
+++ tags/JBOSSWEB_2_1_12_GA/build.properties.default 2011-08-15 15:56:36 UTC (rev 1812)
@@ -14,7 +14,7 @@
version.minor=1
version.build=12
version.patch=0
-version.tag=SNAPSHOT
+version.tag=GA
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
12 years, 10 months
JBossWeb SVN: r1811 - tags.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-15 11:22:58 -0400 (Mon, 15 Aug 2011)
New Revision: 1811
Added:
tags/JBOSSWEB_2_1_12_GA/
Log:
For 5.1.2
12 years, 10 months
JBossWeb SVN: r1810 - branches/2.1.x.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-15 11:18:11 -0400 (Mon, 15 Aug 2011)
New Revision: 1810
Modified:
branches/2.1.x/build.properties.default
Log:
Ajust version.
Modified: branches/2.1.x/build.properties.default
===================================================================
--- branches/2.1.x/build.properties.default 2011-08-15 15:12:29 UTC (rev 1809)
+++ branches/2.1.x/build.properties.default 2011-08-15 15:18:11 UTC (rev 1810)
@@ -12,7 +12,7 @@
# ----- Version Control Flags -----
version.major=2
version.minor=1
-version.build=4
+version.build=12
version.patch=0
version.tag=SNAPSHOT
12 years, 10 months
JBossWeb SVN: r1809 - branches/2.1.x/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-15 11:12:29 -0400 (Mon, 15 Aug 2011)
New Revision: 1809
Modified:
branches/2.1.x/webapps/docs/changelog.xml
Log:
I have to do it :D
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2011-08-12 06:30:06 UTC (rev 1808)
+++ branches/2.1.x/webapps/docs/changelog.xml 2011-08-15 15:12:29 UTC (rev 1809)
@@ -15,7 +15,7 @@
</properties>
<body>
-<section name="JBoss Web 2.1.12.GA (remm)">
+<section name="JBoss Web 2.1.12.GA (jfclere)">
<subsection name="Catalina">
<changelog>
<fix>
12 years, 10 months
JBossWeb SVN: r1808 - in branches/2.1.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-08-12 02:30:06 -0400 (Fri, 12 Aug 2011)
New Revision: 1808
Modified:
branches/2.1.x/java/org/apache/el/parser/ELParser.jjt
branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
Port r1434.
Modified: branches/2.1.x/java/org/apache/el/parser/ELParser.jjt
===================================================================
--- branches/2.1.x/java/org/apache/el/parser/ELParser.jjt 2011-08-11 19:30:51 UTC (rev 1807)
+++ branches/2.1.x/java/org/apache/el/parser/ELParser.jjt 2011-08-12 06:30:06 UTC (rev 1808)
@@ -360,7 +360,7 @@
*/
< LITERAL_EXPRESSION:
( (~["$", "#", "\\"])* "\\" (["$", "#"])?
- | (~["$", "#"])* (["$", "#"] ~["{"])
+ | (~["$", "#"])* (["$", "#"] ~["{", "$", "#"])
| (~["$", "#"])+
)+
| "$"
Modified: branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java
===================================================================
--- branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java 2011-08-11 19:30:51 UTC (rev 1807)
+++ branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java 2011-08-12 06:30:06 UTC (rev 1808)
@@ -128,6 +128,8 @@
jjCheckNAdd(5);
break;
case 5:
+ if ((0xffffffe7ffffffffL & l) == 0L)
+ break;
if (kind > 1)
kind = 1;
jjCheckNAddStates(5, 8);
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2011-08-11 19:30:51 UTC (rev 1807)
+++ branches/2.1.x/webapps/docs/changelog.xml 2011-08-12 06:30:06 UTC (rev 1808)
@@ -75,6 +75,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>49081</bug>: EL parsing fix. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="JBoss Web 2.1.10.GA (remm)">
12 years, 10 months