Author: remm
Date: Thu Oct 23 16:46:07 2014
New Revision: 1633876
URL: http://svn.apache.org/r1633876
Log:
Update storeconfig with newly introduced elements: SessionIdGenerator,
CookieProcessor, JarScanner and JarScanFilter.
Added:
tomcat/trunk/java/org/apache/catalina/storeconfig/JarScannerSF.java (with
props)
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/webapps/docs/changelog.xml
Added: tomcat/trunk/java/org/apache/catalina/storeconfig/JarScannerSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/JarScannerSF.java?rev=1633876&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/JarScannerSF.java (added)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/JarScannerSF.java Thu Oct
23 16:46:07 2014
@@ -0,0 +1,57 @@
+/*
+ * 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 org.apache.catalina.storeconfig;
+
+import java.io.PrintWriter;
+
+import org.apache.tomcat.JarScanFilter;
+import org.apache.tomcat.JarScanner;
+
+/**
+ * Store server.xml Element JarScanner
+ */
+public class JarScannerSF extends StoreFactoryBase {
+
+ /**
+ * Store the specified JarScanner properties and children
+ * (JarScannerFilter)
+ *
+ * @param aWriter
+ * PrintWriter to which we are storing
+ * @param indent
+ * Number of spaces to indent this element
+ * @param aJarScanner
+ * JarScanner whose properties are being stored
+ *
+ * @exception Exception
+ * if an exception occurs while storing
+ */
+ @Override
+ public void storeChildren(PrintWriter aWriter, int indent, Object
aJarScanner,
+ StoreDescription parentDesc) throws Exception {
+ if (aJarScanner instanceof JarScanner) {
+ JarScanner jarScanner = (JarScanner) aJarScanner;
+ // Store nested <JarScanFilter> element
+ JarScanFilter jarScanFilter = jarScanner.getJarScanFilter();
+ if (jarScanFilter != null) {
+ storeElement(aWriter, indent, jarScanFilter);
+ }
+ }
+ }
+
+}
\ No newline at end of file
Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/JarScannerSF.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java?rev=1633876&r1=1633875&r2=1633876&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java Thu Oct 23
16:46:07 2014
@@ -19,6 +19,8 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
+import org.apache.catalina.Manager;
+import org.apache.catalina.SessionIdGenerator;
import org.apache.catalina.session.StandardManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -47,9 +49,7 @@ public class ManagerSF extends StoreFact
if (log.isDebugEnabled())
log.debug(sm.getString("factory.storeTag", elementDesc
.getTag(), aElement));
- getStoreAppender().printIndent(aWriter, indent + 2);
- getStoreAppender().printTag(aWriter, indent + 2, manager,
- elementDesc);
+ super.store(aWriter, indent, aElement);
}
} else {
super.store(aWriter, indent, aElement);
@@ -78,4 +78,18 @@ public class ManagerSF extends StoreFact
}
+ @Override
+ public void storeChildren(PrintWriter aWriter, int indent, Object aManager,
+ StoreDescription parentDesc) throws Exception {
+ if (aManager instanceof Manager) {
+ Manager manager = (Manager) aManager;
+ // Store nested <SessionIdGenerator> element
+ System.out.println("Checking SessionIdGenerator for store .....");
+ SessionIdGenerator sessionIdGenerator =
manager.getSessionIdGenerator();
+ if (sessionIdGenerator != null) {
+ storeElement(aWriter, indent, sessionIdGenerator);
+ }
+ }
+ }
+
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java?rev=1633876&r1=1633875&r2=1633876&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
Thu Oct 23 16:46:07 2014
@@ -19,6 +19,7 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
+import org.apache.catalina.SessionIdGenerator;
import org.apache.catalina.Store;
import org.apache.catalina.session.PersistentManager;
@@ -46,10 +47,16 @@ public class PersistentManagerSF extends
if (aManager instanceof PersistentManager) {
PersistentManager manager = (PersistentManager) aManager;
- // Store nested <Manager> elements
+ // Store nested <Store> element
Store store = manager.getStore();
storeElement(aWriter, indent, store);
+ // Store nested <SessionIdGenerator> element
+ SessionIdGenerator sessionIdGenerator =
manager.getSessionIdGenerator();
+ if (sessionIdGenerator != null) {
+ storeElement(aWriter, indent, sessionIdGenerator);
+ }
+
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1633876&r1=1633875&r2=1633876&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Thu Oct 23 16:46:07 2014
@@ -42,7 +42,9 @@ import org.apache.catalina.deploy.Naming
import org.apache.catalina.util.ContextName;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.JarScanner;
import org.apache.tomcat.util.descriptor.web.ApplicationParameter;
+import org.apache.tomcat.util.http.CookieProcessor;
/**
* Store server.xml Context element with all children
@@ -293,6 +295,14 @@ public class StandardContextSF extends S
wresources = filterWatchedResources(context, wresources);
getStoreAppender().printTagArray(aWriter, "WatchedResource",
indent + 2, wresources);
+
+ // Store nested <JarScanner> elements
+ JarScanner jarScanner = context.getJarScanner();
+ storeElement(aWriter, indent, jarScanner);
+
+ // Store nested <CookieProcessor> elements
+ CookieProcessor cookieProcessor = context.getCookieProcessor();
+ storeElement(aWriter, indent, cookieProcessor);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1633876&r1=1633875&r2=1633876&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Thu
Oct 23 16:46:07 2014
@@ -116,9 +116,11 @@
tag="Manager"
standard="false"
default="false"
+ children="true"
tagClass="org.apache.catalina.Manager"
storeFactoryClass="org.apache.catalina.storeconfig.ManagerSF">
<TransientAttribute>distributable</TransientAttribute>
+ <TransientAttribute>domain</TransientAttribute>
</Description>
<Description
tag="Manager"
@@ -411,5 +413,34 @@
tagClass="org.apache.catalina.core.StandardThreadExecutor"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
+ <Description
+ tag="JarScanner"
+ standard="true"
+ default="false"
+ children="true"
+ tagClass="org.apache.tomcat.util.scan.StandardJarScanner"
+ storeFactoryClass="org.apache.catalina.storeconfig.JarScannerSF">
+ </Description>
+ <Description
+ tag="JarScanFilter"
+ standard="true"
+ default="false"
+ tagClass="org.apache.tomcat.util.scan.StandardJarScanFilter"
+ storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
+ </Description>
+ <Description
+ tag="CookieProcessor"
+ standard="true"
+ default="false"
+ tagClass="org.apache.tomcat.util.http.LegacyCookieProcessor"
+ storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
+ </Description>
+ <Description
+ tag="SessionIdGenerator"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.util.StandardSessionIdGenerator"
+ storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
+ </Description>
</Registry>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1633876&r1=1633875&r2=1633876&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 23 16:46:07 2014
@@ -165,6 +165,10 @@
Update the minimum required version of the Tomcat Native library (if
used) to 1.1.32. (markt)
</update>
+ <fix>
+ Update storeconfig with newly introduced elements: SessionIdGenerator,
+ CookieProcessor, JarScanner and JarScanFilter. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
