JBossWeb SVN: r1161 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-09-02 08:50:53 -0400 (Wed, 02 Sep 2009)
New Revision: 1161
Modified:
trunk/java/org/apache/catalina/core/ContainerBase.java
trunk/java/org/apache/catalina/core/LocalStrings.properties
Log:
- Concurrent hash map does not like null keys, so be stricter.
Modified: trunk/java/org/apache/catalina/core/ContainerBase.java
===================================================================
--- trunk/java/org/apache/catalina/core/ContainerBase.java 2009-09-02 09:29:45 UTC (rev 1160)
+++ trunk/java/org/apache/catalina/core/ContainerBase.java 2009-09-02 12:50:53 UTC (rev 1161)
@@ -862,9 +862,10 @@
if( log.isDebugEnabled() )
log.debug("Add child " + child + " " + this);
+ if (child.getName() == null)
+ throw new IllegalArgumentException(sm.getString("containerBase.addChild.nullName"));
if (children.get(child.getName()) != null)
- throw new IllegalArgumentException("addChild: Child name '" +
- child.getName() + "' is not unique");
+ throw new IllegalArgumentException(sm.getString("containerBase.addChild.notUnique", child.getName()));
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
@@ -876,9 +877,7 @@
((Lifecycle) child).start();
success = true;
} catch (LifecycleException e) {
- log.error("ContainerBase.addChild: start: ", e);
- throw new IllegalStateException
- ("ContainerBase.addChild: start: " + e);
+ throw new IllegalStateException(sm.getString("containerBase.addChild.start", child.getName()), e);
} finally {
if (!success) {
children.remove(child.getName());
Modified: trunk/java/org/apache/catalina/core/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/core/LocalStrings.properties 2009-09-02 09:29:45 UTC (rev 1160)
+++ trunk/java/org/apache/catalina/core/LocalStrings.properties 2009-09-02 12:50:53 UTC (rev 1161)
@@ -55,6 +55,9 @@
containerBase.backgroundProcess.realm=Exception processing realm {0} background process
containerBase.backgroundProcess.valve=Exception processing valve {0} background process
containerBase.backgroundProcess.jarRepository=Exception processing jar repository {0} background process
+containerBase.addChild.nullName=Child container name cannot be null
+containerBase.addChild.notUnique=Child container with name {0} already exists
+containerBase.addChild.start=Failed to start child container {0}
fastEngineMapper.alreadyStarted=FastEngineMapper {0} has already been started
fastEngineMapper.notStarted=FastEngineMapper {0} has not yet been started
filterChain.filter=Filter execution threw an exception
15 years, 3 months
JBossWeb SVN: r1160 - in sandbox/webapps: metainf and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-09-02 05:29:45 -0400 (Wed, 02 Sep 2009)
New Revision: 1160
Added:
sandbox/webapps/webinf/
sandbox/webapps/webinf/jboss-web.xml
Removed:
sandbox/webapps/jboss-web.xml
Modified:
sandbox/webapps/build.xml
sandbox/webapps/metainf/context.xml
Log:
Add easy test for the context.xml tests (AS requires a different location than
Tomcat).
Modified: sandbox/webapps/build.xml
===================================================================
--- sandbox/webapps/build.xml 2009-09-02 09:25:30 UTC (rev 1159)
+++ sandbox/webapps/build.xml 2009-09-02 09:29:45 UTC (rev 1160)
@@ -17,8 +17,19 @@
<metainf dir="./metainf">
<include name="**/context.xml"/>
</metainf>
- <webinf file="jboss-web.xml"/>
+ <webinf dir="./metainf">
+ <include name="**/context.xml"/>
+ </webinf>
+ <webinf dir="./webinf">
+ <include name="**/jboss-web.xml"/>
+ </webinf>
+ <!--
+ <fileset dir="./metainf" includes="**/context.xml"/>
+ </webinf>
+ <fileset dir="./metainf" includes="**/toto.xml"/>
+ <fileset dir="./webinf" includes="**/jboss-web.xml"/>
<fileset dir="html"/>
+ -->
</war>
<ear destfile="myapp.ear" appxml="./metadata/application.xml">
<fileset dir="." includes="*.war"/>
Deleted: sandbox/webapps/jboss-web.xml
===================================================================
--- sandbox/webapps/jboss-web.xml 2009-09-02 09:25:30 UTC (rev 1159)
+++ sandbox/webapps/jboss-web.xml 2009-09-02 09:29:45 UTC (rev 1160)
@@ -1,22 +0,0 @@
-<jboss-web>
-
- <replication-config>
-
- <replication-granularity>ATTRIBUTE</replication-granularity>
-
- <!-- FIXME set the replication-trigger -->
- <replication-trigger>SET_AND_NON_PRIMITIVE_GET</replication-trigger>
-
- </replication-config>
-
-<!-- Comment out to test virtualHosts
-<context-root>/test2</context-root>
-<virtual-host>jfcpc.gva.redhat.com</virtual-host>
- -->
-
- <!-- In Jboss use the jmx-console existing users -->
- <context-root>/myapp</context-root>
- <security-domain>java:/jaas/jmx-console</security-domain>
-
-
-</jboss-web>
Modified: sandbox/webapps/metainf/context.xml
===================================================================
--- sandbox/webapps/metainf/context.xml 2009-09-02 09:25:30 UTC (rev 1159)
+++ sandbox/webapps/metainf/context.xml 2009-09-02 09:29:45 UTC (rev 1160)
@@ -1,3 +1,3 @@
<Context privileged="true">
- <SessionCookie Path="/"/>
+ <SessionCookie path="/"/>
</Context>
Added: sandbox/webapps/webinf/jboss-web.xml
===================================================================
--- sandbox/webapps/webinf/jboss-web.xml (rev 0)
+++ sandbox/webapps/webinf/jboss-web.xml 2009-09-02 09:29:45 UTC (rev 1160)
@@ -0,0 +1,22 @@
+<jboss-web>
+
+ <replication-config>
+
+ <replication-granularity>ATTRIBUTE</replication-granularity>
+
+ <!-- FIXME set the replication-trigger -->
+ <replication-trigger>SET_AND_NON_PRIMITIVE_GET</replication-trigger>
+
+ </replication-config>
+
+<!-- Comment out to test virtualHosts
+<context-root>/test2</context-root>
+<virtual-host>jfcpc.gva.redhat.com</virtual-host>
+ -->
+
+ <!-- In Jboss use the jmx-console existing users -->
+ <context-root>/myapp</context-root>
+ <security-domain>java:/jaas/jmx-console</security-domain>
+
+
+</jboss-web>
15 years, 3 months
JBossWeb SVN: r1159 - sandbox/webapps/src.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-09-02 05:25:30 -0400 (Wed, 02 Sep 2009)
New Revision: 1159
Modified:
sandbox/webapps/src/MySession.java
Log:
Print the old (received in the request) sessionid.
Modified: sandbox/webapps/src/MySession.java
===================================================================
--- sandbox/webapps/src/MySession.java 2009-09-01 22:05:03 UTC (rev 1158)
+++ sandbox/webapps/src/MySession.java 2009-09-02 09:25:30 UTC (rev 1159)
@@ -61,9 +61,9 @@
out.println("create");
session = request.getSession(true);
} else {
+ out.println("delete: " + session.getId() + " + create");
session.invalidate();
// Create a new one.
- out.println("delete+create");
session = request.getSession(true);
}
out.println("sessions.id " + session.getId());
15 years, 3 months
JBossWeb SVN: r1158 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-09-01 18:05:03 -0400 (Tue, 01 Sep 2009)
New Revision: 1158
Added:
tags/JBOSSWEB_3_0_0_ALPHA3/
Log:
- New test build (to fix smoke test failure).
Copied: tags/JBOSSWEB_3_0_0_ALPHA3 (from rev 1157, trunk)
15 years, 3 months
JBossWeb SVN: r1157 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-09-01 18:03:29 -0400 (Tue, 01 Sep 2009)
New Revision: 1157
Modified:
trunk/build.xml
Log:
- Add small packaging hack until the EE classes get a big update.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-09-01 00:22:31 UTC (rev 1156)
+++ trunk/build.xml 2009-09-01 22:03:29 UTC (rev 1157)
@@ -582,6 +582,8 @@
<!-- JBoss Web Main JAR File -->
<jar jarfile="${tomcat.jars}/jbossweb.jar" index="true">
<fileset dir="${tomcat.classes}">
+ <!-- Temp EE class -->
+ <include name="javax/annotation/security/TransportProtected.class" />
<include name="org/apache/catalina/**" />
<exclude name="org/apache/catalina/startup/catalina.properties" />
<include name="org/apache/naming/**" />
15 years, 3 months
JBossWeb SVN: r1156 - trunk/java/org/apache/catalina.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 20:22:31 -0400 (Mon, 31 Aug 2009)
New Revision: 1156
Modified:
trunk/java/org/apache/catalina/Context.java
Log:
- Add method for configuration in AS.
Modified: trunk/java/org/apache/catalina/Context.java
===================================================================
--- trunk/java/org/apache/catalina/Context.java 2009-08-31 23:28:52 UTC (rev 1155)
+++ trunk/java/org/apache/catalina/Context.java 2009-09-01 00:22:31 UTC (rev 1156)
@@ -81,6 +81,12 @@
/**
+ * Add the given session tracking mode.
+ */
+ public void addSessionTrackingMode(String trackingMode);
+
+
+ /**
* Return the absolute ordering that is configured for this context, or
* null if no absolute ordering has been defined.
*/
15 years, 3 months