[jbossweb-commits] JBossWeb SVN: r1700 - in trunk: java/org/apache/jasper/runtime and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2011-04-07 12:52:15 -0400 (Thu, 07 Apr 2011) New Revision: 1700 Modified: trunk/build.xml trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java Log: - Fix oops: actually get the instance manager. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2011-04-07 16:21:20 UTC (rev 1699) +++ trunk/build.xml 2011-04-07 16:52:15 UTC (rev 1700) @@ -494,10 +494,6 @@ <property name="maven.repository.id" value="jboss-releases-repository"/> <!-- Linux/Unix execs --> - <exec dir="." executable="/bin/sh" os="Linux"> - <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}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> @@ -508,10 +504,6 @@ </exec> <!-- Windows exec --> - <exec dir="." executable="cmd" os="Windows NT"> - <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="cmd" os="Windows NT"> <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"/> @@ -523,4 +515,31 @@ </target> + <target name="maven-jdt" description="Upload to Maven repository; if this looks like a hack, it's because it's one"> + + <filter token="VERSION" value="${version}"/> + <copy todir="${tomcat.jars}" filtering="true"> + <fileset dir="res"> + <include name="*-pom.xml"/> + </fileset> + </copy> + + <!-- Maven repository configuration --> + <property name="maven.repository.url" value="https://repository.jboss.org/nexus/service/local/staging/depl... + <property name="maven.repository.id" value="jboss-releases-repository"/> + + <!-- Linux/Unix execs --> + <exec dir="." executable="/bin/sh" os="Linux"> + <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> + + <!-- Windows exec --> + <exec dir="." executable="cmd" os="Windows NT"> + <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> + + </target> + </project> Modified: trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java =================================================================== --- trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java 2011-04-07 16:21:20 UTC (rev 1699) +++ trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java 2011-04-07 16:52:15 UTC (rev 1700) @@ -55,6 +55,7 @@ } protected void init(ServletConfig config) { + instanceManager = InstanceManagerFactory.getInstanceManager(config); maxSize = Constants.MAX_POOL_SIZE; String maxSizeS = getOption(config, OPTION_MAXSIZE, null); if (maxSizeS != null) {