JBossWeb SVN: r1706 - in trunk: java/org/apache/catalina/session and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-19 08:34:05 -0400 (Tue, 19 Apr 2011)
New Revision: 1706
Modified:
trunk/java/org/apache/catalina/Session.java
trunk/java/org/apache/catalina/session/StandardSession.java
trunk/webapps/docs/changelog.xml
Log:
- Add a new session id change event.
Modified: trunk/java/org/apache/catalina/Session.java
===================================================================
--- trunk/java/org/apache/catalina/Session.java 2011-04-15 13:51:28 UTC (rev 1705)
+++ trunk/java/org/apache/catalina/Session.java 2011-04-19 12:34:05 UTC (rev 1706)
@@ -64,6 +64,12 @@
public static final String SESSION_PASSIVATED_EVENT = "passivateSession";
+ /**
+ * The SessionEvent event type when a session is created.
+ */
+ public static final String SESSION_ID_CHANGED_EVENT = "changeIdSession";
+
+
// ------------------------------------------------------------- Properties
Modified: trunk/java/org/apache/catalina/session/StandardSession.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardSession.java 2011-04-15 13:51:28 UTC (rev 1705)
+++ trunk/java/org/apache/catalina/session/StandardSession.java 2011-04-19 12:34:05 UTC (rev 1706)
@@ -332,13 +332,20 @@
public void setId(String id) {
if ((this.id != null) && (manager != null))
- manager.remove(this);
+ manager.remove(this);
+ String oldId = this.id;
this.id = id;
if (manager != null)
manager.add(this);
- tellNew();
+
+ if (oldId == null) {
+ tellNew();
+ } else {
+ // Notify interested session event listeners
+ fireSessionEvent(Session.SESSION_ID_CHANGED_EVENT, oldId);
+ }
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-04-15 13:51:28 UTC (rev 1705)
+++ trunk/webapps/docs/changelog.xml 2011-04-19 12:34:05 UTC (rev 1706)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.0.CR1 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Add a new session id changed event to SessionListener, the Servlet API events are not appropriate. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.0.Beta11 (remm)">
<subsection name="Catalina">
<changelog>
13 years, 8 months
Newsletter Sun, 17 Apr 2011 06:30:34 +0200
by jbossweb-commits＠lists.jboss.org
Hello!
Do you want a pleasant future, increase in money earning power, and pat on the back :)?
Special offer:
We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience.
Get a Degree in 4 weeks with our program!
~Our program will let ALL with professional experience
get a 100% verified Degree:
~Doctorate
~Bachelors
~Masters
- Think about it...
- Follow YOUR Dreams!
- Live a much better life by earning or upgrading your degree.
This is a splendid way to make a right move and receive your due
benefits... if you are qualified but are lacking that piece of paper. Get one from us in a short time.
If you want to get better - you must Contact Us to start improving your life!
~CONTACT US~
1-305-460-2287
You should leave us a voice message with your phone number with country code if outside USA and name and we'll get back to you as soon as possible.
It's your move...
Make the right decision.
Sincerely.
Do Not Reply to this Email.
We do not reply to text inquiries, and our server will reject all response traffic.
We apologize for any inconvenience this may have caused you.
13 years, 8 months
JBossWeb SVN: r1705 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-15 09:51:28 -0400 (Fri, 15 Apr 2011)
New Revision: 1705
Added:
tags/JBOSSWEB_7_0_0_BETA11/
Log:
- Beta 11.
- Last beta hopefully.
13 years, 8 months
JBossWeb SVN: r1704 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-15 08:17:40 -0400 (Fri, 15 Apr 2011)
New Revision: 1704
Modified:
trunk/webapps/docs/changelog.xml
Log:
- Changelog update.
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-04-13 13:25:47 UTC (rev 1703)
+++ trunk/webapps/docs/changelog.xml 2011-04-15 12:17:40 UTC (rev 1704)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.0.Beta11 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fix authenticator NPE due to uninitialized containerLog field when the modeler is disabled. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.0.Beta10 (remm)">
<subsection name="Jasper">
<changelog>
13 years, 8 months
JBossWeb SVN: r1703 - in trunk/java/org/apache/catalina: valves and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-13 09:25:47 -0400 (Wed, 13 Apr 2011)
New Revision: 1703
Modified:
trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
trunk/java/org/apache/catalina/valves/ValveBase.java
Log:
- Now that JMX is optional, there's no safe location to initialize the containerLog field.
- getContainer().getLogger() has to be used instead.
Modified: trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 2011-04-07 17:02:12 UTC (rev 1702)
+++ trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 2011-04-13 13:25:47 UTC (rev 1703)
@@ -289,8 +289,8 @@
if (session == null)
session = request.getSessionInternal(false);
if (session == null) {
- if (containerLog.isDebugEnabled())
- containerLog.debug
+ if (getContainer().getLogger().isDebugEnabled())
+ getContainer().getLogger().debug
("User took so long to log on the session expired");
if (landingPage == null) {
response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT,
Modified: trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java 2011-04-07 17:02:12 UTC (rev 1702)
+++ trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java 2011-04-13 13:25:47 UTC (rev 1703)
@@ -93,8 +93,8 @@
associate(ssoId, getSession(request, true));
*/
- if (containerLog.isDebugEnabled())
- containerLog.debug("User authentication is not required");
+ if (getContainer().getLogger().isDebugEnabled())
+ getContainer().getLogger().debug("User authentication is not required");
return (true);
Modified: trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2011-04-07 17:02:12 UTC (rev 1702)
+++ trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2011-04-13 13:25:47 UTC (rev 1703)
@@ -26,11 +26,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.coyote.ActionCode;
@@ -90,8 +88,6 @@
Principal principal = request.getUserPrincipal();
//String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (principal != null) {
- if (containerLog.isDebugEnabled())
- containerLog.debug("Already authenticated '" + principal.getName() + "'");
// Associate the session with any existing SSO session in order
// to get coordinated session invalidation at logout
String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
@@ -126,13 +122,10 @@
*/
// Retrieve the certificate chain for this client
- if (containerLog.isDebugEnabled())
- containerLog.debug(" Looking up certificates");
-
X509Certificate certs[] = request.getCertificateChain();
if ((certs == null) || (certs.length < 1)) {
- if (containerLog.isDebugEnabled())
- containerLog.debug(" No certificates included with this request");
+ if (getContainer().getLogger().isDebugEnabled())
+ getContainer().getLogger().debug(" No certificates included with this request");
response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
sm.getString("authenticator.certificates"));
return (false);
@@ -141,8 +134,8 @@
// Authenticate the specified certificate chain
principal = context.getRealm().authenticate(certs);
if (principal == null) {
- if (containerLog.isDebugEnabled())
- containerLog.debug(" Realm.authenticate() returned false");
+ if (getContainer().getLogger().isDebugEnabled())
+ getContainer().getLogger().debug(" Realm.authenticate() returned false");
response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
sm.getString("authenticator.unauthorized"));
return (false);
Modified: trunk/java/org/apache/catalina/valves/ValveBase.java
===================================================================
--- trunk/java/org/apache/catalina/valves/ValveBase.java 2011-04-07 17:02:12 UTC (rev 1702)
+++ trunk/java/org/apache/catalina/valves/ValveBase.java 2011-04-13 13:25:47 UTC (rev 1703)
@@ -39,7 +39,6 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.util.StringManager;
-import org.jboss.logging.Logger;
import org.jboss.servlet.http.HttpEvent;
@@ -68,12 +67,6 @@
/**
- * Container log
- */
- protected Logger containerLog = null;
-
-
- /**
* Descriptive information about this Valve implementation. This value
* should be overridden by subclasses.
*/
@@ -275,7 +268,6 @@
Container container=this.getContainer();
if( container == null || ! (container instanceof ContainerBase) )
return null;
- this.containerLog = container.getLogger();
ContainerBase containerBase=(ContainerBase)container;
Pipeline pipe=containerBase.getPipeline();
Valve valves[]=pipe.getValves();
13 years, 8 months
JBossWeb SVN: r1702 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-07 13:02:12 -0400 (Thu, 07 Apr 2011)
New Revision: 1702
Added:
tags/JBOSSWEB_7_0_0_BETA10/
Log:
- Beta 10: fix oops with tagpool changes.
13 years, 9 months
JBossWeb SVN: r1701 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-07 13:00:44 -0400 (Thu, 07 Apr 2011)
New Revision: 1701
Modified:
trunk/webapps/docs/changelog.xml
Log:
- Changelog update.
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-04-07 16:52:15 UTC (rev 1700)
+++ trunk/webapps/docs/changelog.xml 2011-04-07 17:00:44 UTC (rev 1701)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.0.Beta10 (remm)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Fix per thread tagpool NPE due to missing instance manager. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.0.Beta9 (remm)">
<subsection name="Catalina">
<changelog>
13 years, 9 months
JBossWeb SVN: r1700 - in trunk: java/org/apache/jasper/runtime and 1 other directory.
by jbossweb-commits＠lists.jboss.org
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/deploy/maven2"/>
+ <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) {
13 years, 9 months
JBossWeb SVN: r1699 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-07 12:21:20 -0400 (Thu, 07 Apr 2011)
New Revision: 1699
Added:
tags/JBOSSWEB_7_0_0_BETA9/
Log:
Web 7 Beta9.
13 years, 9 months
JBossWeb SVN: r1698 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-04-07 12:18:33 -0400 (Thu, 07 Apr 2011)
New Revision: 1698
Modified:
trunk/webapps/docs/changelog.xml
Log:
- Changelog update.
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-04-07 15:55:10 UTC (rev 1697)
+++ trunk/webapps/docs/changelog.xml 2011-04-07 16:18:33 UTC (rev 1698)
@@ -16,6 +16,27 @@
<body>
+<section name="JBoss Web 7.0.0.Beta9 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Improve connector API and make the native listener in charge of the default protocol
+ handler selection. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Rewrite the remnants of DOM based parsing using STAX. JSPX files still use SAX. (remm)
+ </fix>
+ <fix>
+ Fix per thread tagpool to use the instance manager, and default to the per thread pool. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.0.Beta8 (remm)">
<subsection name="Coyote">
<changelog>
13 years, 9 months