Author: remm
Date: Thu Oct 3 16:23:59 2013
New Revision: 1528920
URL: http://svn.apache.org/r1528920
Log:
- Fix some classnames for resources following refactorings
- Add support for InetAddress for the connector address
- Do not ignore the thread local listener and add the special engine listener
just in case
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1528920&r1=1528919&r2=1528920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
Thu Oct 3 16:23:59 2013
@@ -23,7 +23,6 @@ import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -101,10 +100,6 @@ public class ConnectorStoreAppender exte
if (value == null) {
continue; // Null values are not persisted
}
- // Convert IP addresses to strings so they will be persisted
- if (value instanceof InetAddress) {
- value = ((InetAddress) value).getHostAddress();
- }
if (!isPersistable(value.getClass())) {
continue;
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java?rev=1528920&r1=1528919&r2=1528920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
Thu Oct 3 16:23:59 2013
@@ -56,7 +56,7 @@ public class GlobalNamingResourcesSF ext
resources);
} else {
if(log.isWarnEnabled())
- log.warn("Can't find NamingRsources Store Factory!");
+ log.warn("Can't find NamingResources Store Factory!");
}
getStoreAppender().printIndent(aWriter, indent + 2);
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1528920&r1=1528919&r2=1528920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Thu
Oct 3 16:23:59 2013
@@ -21,6 +21,7 @@ import java.beans.IndexedPropertyDescrip
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.PrintWriter;
+import java.net.InetAddress;
import java.util.Iterator;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -38,7 +39,7 @@ public class StoreAppender {
Integer.TYPE, Boolean.class, Boolean.TYPE, Byte.class, Byte.TYPE,
Character.class, Character.TYPE, Double.class, Double.TYPE,
Float.class, Float.TYPE, Long.class, Long.TYPE, Short.class,
- Short.TYPE, };
+ Short.TYPE, InetAddress.class };
/**
* print the closing tag
@@ -328,6 +329,10 @@ public class StoreAppender {
*/
public void printValue(PrintWriter writer, int indent, String name,
Object value) {
+ // Convert IP addresses to strings so they will be persisted
+ if (value instanceof InetAddress) {
+ value = ((InetAddress) value).getHostAddress();
+ }
if (!(value instanceof String)) {
value = value.toString();
}
@@ -377,7 +382,7 @@ public class StoreAppender {
protected boolean isPersistable(Class<?> clazz) {
for (int i = 0; i < persistables.length; i++) {
- if (persistables[i] == clazz) {
+ if (persistables[i] == clazz ||
persistables[i].isAssignableFrom(clazz)) {
return (true);
}
}
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=1528920&r1=1528919&r2=1528920&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 3 16:23:59 2013
@@ -82,13 +82,13 @@
<TransientAttribute>ignoreAnnotations</TransientAttribute>
</Description>
<Description
- id="org.apache.catalina.deploy.NamingResources.[GlobalNamingResources]"
+
id="org.apache.catalina.deploy.NamingResourcesImpl.[GlobalNamingResources]"
tag="GlobalNamingResources"
standard="true"
default="false"
attributes="false"
children="true"
- tagClass="org.apache.catalina.deploy.NamingResources"
+ tagClass="org.apache.catalina.deploy.NamingResourcesImpl"
storeFactoryClass="org.apache.catalina.storeconfig.GlobalNamingResourcesSF">
</Description>
<Description
@@ -109,7 +109,7 @@
default="false"
attributes="false"
children="true"
- tagClass="org.apache.catalina.deploy.NamingResources"
+ tagClass="org.apache.catalina.deploy.NamingResourcesImpl"
storeFactoryClass="org.apache.catalina.storeconfig.NamingResourcesSF">
</Description>
<Description
@@ -168,7 +168,7 @@
tag="Parameter"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ApplicationParameter"
+ tagClass="org.apache.tomcat.util.descriptor.web.ApplicationParameter"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
@@ -191,7 +191,7 @@
<TransientChild>org.apache.catalina.startup.HostConfig</TransientChild>
<TransientChild>org.apache.catalina.core.StandardHost$MemoryLeakTrackingListener</TransientChild>
<TransientChild>org.apache.catalina.mapper.MapperListener</TransientChild>
-
<TransientChild>org.apache.catalina.core.ThreadLocalLeakPreventionListener</TransientChild>
+
<TransientChild>org.apache.catalina.core.StandardEngine$AccessLogListener</TransientChild>
</Description>
<Description
id="org.apache.catalina.core.StandardServer.[ServerLifecycleListener]"
@@ -223,28 +223,28 @@
tag="Environment"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextEnvironment"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextEnvironment"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="EJB"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextEjb"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextEjb"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="LocalEjb"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextLocalEjb"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextLocalEjb"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="Resource"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextResource"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextResource"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
@@ -291,21 +291,21 @@
tag="ResourceEnvRef"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextResourceEnvRef"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="ResourceLink"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextResourceLink"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextResourceLink"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="Transaction"
standard="true"
default="false"
- tagClass="org.apache.catalina.deploy.ContextTransaction"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextTransaction"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
