Author: markt
Date: Mon Jul 8 21:02:07 2013
New Revision: 1500947
URL: http://svn.apache.org/r1500947
Log:
NamingResources -> NamingResourcesImpl in preparation for new interface
NamingResources
Added:
tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
- copied, changed from r1500934,
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
Removed:
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Server.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Jul 8 21:02:07 2013
@@ -34,7 +34,7 @@ import org.apache.catalina.deploy.ErrorP
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.JarScanner;
@@ -424,7 +424,7 @@ public interface Context extends Contain
/**
* Return the naming resources associated with this web application.
*/
- public NamingResources getNamingResources();
+ public NamingResourcesImpl getNamingResources();
/**
@@ -432,7 +432,7 @@ public interface Context extends Contain
*
* @param namingResources The new naming resources
*/
- public void setNamingResources(NamingResources namingResources);
+ public void setNamingResources(NamingResourcesImpl namingResources);
/**
Modified: tomcat/trunk/java/org/apache/catalina/Server.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Server.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Server.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Server.java Mon Jul 8 21:02:07 2013
@@ -20,7 +20,7 @@ package org.apache.catalina;
import java.io.File;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.catalina.startup.Catalina;
/**
@@ -55,7 +55,7 @@ public interface Server extends Lifecycl
/**
* Return the global naming resources.
*/
- public NamingResources getGlobalNamingResources();
+ public NamingResourcesImpl getGlobalNamingResources();
/**
@@ -64,7 +64,7 @@ public interface Server extends Lifecycl
* @param globalNamingResources The new global naming resources
*/
public void setGlobalNamingResources
- (NamingResources globalNamingResources);
+ (NamingResourcesImpl globalNamingResources);
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Mon
Jul 8 21:02:07 2013
@@ -54,7 +54,7 @@ import org.apache.catalina.deploy.Contex
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.ContextService;
import org.apache.catalina.deploy.ContextTransaction;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.naming.ContextAccessController;
@@ -112,7 +112,7 @@ public class NamingContextListener
/**
* Associated naming resources.
*/
- protected NamingResources namingResources = null;
+ protected NamingResourcesImpl namingResources = null;
/**
@@ -634,7 +634,7 @@ public class NamingContextListener
log.debug("Creating JNDI naming context");
if (namingResources == null) {
- namingResources = new NamingResources();
+ namingResources = new NamingResourcesImpl();
namingResources.setContainer(container);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jul 8
21:02:07 2013
@@ -106,7 +106,7 @@ import org.apache.catalina.deploy.Inject
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.MessageDestination;
import org.apache.catalina.deploy.MessageDestinationRef;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.loader.WebappLoader;
@@ -455,7 +455,7 @@ public class StandardContext extends Con
/**
* The naming resources for this web application.
*/
- private NamingResources namingResources = null;
+ private NamingResourcesImpl namingResources = null;
/**
* The message destinations for this web application.
@@ -2019,10 +2019,10 @@ public class StandardContext extends Con
* Return the naming resources associated with this web application.
*/
@Override
- public NamingResources getNamingResources() {
+ public NamingResourcesImpl getNamingResources() {
if (namingResources == null) {
- setNamingResources(new NamingResources());
+ setNamingResources(new NamingResourcesImpl());
}
return (namingResources);
@@ -2035,10 +2035,10 @@ public class StandardContext extends Con
* @param namingResources The new naming resources
*/
@Override
- public void setNamingResources(NamingResources namingResources) {
+ public void setNamingResources(NamingResourcesImpl namingResources) {
// Process the property setting change
- NamingResources oldNamingResources = this.namingResources;
+ NamingResourcesImpl oldNamingResources = this.namingResources;
this.namingResources = namingResources;
if (namingResources != null) {
namingResources.setContainer(this);
@@ -5248,7 +5248,7 @@ public class StandardContext extends Con
context = getNamingContextListener().getEnvContext();
}
Map<String, Map<String, String>> injectionMap =
buildInjectionMap(
- getIgnoreAnnotations() ? new NamingResources():
getNamingResources());
+ getIgnoreAnnotations() ? new NamingResourcesImpl():
getNamingResources());
setInstanceManager(new DefaultInstanceManager(context,
injectionMap, this, this.getClass().getClassLoader()));
getServletContext().setAttribute(
@@ -5379,7 +5379,7 @@ public class StandardContext extends Con
}
}
- private Map<String, Map<String, String>> buildInjectionMap(NamingResources
namingResources) {
+ private Map<String, Map<String, String>>
buildInjectionMap(NamingResourcesImpl namingResources) {
Map<String, Map<String, String>> injectionMap = new HashMap<>();
for (Injectable resource: namingResources.findLocalEjbs()) {
addInjectionTarget(resource, injectionMap);
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Mon Jul 8
21:02:07 2013
@@ -37,7 +37,7 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Server;
import org.apache.catalina.Service;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.catalina.mbeans.MBeanFactory;
import org.apache.catalina.startup.Catalina;
import org.apache.catalina.util.ExtensionValidator;
@@ -72,7 +72,7 @@ public final class StandardServer extend
super();
- globalNamingResources = new NamingResources();
+ globalNamingResources = new NamingResourcesImpl();
globalNamingResources.setContainer(this);
if (isUseNaming()) {
@@ -97,7 +97,7 @@ public final class StandardServer extend
/**
* Global naming resources.
*/
- private NamingResources globalNamingResources = null;
+ private NamingResourcesImpl globalNamingResources = null;
/**
@@ -200,7 +200,7 @@ public final class StandardServer extend
* Return the global naming resources.
*/
@Override
- public NamingResources getGlobalNamingResources() {
+ public NamingResourcesImpl getGlobalNamingResources() {
return (this.globalNamingResources);
@@ -214,9 +214,9 @@ public final class StandardServer extend
*/
@Override
public void setGlobalNamingResources
- (NamingResources globalNamingResources) {
+ (NamingResourcesImpl globalNamingResources) {
- NamingResources oldGlobalNamingResources =
+ NamingResourcesImpl oldGlobalNamingResources =
this.globalNamingResources;
this.globalNamingResources = globalNamingResources;
this.globalNamingResources.setContainer(this);
Copied: tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
(from r1500934,
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java?p2=tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java&p1=tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java&r1=1500934&r2=1500947&rev=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java Mon
Jul 8 21:02:07 2013
@@ -53,11 +53,11 @@ import org.apache.tomcat.util.res.String
* @version $Id$
*/
-public class NamingResources extends LifecycleMBeanBase implements
Serializable {
+public class NamingResourcesImpl extends LifecycleMBeanBase implements
Serializable {
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(NamingResources.class);
+ private static final Log log =
LogFactory.getLog(NamingResourcesImpl.class);
private static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -70,7 +70,7 @@ public class NamingResources extends Lif
/**
* Create a new NamingResources instance.
*/
- public NamingResources() {
+ public NamingResourcesImpl() {
// NOOP
}
@@ -233,7 +233,7 @@ public class NamingResources extends Lif
}
} else if (rl != null) {
// Link. Need to look at the global resources
- NamingResources global =
getServer().getGlobalNamingResources();
+ NamingResourcesImpl global =
getServer().getGlobalNamingResources();
if (global.findEnvironment(rl.getGlobal()) != null) {
if (global.findEnvironment(rl.getGlobal()).getOverride()) {
removeResourceLink(environment.getName());
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java Mon Jul 8
21:02:07 2013
@@ -199,13 +199,13 @@ public class ResourceBase implements Ser
/**
* The NamingResources with which we are associated (if any).
*/
- protected NamingResources resources = null;
+ protected NamingResourcesImpl resources = null;
- public NamingResources getNamingResources() {
+ public NamingResourcesImpl getNamingResources() {
return (this.resources);
}
- void setNamingResources(NamingResources resources) {
+ void setNamingResources(NamingResourcesImpl resources) {
this.resources = resources;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
Mon Jul 8 21:02:07 2013
@@ -27,7 +27,7 @@ import javax.management.RuntimeOperation
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.deploy.ContextEnvironment;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.tomcat.util.modeler.BaseModelMBean;
@@ -99,7 +99,7 @@ public class ContextEnvironmentMBean ext
// cannot use side-effects. It's removed and added back each time
// there is a modification in a resource.
- NamingResources nr = ce.getNamingResources();
+ NamingResourcesImpl nr = ce.getNamingResources();
nr.removeEnvironment(ce.getName());
nr.addEnvironment(ce);
}
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
Mon Jul 8 21:02:07 2013
@@ -27,7 +27,7 @@ import javax.management.RuntimeOperation
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.deploy.ContextResourceLink;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.tomcat.util.modeler.BaseModelMBean;
@@ -174,7 +174,7 @@ public class ContextResourceLinkMBean ex
// cannot use side-effects. It's removed and added back each time
// there is a modification in a resource.
- NamingResources nr = crl.getNamingResources();
+ NamingResourcesImpl nr = crl.getNamingResources();
nr.removeResourceLink(crl.getName());
nr.addResourceLink(crl);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Mon
Jul 8 21:02:07 2013
@@ -27,7 +27,7 @@ import javax.management.RuntimeOperation
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.deploy.ContextResource;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.tomcat.util.modeler.BaseModelMBean;
@@ -179,7 +179,7 @@ public class ContextResourceMBean extend
// cannot use side-effects. It's removed and added back each time
// there is a modification in a resource.
- NamingResources nr = cr.getNamingResources();
+ NamingResourcesImpl nr = cr.getNamingResources();
nr.removeResource(cr.getName());
nr.addResource(cr);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Mon
Jul 8 21:02:07 2013
@@ -27,7 +27,7 @@ import javax.management.RuntimeOperation
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.tomcat.util.modeler.BaseModelMBean;
import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.Registry;
@@ -86,7 +86,7 @@ public class NamingResourcesMBean extend
*/
public String[] getEnvironments() {
ContextEnvironment[] envs =
-
((NamingResources)this.resource).findEnvironments();
+
((NamingResourcesImpl)this.resource).findEnvironments();
ArrayList<String> results = new ArrayList<>();
for (int i = 0; i < envs.length; i++) {
try {
@@ -112,7 +112,7 @@ public class NamingResourcesMBean extend
public String[] getResources() {
ContextResource[] resources =
- ((NamingResources)this.resource).findResources();
+
((NamingResourcesImpl)this.resource).findResources();
ArrayList<String> results = new ArrayList<>();
for (int i = 0; i < resources.length; i++) {
try {
@@ -138,7 +138,7 @@ public class NamingResourcesMBean extend
public String[] getResourceLinks() {
ContextResourceLink[] resourceLinks =
-
((NamingResources)this.resource).findResourceLinks();
+
((NamingResourcesImpl)this.resource).findResourceLinks();
ArrayList<String> results = new ArrayList<>();
for (int i = 0; i < resourceLinks.length; i++) {
try {
@@ -169,7 +169,7 @@ public class NamingResourcesMBean extend
public String addEnvironment(String envName, String type, String value)
throws MalformedObjectNameException {
- NamingResources nresources = (NamingResources) this.resource;
+ NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource;
if (nresources == null) {
return null;
}
@@ -202,7 +202,7 @@ public class NamingResourcesMBean extend
public String addResource(String resourceName, String type)
throws MalformedObjectNameException {
- NamingResources nresources = (NamingResources) this.resource;
+ NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource;
if (nresources == null) {
return null;
}
@@ -233,7 +233,7 @@ public class NamingResourcesMBean extend
public String addResourceLink(String resourceLinkName, String type)
throws MalformedObjectNameException {
- NamingResources nresources = (NamingResources) this.resource;
+ NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource;
if (nresources == null) {
return null;
}
@@ -264,7 +264,7 @@ public class NamingResourcesMBean extend
*/
public void removeEnvironment(String envName) {
- NamingResources nresources = (NamingResources) this.resource;
+ NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource;
if (nresources == null) {
return;
}
@@ -286,7 +286,7 @@ public class NamingResourcesMBean extend
public void removeResource(String resourceName) {
resourceName = ObjectName.unquote(resourceName);
- NamingResources nresources = (NamingResources) this.resource;
+ NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource;
if (nresources == null) {
return;
}
@@ -308,7 +308,7 @@ public class NamingResourcesMBean extend
public void removeResourceLink(String resourceLinkName) {
resourceLinkName = ObjectName.unquote(resourceLinkName);
- NamingResources nresources = (NamingResources) this.resource;
+ NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource;
if (nresources == null) {
return;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Jul 8
21:02:07 2013
@@ -54,7 +54,7 @@ import org.apache.catalina.deploy.ErrorP
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.util.ContextName;
import org.apache.catalina.util.LifecycleMBeanBase;
@@ -398,9 +398,9 @@ public class FailedContext extends Lifec
public void setLoginConfig(LoginConfig config) { /* NO-OP */ }
@Override
- public NamingResources getNamingResources() { return null; }
+ public NamingResourcesImpl getNamingResources() { return null; }
@Override
- public void setNamingResources(NamingResources namingResources) { /* NO-OP
*/ }
+ public void setNamingResources(NamingResourcesImpl namingResources) { /*
NO-OP */ }
@Override
public String getPublicId() { return null; }
Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Mon
Jul 8 21:02:07 2013
@@ -19,7 +19,7 @@
package org.apache.catalina.startup;
import org.apache.catalina.Context;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.digester.Rule;
@@ -93,11 +93,11 @@ public class SetNextNamingRule extends R
Object child = digester.peek(0);
Object parent = digester.peek(1);
- NamingResources namingResources = null;
+ NamingResourcesImpl namingResources = null;
if (parent instanceof Context) {
namingResources = ((Context) parent).getNamingResources();
} else {
- namingResources = (NamingResources) parent;
+ namingResources = (NamingResourcesImpl) parent;
}
// Call the specified method
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=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
Mon Jul 8 21:02:07 2013
@@ -18,7 +18,7 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -38,19 +38,19 @@ public class GlobalNamingResourcesSF ext
public void store(PrintWriter aWriter, int indent, Object aElement)
throws Exception {
- if (aElement instanceof NamingResources) {
+ if (aElement instanceof NamingResourcesImpl) {
StoreDescription elementDesc = getRegistry().findDescription(
- NamingResources.class.getName()
+ NamingResourcesImpl.class.getName()
+ ".[GlobalNamingResources]");
if (elementDesc != null) {
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printOpenTag(aWriter, indent + 2, aElement,
elementDesc);
- NamingResources resources = (NamingResources) aElement;
+ NamingResourcesImpl resources = (NamingResourcesImpl) aElement;
StoreDescription resourcesdesc = getRegistry().findDescription(
- NamingResources.class.getName());
+ NamingResourcesImpl.class.getName());
if (resourcesdesc != null) {
resourcesdesc.getStoreFactory().store(aWriter, indent + 2,
resources);
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
Mon Jul 8 21:02:07 2013
@@ -24,7 +24,7 @@ import org.apache.catalina.deploy.Contex
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceEnvRef;
import org.apache.catalina.deploy.ContextResourceLink;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -78,8 +78,8 @@ public class NamingResourcesSF extends S
public void storeChildren(PrintWriter aWriter, int indent, Object aElement,
StoreDescription elementDesc) throws Exception {
- if (aElement instanceof NamingResources) {
- NamingResources resources = (NamingResources) aElement;
+ if (aElement instanceof NamingResourcesImpl) {
+ NamingResourcesImpl resources = (NamingResourcesImpl) aElement;
// Store nested <Ejb> elements
ContextEjb[] ejbs = resources.findEjbs();
storeElementArray(aWriter, indent, ejbs);
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=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Mon Jul 8 21:02:07 2013
@@ -38,7 +38,7 @@ import org.apache.catalina.Valve;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.ApplicationParameter;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -295,7 +295,7 @@ public class StandardContextSF extends S
storeElementArray(aWriter, indent, appParams);
// Store nested naming resources elements (EJB,Resource,...)
- NamingResources nresources = context.getNamingResources();
+ NamingResourcesImpl nresources = context.getNamingResources();
storeElement(aWriter, indent, nresources);
// Store nested watched resources <WatchedResource>
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java Mon
Jul 8 21:02:07 2013
@@ -23,7 +23,7 @@ import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Service;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
/**
* Store server.xml Server element and children (
@@ -86,10 +86,10 @@ public class StandardServerSF extends St
}
}*/
// Store nested <GlobalNamingResources> element
- NamingResources globalNamingResources = server
+ NamingResourcesImpl globalNamingResources = server
.getGlobalNamingResources();
StoreDescription elementDesc = getRegistry().findDescription(
- NamingResources.class.getName()
+ NamingResourcesImpl.class.getName()
+ ".[GlobalNamingResources]");
if (elementDesc != null) {
elementDesc.getStoreFactory().store(aWriter, indent,
Modified: tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TesterContext.java?rev=1500947&r1=1500946&r2=1500947&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TesterContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TesterContext.java Mon Jul 8
21:02:07 2013
@@ -56,7 +56,7 @@ import org.apache.catalina.deploy.ErrorP
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.NamingResourcesImpl;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.juli.logging.Log;
import org.apache.tomcat.InstanceManager;
@@ -520,12 +520,12 @@ public class TesterContext implements Co
}
@Override
- public NamingResources getNamingResources() {
+ public NamingResourcesImpl getNamingResources() {
return null;
}
@Override
- public void setNamingResources(NamingResources namingResources) {
+ public void setNamingResources(NamingResourcesImpl namingResources) {
// NO-OP
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
