April 2008 - jbossweb-commits - Jboss List Archives

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-29 20:49:07 -0400 (Tue, 29 Apr 2008) New Revision: 604 Modified: trunk/dist.xml Log: - Add sources to maven. Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2008-04-29 16:59:36 UTC (rev 603) +++ trunk/dist.xml 2008-04-30 00:49:07 UTC (rev 604) @@ -302,45 +302,53 @@ <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> + </exec> <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> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> + </exec> <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> + </exec> <exec dir="." executable="/bin/sh" os="Linux"> <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> + <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="cmd" os="Windows NT"> <arg value="/c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> + </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> <exec dir="." executable="cmd" os="Windows NT"> <arg value="/c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> + </exec> <exec dir="." executable="cmd" os="Windows NT"> <arg value="/c" /> <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> + </exec> <exec dir="." executable="cmd" os="Windows NT"> <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> + <exec dir="." executable="cmd" os="Windows NT"> + <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> </target>

16 years, 7 months

1
0
0 / 0

JBossWeb SVN: r603 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-29 12:59:36 -0400 (Tue, 29 Apr 2008) New Revision: 603 Modified: trunk/dist.xml Log: - Scripts update. Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2008-04-29 16:30:05 UTC (rev 602) +++ trunk/dist.xml 2008-04-29 16:59:36 UTC (rev 603) @@ -293,11 +293,10 @@ </copy>  -  - <property name="maven.repository.url" value="dav:https://snapshots.jboss.org/maven2"/> - <property name="maven.repository.id" value="snapshots.jboss.org"/> + <property name="maven.repository.url" value="file:///somepath"/> + <property name="maven.repository.id" value="repository.jboss.org"/> +   <exec dir="." executable="/bin/sh" os="Linux">

16 years, 7 months

1
0
0 / 0

JBossWeb SVN: r602 - in trunk: res and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-29 12:30:05 -0400 (Tue, 29 Apr 2008) New Revision: 602 Added: trunk/res/el-api-pom.xml trunk/res/jasper-jdt-pom.xml trunk/res/jsp-api-pom.xml trunk/res/servlet-api-pom.xml Modified: trunk/dist.xml Log: - Scripts update. Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2008-04-29 15:56:22 UTC (rev 601) +++ trunk/dist.xml 2008-04-29 16:30:05 UTC (rev 602) @@ -286,11 +286,13 @@ <target name="maven" description="Upload to Maven repository; if this looks like a hack, it's because it's one"> <filter token="VERSION" value="${version}"/> - <copy file="res/jbossweb-pom.xml" todir="${tomcat.jars}" filtering="true"/> + <copy todir="${tomcat.jars}" filtering="true"> + <fileset dir="res"> + <include name="*-pom.xml"/> + </fileset> + </copy> - <property name="jbossweb.jar" value="${tomcat.jars}/jbossweb.jar"/> - <property name="jbossweb.pom" value="${tomcat.jars}/jbossweb-pom.xml"/> - +   @@ -300,14 +302,46 @@  <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar} -DpomFile=${jbossweb.pom} -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-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.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.jar -DpomFile=${tomcat.jars}/jbossweb-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}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-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}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-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=${jbossweb.jar} -DpomFile=${jbossweb.pom} -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-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}/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.jar -DpomFile=${tomcat.jars}/jbossweb-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}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-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}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + </exec> </target> Added: trunk/res/el-api-pom.xml =================================================================== --- trunk/res/el-api-pom.xml (rev 0) +++ trunk/res/el-api-pom.xml 2008-04-29 16:30:05 UTC (rev 602) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>jboss.web</groupId> + <artifactId>el-api</artifactId> + <version>@VERSION@</version> +</project> Added: trunk/res/jasper-jdt-pom.xml =================================================================== --- trunk/res/jasper-jdt-pom.xml (rev 0) +++ trunk/res/jasper-jdt-pom.xml 2008-04-29 16:30:05 UTC (rev 602) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>jboss.web</groupId> + <artifactId>jasper-jdt</artifactId> + <version>@VERSION@</version> +</project> Added: trunk/res/jsp-api-pom.xml =================================================================== --- trunk/res/jsp-api-pom.xml (rev 0) +++ trunk/res/jsp-api-pom.xml 2008-04-29 16:30:05 UTC (rev 602) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>jboss.web</groupId> + <artifactId>jsp-api</artifactId> + <version>@VERSION@</version> +</project> Added: trunk/res/servlet-api-pom.xml =================================================================== --- trunk/res/servlet-api-pom.xml (rev 0) +++ trunk/res/servlet-api-pom.xml 2008-04-29 16:30:05 UTC (rev 602) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>jboss.web</groupId> + <artifactId>servlet-api</artifactId> + <version>@VERSION@</version> +</project>

16 years, 7 months

1
0
0 / 0

JBossWeb SVN: r601 - in trunk: res and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-29 11:56:22 -0400 (Tue, 29 Apr 2008) New Revision: 601 Added: trunk/res/jbossweb-pom.xml Removed: trunk/res/pom.xml Modified: trunk/dist.xml Log: - Fix support of the snapshots repository (the main repo doesn't work however). Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2008-04-29 15:04:39 UTC (rev 600) +++ trunk/dist.xml 2008-04-29 15:56:22 UTC (rev 601) @@ -286,29 +286,27 @@ <target name="maven" description="Upload to Maven repository; if this looks like a hack, it's because it's one"> <filter token="VERSION" value="${version}"/> - <copy file="res/pom.xml" todir="${tomcat.jars}" filtering="true"/> + <copy file="res/jbossweb-pom.xml" todir="${tomcat.jars}" filtering="true"/> - <property name="jbossweb.jar.location" value="output/jars/jbossweb.jar"/> + <property name="jbossweb.jar" value="${tomcat.jars}/jbossweb.jar"/> + <property name="jbossweb.pom" value="${tomcat.jars}/jbossweb-pom.xml"/> -  -  - -  <property name="maven.repository.url" value="dav:https://snapshots.jboss.org/maven2"/> <property name="maven.repository.id" value="snapshots.jboss.org"/>  <exec dir="." executable="/bin/sh" os="Linux"> <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar.location} -DpomFile=${tomcat.jars}/pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar} -DpomFile=${jbossweb.pom} -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=${jbossweb.jar.location} -DpomFile=${tomcat.jars}\\pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar} -DpomFile=${jbossweb.pom} -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> </exec> </target> Copied: trunk/res/jbossweb-pom.xml (from rev 600, trunk/res/pom.xml) =================================================================== --- trunk/res/jbossweb-pom.xml (rev 0) +++ trunk/res/jbossweb-pom.xml 2008-04-29 15:56:22 UTC (rev 601) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>jboss.web</groupId> + <artifactId>jbossweb</artifactId> + <version>@VERSION@</version> +</project> Deleted: trunk/res/pom.xml =================================================================== --- trunk/res/pom.xml 2008-04-29 15:04:39 UTC (rev 600) +++ trunk/res/pom.xml 2008-04-29 15:56:22 UTC (rev 601) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>3</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>jboss</groupId> - <artifactId>jbossweb</artifactId> - <version>@VERSION@</version> - <description>JBoss Web</description> -</project>

16 years, 7 months

1
0
0 / 0

JBossWeb SVN: r600 - in trunk: res and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-29 11:04:39 -0400 (Tue, 29 Apr 2008) New Revision: 600 Added: trunk/res/pom.xml Modified: trunk/dist.xml Log: - Add Maven support from Paul Gier. Of course it doesn't work. - Error is: [exec] [INFO] ------------------------------------------------------------------------ [exec] [ERROR] BUILD ERROR [exec] [INFO] ------------------------------------------------------------------------ [exec] [INFO] Error deploying artifact: Unsupported Protocol: 'dav': Cannot find wagon which supports the requested protocol: dav [exec] [exec] Component descriptor cannot be found in the component repository: org.apache.maven.wagon.Wagondav. [exec] [INFO] ------------------------------------------------------------------------ Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2008-04-28 18:42:26 UTC (rev 599) +++ trunk/dist.xml 2008-04-29 15:04:39 UTC (rev 600) @@ -283,6 +283,36 @@ </target> + <target name="maven" description="Upload to Maven repository; if this looks like a hack, it's because it's one"> + + <filter token="VERSION" value="${version}"/> + <copy file="res/pom.xml" todir="${tomcat.jars}" filtering="true"/> + + <property name="jbossweb.jar.location" value="output/jars/jbossweb.jar"/> + +  +  + +  + <property name="maven.repository.url" value="dav:https://snapshots.jboss.org/maven2"/> + <property name="maven.repository.id" value="snapshots.jboss.org"/> + +  + <exec dir="." executable="/bin/sh" os="Linux"> + <arg value="-c" /> + <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar.location} -DpomFile=${tomcat.jars}/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=${jbossweb.jar.location} -DpomFile=${tomcat.jars}\\pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + </exec> + + </target> +  <target name="package-zip"> <copy todir="${tomcat.dist}/bin"> Added: trunk/res/pom.xml =================================================================== --- trunk/res/pom.xml (rev 0) +++ trunk/res/pom.xml 2008-04-29 15:04:39 UTC (rev 600) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>jboss</groupId> + <artifactId>jbossweb</artifactId> + <version>@VERSION@</version> + <description>JBoss Web</description> +</project>

16 years, 7 months

1
0
0 / 0

JBossWeb SVN: r599 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-28 14:42:26 -0400 (Mon, 28 Apr 2008) New Revision: 599 Added: tags/JBOSSWEB_2_1_1_CR1/ Log: - JBoss Web 2.1.1 CR1. Copied: tags/JBOSSWEB_2_1_1_CR1 (from rev 598, trunk)

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r598 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-28 14:34:21 -0400 (Mon, 28 Apr 2008) New Revision: 598 Modified: trunk/build.properties.default Log: - NSIS 2.36. Modified: trunk/build.properties.default =================================================================== --- trunk/build.properties.default 2008-04-28 13:01:40 UTC (rev 597) +++ trunk/build.properties.default 2008-04-28 18:34:21 UTC (rev 598) @@ -59,12 +59,12 @@ commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz # ----- NSIS, version 2.0 or later ----- -nsis.home=${base.path}/nsis-2.35 +nsis.home=${base.path}/nsis-2.36 nsis.exe=${nsis.home}/makensis.exe nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll -nsis.loc=${base-sf.loc}/nsis/nsis-2.35.zip +nsis.loc=${base-sf.loc}/nsis/nsis-2.36.zip # ----- JBoss Native, version 2.0 or later ----- jbossnative.home=${base.path}/jboss-native-2.0.3

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r597 - in trunk: java/javax/ejb and 5 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-28 09:01:40 -0400 (Mon, 28 Apr 2008) New Revision: 597 Added: trunk/java/javax/persistence/PersistenceProperty.java Modified: trunk/java/javax/annotation/security/DenyAll.java trunk/java/javax/ejb/EJB.java trunk/java/javax/persistence/PersistenceContext.java trunk/java/org/apache/catalina/deploy/NamingResources.java trunk/java/org/apache/catalina/manager/ManagerServlet.java trunk/java/org/apache/jasper/compiler/Generator.java trunk/webapps/docs/changelog.xml Log: - Port a bunch of Tomcat 6 patches, the most significant being the correction of the quoting fix. Modified: trunk/java/javax/annotation/security/DenyAll.java =================================================================== --- trunk/java/javax/annotation/security/DenyAll.java 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/java/javax/annotation/security/DenyAll.java 2008-04-28 13:01:40 UTC (rev 597) @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -(a)Target({ElementType.TYPE, ElementType.METHOD}) +(a)Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface DenyAll { Modified: trunk/java/javax/ejb/EJB.java =================================================================== --- trunk/java/javax/ejb/EJB.java 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/java/javax/ejb/EJB.java 2008-04-28 13:01:40 UTC (rev 597) @@ -28,6 +28,7 @@ public @interface EJB { String name() default ""; + String description() default ""; Class beanInterface() default java.lang.Object.class; String beanName() default ""; String mappedName() default ""; Modified: trunk/java/javax/persistence/PersistenceContext.java =================================================================== --- trunk/java/javax/persistence/PersistenceContext.java 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/java/javax/persistence/PersistenceContext.java 2008-04-28 13:01:40 UTC (rev 597) @@ -34,4 +34,5 @@ String name() default ""; String unitName() default ""; PersistenceContextType type() default PersistenceContextType.TRANSACTION; + PersistenceProperty[] properties() default {}; } Added: trunk/java/javax/persistence/PersistenceProperty.java =================================================================== --- trunk/java/javax/persistence/PersistenceProperty.java (rev 0) +++ trunk/java/javax/persistence/PersistenceProperty.java 2008-04-28 13:01:40 UTC (rev 597) @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.persistence; + +import java.lang.annotation.Target; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Target({}) +(a)Retention(RetentionPolicy.RUNTIME) + +public @interface PersistenceProperty { + String name(); + String value(); +} Modified: trunk/java/org/apache/catalina/deploy/NamingResources.java =================================================================== --- trunk/java/org/apache/catalina/deploy/NamingResources.java 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/java/org/apache/catalina/deploy/NamingResources.java 2008-04-28 13:01:40 UTC (rev 597) @@ -300,7 +300,7 @@ entries.put(resource.getName(), resource.getType()); } - synchronized (localEjbs) { + synchronized (resourceEnvRefs) { resource.setNamingResources(this); resourceEnvRefs.put(resource.getName(), resource); } @@ -661,7 +661,7 @@ ContextLocalEjb localEjb = null; synchronized (localEjbs) { - localEjb = (ContextLocalEjb) ejbs.remove(name); + localEjb = (ContextLocalEjb) localEjbs.remove(name); } if (localEjb != null) { support.firePropertyChange("localEjb", localEjb, null); @@ -735,13 +735,13 @@ entries.remove(name); - String type = null; + ContextResourceEnvRef resourceEnvRef = null; synchronized (resourceEnvRefs) { - type = (String) resourceEnvRefs.remove(name); + resourceEnvRef = (ContextResourceEnvRef) resourceEnvRefs.remove(name); } - if (type != null) { - support.firePropertyChange("resourceEnvRef", - name + ":" + type, null); + if (resourceEnvRef != null) { + support.firePropertyChange("resourceEnvRef", resourceEnvRef, null); + resourceEnvRef.setNamingResources(null); } } Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java =================================================================== --- trunk/java/org/apache/catalina/manager/ManagerServlet.java 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/java/org/apache/catalina/manager/ManagerServlet.java 2008-04-28 13:01:40 UTC (rev 597) @@ -363,6 +363,8 @@ serverinfo(writer); } else if (command.equals("/expire")) { expireSessions(writer, path, request); + } else if (command.equals("/sessions")) { + expireSessions(writer, path, request); } else if (command.equals("/start")) { start(writer, path); } else if (command.equals("/stop")) { Modified: trunk/java/org/apache/jasper/compiler/Generator.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Generator.java 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/java/org/apache/jasper/compiler/Generator.java 2008-04-28 13:01:40 UTC (rev 597) @@ -294,6 +294,9 @@ attrNames[i] = attrs.getQName(i); } Arrays.sort(attrNames, Collections.reverseOrder()); + if (attrNames.length > 0) { + poolName = poolName + "&"; + } for (int i = 0; i < attrNames.length; i++) { poolName = poolName + "_" + attrNames[i]; } @@ -1751,14 +1754,9 @@ out.print(" "); out.print(attrs.getQName(i)); out.print("="); - String quote = DOUBLE_QUOTE; - String value = attrs.getValue(i); - if (value.indexOf('"') != -1) { - quote = SINGLE_QUOTE; - } - out.print(quote); - out.print(value); - out.print(quote); + out.print(DOUBLE_QUOTE); + out.print(attrs.getValue(i).replace("\"", """)); + out.print(DOUBLE_QUOTE); } attrs = n.getAttributes(); @@ -1773,14 +1771,9 @@ out.print(attributeValue(jspAttrs[i], false, String.class)); out.print(" + \"\\\""); } else { - String quote = DOUBLE_QUOTE; - String value = attrs.getValue(i); - if (value.indexOf('"') != -1) { - quote = SINGLE_QUOTE; - } - out.print(quote); - out.print(value); - out.print(quote); + out.print(DOUBLE_QUOTE); + out.print(attrs.getValue(i).replace("\"", """)); + out.print(DOUBLE_QUOTE); } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-04-28 13:00:31 UTC (rev 596) +++ trunk/webapps/docs/changelog.xml 2008-04-28 13:01:40 UTC (rev 597) @@ -78,6 +78,16 @@ <bug>29936</bug>: In some circumstances, Tomcat would use the parser from a webapp to parse web.xml and possibly context.xml files. (markt) </fix> + <fix> + <bug>43470</bug>: Fix cut and paste errors in NamingResources, submitted + by Lucas Galfaso. (markt) + </fix> + <fix> + <bug>43425</bug>: Annotations not spec compliant. Submitted by Dain Sundstrom. (markt) + </fix> + <fix> + <bug>43366</bug>: Provide backwards compatibility for sessions command. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> @@ -143,6 +153,12 @@ <fix> <bug>31257</bug>: Quote endorsed dirs if they contain a space. (markt) </fix> + <fix> + <bug>43617</bug>: Correctly handle quotes in attribute values for tag(x) files. (remm) + </fix> + <fix> + <bug>44877</bug>: Prevent collisions in tag pool names. (markt) + </fix> </changelog> </subsection> </section>

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r596 - trunk/java/org/jboss/web/cluster.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-04-28 09:00:31 -0400 (Mon, 28 Apr 2008) New Revision: 596 Modified: trunk/java/org/jboss/web/cluster/ClusterListener.java Log: - Add address/port config to connect to the proxy (reverse will likely not be used for now). Modified: trunk/java/org/jboss/web/cluster/ClusterListener.java =================================================================== --- trunk/java/org/jboss/web/cluster/ClusterListener.java 2008-04-28 10:36:50 UTC (rev 595) +++ trunk/java/org/jboss/web/cluster/ClusterListener.java 2008-04-28 13:00:31 UTC (rev 596) @@ -68,6 +68,18 @@ // ---------------------------------------------- Properties + protected int proxyPort = 8000; + public int getProxyPort() { return proxyPort; } + public void setProxyPort(int proxyPort) { this.proxyPort = proxyPort; } + + + protected InetAddress proxyAddress = null; + public InetAddress getProxyAddress() { return proxyAddress; } + public void setAddress(InetAddress proxyAddress) { this.proxyAddress = proxyAddress; } + + + // ---------------------------------------------- LifecycleListener Methods + /** * Acknowledge the occurrence of the specified event. * Note: Will never be called when the listener is associated to a Server, @@ -101,8 +113,6 @@ } - // ---------------------------------------------- LifecycleListener Methods - /** * Primary entry point for startup and shutdown events. * @@ -176,11 +186,10 @@ boolean ajp = ((String) IntrospectionUtils.getProperty(connector.getProtocolHandler(), "name")).startsWith("ajp-"); if (reverseConnection) { - parameters.put("ReverseConnectionPort", "" + connector.getPort()); - } else { - parameters.put("Host", getAddress(connector)); - parameters.put("Port", "" + connector.getPort()); + parameters.put("Reversed", "true"); } + parameters.put("Host", getAddress(connector)); + parameters.put("Port", "" + connector.getPort()); if (ajp) { parameters.put("Type", "ajp"); } else if (ssl) {

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r595 - branches/JBOSSWEB_2_0_0_GA_CP05_JBAPP729_JBAPP746/src/share/classes/org/apache/jasper/compiler.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-04-28 06:36:50 -0400 (Mon, 28 Apr 2008) New Revision: 595 Modified: branches/JBOSSWEB_2_0_0_GA_CP05_JBAPP729_JBAPP746/src/share/classes/org/apache/jasper/compiler/Compiler.java Log: JBAPP746: r578 DoTag() problem in jasper. Modified: branches/JBOSSWEB_2_0_0_GA_CP05_JBAPP729_JBAPP746/src/share/classes/org/apache/jasper/compiler/Compiler.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP05_JBAPP729_JBAPP746/src/share/classes/org/apache/jasper/compiler/Compiler.java 2008-04-28 10:34:15 UTC (rev 594) +++ branches/JBOSSWEB_2_0_0_GA_CP05_JBAPP729_JBAPP746/src/share/classes/org/apache/jasper/compiler/Compiler.java 2008-04-28 10:36:50 UTC (rev 595) @@ -141,24 +141,10 @@ ctxt.checkOutputDir(); String javaFileName = ctxt.getServletJavaFileName(); + ServletWriter writer = null; - try { - // Setup the ServletWriter - String javaEncoding = ctxt.getOptions().getJavaEncoding(); - OutputStreamWriter osw = null; - try { - osw = new OutputStreamWriter( - new FileOutputStream(javaFileName), javaEncoding); - } catch (UnsupportedEncodingException ex) { - errDispatcher.jspError("jsp.error.needAlternateJavaEncoding", - javaEncoding); - } - - writer = new ServletWriter(new PrintWriter(osw)); - ctxt.setWriter(writer); - // Reset the temporary variable counter for the generator. JspUtil.resetTemporaryVariableName(); @@ -168,6 +154,7 @@ if (ctxt.isPrototypeMode()) { // generate prototype .java file for the tag file + writer = setupContextWriter(javaFileName); Generator.generate(writer, this, pageNodes); writer.close(); writer = null; @@ -207,6 +194,7 @@ ELFunctionMapper.map(this, pageNodes); // generate servlet .java file + writer = setupContextWriter(javaFileName); Generator.generate(writer, this, pageNodes); writer.close(); writer = null; @@ -259,6 +247,26 @@ return smapStr; } + private ServletWriter setupContextWriter(String javaFileName) + throws FileNotFoundException, JasperException { + ServletWriter writer; + // Setup the ServletWriter + String javaEncoding = ctxt.getOptions().getJavaEncoding(); + OutputStreamWriter osw = null; + + try { + osw = new OutputStreamWriter( + new FileOutputStream(javaFileName), javaEncoding); + } catch (UnsupportedEncodingException ex) { + errDispatcher.jspError("jsp.error.needAlternateJavaEncoding", + javaEncoding); + } + + writer = new ServletWriter(new PrintWriter(osw)); + ctxt.setWriter(writer); + return writer; + } + /** * Compile the servlet from .java file to .class file */

16 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits April 2008