Author: markt
Date: Sun Feb 10 21:01:16 2013
New Revision: 1444614
URL: http://svn.apache.org/r1444614
Log:
s/childs/children/
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/RealmSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
Sun Feb 10 21:01:16 2013
@@ -35,7 +35,7 @@ import org.apache.catalina.tribes.Channe
public class CatalinaClusterSF extends StoreFactoryBase {
/**
- * Store the specified Cluster childs.
+ * Store the specified Cluster children.
*
* @param aWriter
* PrintWriter to which we are storing
@@ -48,7 +48,7 @@ public class CatalinaClusterSF extends S
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aCluster,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aCluster,
StoreDescription parentDesc) throws Exception {
if (aCluster instanceof CatalinaCluster) {
CatalinaCluster cluster = (CatalinaCluster) aCluster;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java Sun Feb 10
21:01:16 2013
@@ -33,7 +33,7 @@ import org.apache.catalina.tribes.Member
public class ChannelSF extends StoreFactoryBase {
/**
- * Store the specified Channel childs.
+ * Store the specified Channel children.
*
* @param aWriter
* PrintWriter to which we are storing
@@ -46,7 +46,7 @@ public class ChannelSF extends StoreFact
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aChannel,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aChannel,
StoreDescription parentDesc) throws Exception {
if (aChannel instanceof Channel) {
Channel channel = (Channel) aChannel;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java Sun Feb
10 21:01:16 2013
@@ -36,7 +36,7 @@ public class ConnectorSF extends StoreFa
* @throws Exception
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aConnector,
+ public void storeChildren(PrintWriter aWriter, int indent, Object
aConnector,
StoreDescription parentDesc) throws Exception {
if (aConnector instanceof Connector) {
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java Sun
Feb 10 21:01:16 2013
@@ -40,7 +40,7 @@ public class InterceptorSF extends Store
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object
aInterceptor,
+ public void storeChildren(PrintWriter aWriter, int indent, Object
aInterceptor,
StoreDescription parentDesc) throws Exception {
if (aInterceptor instanceof ChannelInterceptor) {
ChannelInterceptor interceptor = (ChannelInterceptor) aInterceptor;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java Sun Feb 10
21:01:16 2013
@@ -34,7 +34,7 @@ public class LoaderSF extends StoreFacto
/**
* Store the only the Loader elements, when not default
*
- * @see NamingResourcesSF#storeChilds(PrintWriter, int, Object,
StoreDescription)
+ * @see NamingResourcesSF#storeChildren(PrintWriter, int, Object,
StoreDescription)
*/
@Override
public void store(PrintWriter aWriter, int indent, Object aElement)
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=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java Sun Feb 10
21:01:16 2013
@@ -33,7 +33,7 @@ public class ManagerSF extends StoreFact
/**
* Store the only the Manager elements
*
- * @see NamingResourcesSF#storeChilds(PrintWriter, int, Object,
StoreDescription)
+ * @see NamingResourcesSF#storeChildren(PrintWriter, int, Object,
StoreDescription)
*/
@Override
public void store(PrintWriter aWriter, int indent, Object aElement)
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=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
Sun Feb 10 21:01:16 2013
@@ -37,7 +37,7 @@ public class NamingResourcesSF extends S
/**
* Store the only the NamingResources elements
*
- * @see NamingResourcesSF#storeChilds(PrintWriter, int, Object,
StoreDescription)
+ * @see NamingResourcesSF#storeChildren(PrintWriter, int, Object,
StoreDescription)
*/
@Override
public void store(PrintWriter aWriter, int indent, Object aElement)
@@ -48,7 +48,7 @@ public class NamingResourcesSF extends S
if (log.isDebugEnabled())
log.debug("store " + elementDesc.getTag() + "( " + aElement
+ " )");
- storeChilds(aWriter, indent, aElement, elementDesc);
+ storeChildren(aWriter, indent, aElement, elementDesc);
} else {
if (log.isWarnEnabled())
log.warn("Descriptor for element" + aElement.getClass()
@@ -71,11 +71,11 @@ public class NamingResourcesSF extends S
* @exception Exception
* if an exception occurs while storing
*
- * @see
org.apache.catalina.storeconfig.StoreFactoryBase#storeChilds(java.io.PrintWriter,
+ * @see
org.apache.catalina.storeconfig.StoreFactoryBase#storeChildren(java.io.PrintWriter,
* int, java.lang.Object, StoreDescription)
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aElement,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aElement,
StoreDescription elementDesc) throws Exception {
if (aElement instanceof NamingResources) {
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=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
Sun Feb 10 21:01:16 2013
@@ -41,7 +41,7 @@ public class PersistentManagerSF extends
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aManager,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aManager,
StoreDescription parentDesc) throws Exception {
if (aManager instanceof PersistentManager) {
PersistentManager manager = (PersistentManager) aManager;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/RealmSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/RealmSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/RealmSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/RealmSF.java Sun Feb 10
21:01:16 2013
@@ -45,7 +45,7 @@ public class RealmSF extends StoreFactor
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printOpenTag(aWriter, indent + 2, aElement,
elementDesc);
- storeChilds(aWriter, indent + 2, aElement, elementDesc);
+ storeChildren(aWriter, indent + 2, aElement, elementDesc);
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
} else {
@@ -72,7 +72,7 @@ public class RealmSF extends StoreFactor
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aRealm,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aRealm,
StoreDescription parentDesc) throws Exception {
if (aRealm instanceof CombinedRealm) {
CombinedRealm combinedRealm = (CombinedRealm) aRealm;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java Sun Feb 10
21:01:16 2013
@@ -41,7 +41,7 @@ public class SenderSF extends StoreFacto
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aSender,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aSender,
StoreDescription parentDesc) throws Exception {
if (aSender instanceof ReplicationTransmitter) {
ReplicationTransmitter transmitter = (ReplicationTransmitter)
aSender;
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=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Sun Feb 10 21:01:16 2013
@@ -43,7 +43,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Store server.xml Context element with all childs
+ * Store server.xml Context element with all children
* <ul>
* <li>Store all context at server.xml</li>
* <li>Store existing app.xml context a conf/enginename/hostname/app.xml</li>
@@ -237,7 +237,7 @@ public class StandardContextSF extends S
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aContext,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aContext,
StoreDescription parentDesc) throws Exception {
if (aContext instanceof StandardContext) {
StandardContext context = (StandardContext) aContext;
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java Sun
Feb 10 21:01:16 2013
@@ -46,7 +46,7 @@ public class StandardEngineSF extends St
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aEngine,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aEngine,
StoreDescription parentDesc) throws Exception {
if (aEngine instanceof StandardEngine) {
StandardEngine engine = (StandardEngine) aEngine;
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java Sun
Feb 10 21:01:16 2013
@@ -36,7 +36,7 @@ import org.apache.catalina.ha.ClusterVal
public class StandardHostSF extends StoreFactoryBase {
/**
- * Store the specified Host properties and childs
+ * Store the specified Host properties and children
* (Listener,Alias,Realm,Valve,Cluster, Context)
*
* @param aWriter
@@ -50,7 +50,7 @@ public class StandardHostSF extends Stor
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aHost,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aHost,
StoreDescription parentDesc) throws Exception {
if (aHost instanceof StandardHost) {
StandardHost host = (StandardHost) aHost;
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=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java Sun
Feb 10 21:01:16 2013
@@ -26,7 +26,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.deploy.NamingResources;
/**
- * Store server.xml Server element and childs (
+ * Store server.xml Server element and children (
* Listener,GlobalNamingResource,Service)
*/
public class StandardServerSF extends StoreFactoryBase {
@@ -54,7 +54,7 @@ public class StandardServerSF extends St
}
/**
- * Store Childs from this StandardServer descrition
+ * Store Children from this StandardServer descrition
*
* @param aWriter
* @param indent
@@ -63,7 +63,7 @@ public class StandardServerSF extends St
* @throws Exception
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aObject,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aObject,
StoreDescription parentDesc) throws Exception {
if (aObject instanceof StandardServer) {
StandardServer server = (StandardServer) aObject;
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
Sun Feb 10 21:01:16 2013
@@ -27,12 +27,12 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.core.StandardService;
/**
- * Store server.xml Element Service and all childs
+ * Store server.xml Element Service and all children
*/
public class StandardServiceSF extends StoreFactoryBase {
/**
- * Store Childs from this StandardService description
+ * Store Children from this StandardService description
*
* @param aWriter
* @param indent
@@ -40,7 +40,7 @@ public class StandardServiceSF extends S
* @throws Exception
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object aService,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aService,
StoreDescription parentDesc) throws Exception {
if (aService instanceof StandardService) {
StandardService service = (StandardService) aService;
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java Sun
Feb 10 21:01:16 2013
@@ -32,7 +32,7 @@ import java.util.List;
* externalAllowed="true"
* storeSeparate="true"
* backup="true"
- * childs="true"
+ * children="true"
* tagClass="org.apache.catalina.core.StandardContext"
*
storeFactoryClass="org.apache.catalina.storeconfig.StandardContextSF"
*
storeAppenderClass="org.apache.catalina.storeconfig.StoreContextAppender">
@@ -81,11 +81,11 @@ public class StoreDescription {
private String storeWriterClass;
- private boolean childs = false;
+ private boolean children = false;
private List<String> transientAttributes;
- private List<String> transientChilds;
+ private List<String> transientChildren;
private boolean storeSeparate = false;
@@ -259,29 +259,29 @@ public class StoreDescription {
}
/**
- * @return Returns the transientChilds.
+ * @return Returns the transientChildren.
*/
- public List<String> getTransientChilds() {
- return transientChilds;
+ public List<String> getTransientChildren() {
+ return transientChildren;
}
/**
- * @param transientChilds
- * The transientChilds to set.
+ * @param transientChildren
+ * The transientChildren to set.
*/
- public void setTransientChilds(List<String> transientChilds) {
- this.transientChilds = transientChilds;
+ public void setTransientChildren(List<String> transientChildren) {
+ this.transientChildren = transientChildren;
}
public void addTransientChild(String classname) {
- if (transientChilds == null)
- transientChilds = new ArrayList<>();
- transientChilds.add(classname);
+ if (transientChildren == null)
+ transientChildren = new ArrayList<>();
+ transientChildren.add(classname);
}
public void removeTransientChild(String classname) {
- if (transientChilds != null)
- transientChilds.remove(classname);
+ if (transientChildren != null)
+ transientChildren.remove(classname);
}
/**
@@ -291,8 +291,8 @@ public class StoreDescription {
* @return is classname attribute?
*/
public boolean isTransientChild(String classname) {
- if (transientChilds != null)
- return transientChilds.contains(classname);
+ if (transientChildren != null)
+ return transientChildren.contains(classname);
return false;
}
@@ -355,17 +355,17 @@ public class StoreDescription {
}
/**
- * @return Returns the childs.
+ * @return Returns the children.
*/
- public boolean isChilds() {
- return childs;
+ public boolean isChildren() {
+ return children;
}
/**
- * @param childs
- * The childs to set.
+ * @param children
+ * The children to set.
*/
- public void setChilds(boolean childs) {
- this.childs = childs;
+ public void setChildren(boolean children) {
+ this.children = children;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java Sun
Feb 10 21:01:16 2013
@@ -105,7 +105,7 @@ public class StoreFactoryBase implements
}
/*
- * Store a server.xml element with attributes and childs
+ * Store a server.xml element with attributes and children
*
* @see
org.apache.catalina.storeconfig.IStoreFactory#store(java.io.PrintWriter,
* int, java.lang.Object)
@@ -122,13 +122,13 @@ public class StoreFactoryBase implements
log.debug(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
getStoreAppender().printIndent(aWriter, indent + 2);
- if (!elementDesc.isChilds()) {
+ if (!elementDesc.isChildren()) {
getStoreAppender().printTag(aWriter, indent, aElement,
elementDesc);
} else {
getStoreAppender().printOpenTag(aWriter, indent + 2, aElement,
elementDesc);
- storeChilds(aWriter, indent + 2, aElement, elementDesc);
+ storeChildren(aWriter, indent + 2, aElement, elementDesc);
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
}
@@ -138,19 +138,19 @@ public class StoreFactoryBase implements
}
/**
- * Must Implement at subclass for sepzial store childs handling
+ * Must Implement at subclass for sepzial store children handling
*
* @param aWriter
* @param indent
* @param aElement
* @param elementDesc
*/
- public void storeChilds(PrintWriter aWriter, int indent, Object aElement,
+ public void storeChildren(PrintWriter aWriter, int indent, Object aElement,
StoreDescription elementDesc) throws Exception {
}
/**
- * Store only elements from storeChilds methods that are not a transient
+ * Store only elements from storeChildren methods that are not a transient
* child.
*
* @param aWriter current output writer
@@ -189,7 +189,7 @@ public class StoreFactoryBase implements
try {
storeElement(aWriter, indent, elements[i]);
} catch (IOException ioe) {
- // ingore childs report error them self!
+ // ingore children report error them self!
// see StandartContext.storeWithBackup()
}
}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java Sun Feb
10 21:01:16 2013
@@ -39,9 +39,9 @@ import org.xml.sax.SAXException;
* <TransientAttributes>
* <Attribute></Attribute>
* </TransientAttributes>
- * <TransientChilds>
+ * <TransientChildren>
* <Child></Child>
- * </TransientChilds>
+ * </TransientChildren>
* </Description>
* ...
* </Tegistry>
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java?rev=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java
Sun Feb 10 21:01:16 2013
@@ -28,7 +28,7 @@ import org.apache.catalina.WebResourceSe
public class WebResourceRootSF extends StoreFactoryBase {
/**
- * Store the specified Resources childs.
+ * Store the specified Resources children.
*
* @param aWriter
* PrintWriter to which we are storing
@@ -41,7 +41,7 @@ public class WebResourceRootSF extends S
* if an exception occurs while storing
*/
@Override
- public void storeChilds(PrintWriter aWriter, int indent, Object
aResourceRoot,
+ public void storeChildren(PrintWriter aWriter, int indent, Object
aResourceRoot,
StoreDescription parentDesc) throws Exception {
if (aResourceRoot instanceof WebResourceRoot) {
WebResourceRoot resourceRoot = (WebResourceRoot) aResourceRoot;
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=1444614&r1=1444613&r2=1444614&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Sun
Feb 10 21:01:16 2013
@@ -21,7 +21,7 @@
standard="true"
default="true"
externalAllowed="true"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.core.StandardServer"
storeFactoryClass="org.apache.catalina.storeconfig.StandardServerSF">
</Description>
@@ -29,7 +29,7 @@
tag="Service"
standard="true"
default="true"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.core.StandardService"
storeFactoryClass="org.apache.catalina.storeconfig.StandardServiceSF">
</Description>
@@ -37,7 +37,7 @@
tag="Engine"
standard="true"
default="true"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.core.StandardEngine"
storeFactoryClass="org.apache.catalina.storeconfig.StandardEngineSF">
<TransientAttribute>domain</TransientAttribute>
@@ -46,7 +46,7 @@
tag="Host"
standard="true"
default="true"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.core.StandardHost"
storeFactoryClass="org.apache.catalina.storeconfig.StandardHostSF">
<TransientAttribute>domain</TransientAttribute>
@@ -59,7 +59,7 @@
externalOnly="true"
storeSeparate="true"
backup="true"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.core.StandardContext"
storeFactoryClass="org.apache.catalina.storeconfig.StandardContextSF"
storeAppenderClass="org.apache.catalina.storeconfig.StoreContextAppender">
@@ -85,7 +85,7 @@
standard="true"
default="false"
attributes="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.deploy.NamingResources"
storeFactoryClass="org.apache.catalina.storeconfig.GlobalNamingResourcesSF">
</Description>
@@ -94,7 +94,7 @@
standard="true"
default="true"
tagClass="org.apache.catalina.connector.Connector"
- childs="true"
+ children="true"
storeFactoryClass="org.apache.catalina.storeconfig.ConnectorSF"
storeAppenderClass="org.apache.catalina.storeconfig.ConnectorStoreAppender">
<TransientAttribute>URIEncoding</TransientAttribute>
@@ -106,7 +106,7 @@
standard="true"
default="false"
attributes="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.deploy.NamingResources"
storeFactoryClass="org.apache.catalina.storeconfig.NamingResourcesSF">
</Description>
@@ -123,7 +123,7 @@
tag="Manager"
standard="false"
default="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.session.PersistentManager"
storeFactoryClass="org.apache.catalina.storeconfig.PersistentManagerSF">
<TransientAttribute>entropy</TransientAttribute>
@@ -147,7 +147,7 @@
tag="Cluster"
standard="false"
default="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.ha.CatalinaCluster"
storeFactoryClass="org.apache.catalina.storeconfig.CatalinaClusterSF">
</Description>
@@ -155,7 +155,7 @@
tag="Realm"
standard="false"
default="false"
- childs="false"
+ children="false"
tagClass="org.apache.catalina.Realm"
storeFactoryClass="org.apache.catalina.storeconfig.RealmSF">
<TransientAttribute>domain</TransientAttribute>
@@ -251,7 +251,7 @@
tag="Resources"
standard="false"
default="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.WebResourceRoot"
storeFactoryClass="org.apache.catalina.storeconfig.WebResourceRootSF">
<TransientAttribute>allowLinking</TransientAttribute>
@@ -351,7 +351,7 @@
tag="Sender"
standard="false"
default="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.tribes.ChannelSender"
storeFactoryClass="org.apache.catalina.storeconfig.SenderSF">
</Description>
@@ -394,7 +394,7 @@
tag="Channel"
standard="false"
default="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.tribes.Channel"
storeFactoryClass="org.apache.catalina.storeconfig.ChannelSF">
</Description>
@@ -402,7 +402,7 @@
tag="Interceptor"
standard="false"
default="false"
- childs="true"
+ children="true"
tagClass="org.apache.catalina.tribes.ChannelInterceptor"
storeFactoryClass="org.apache.catalina.storeconfig.InterceptorSF">
</Description>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
