You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2013/02/09 01:46:07 UTC
svn commit: r1444300 [2/2] - in /tomcat/trunk/java/org/apache: catalina/
catalina/storeconfig/ tomcat/jni/
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=1444300&r1=1444299&r2=1444300&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Sat Feb 9 00:46:07 2013
@@ -17,144 +17,144 @@
-->
<Registry name="Tomcat" version="6.0.35" encoding="UTF-8" >
<Description
- tag="Server"
- standard="true"
- default="true"
- externalAllowed="true"
+ tag="Server"
+ standard="true"
+ default="true"
+ externalAllowed="true"
childs="true"
tagClass="org.apache.catalina.core.StandardServer"
storeFactoryClass="org.apache.catalina.storeconfig.StandardServerSF">
</Description>
<Description
- tag="Service"
- standard="true"
- default="true"
+ tag="Service"
+ standard="true"
+ default="true"
childs="true"
tagClass="org.apache.catalina.core.StandardService"
storeFactoryClass="org.apache.catalina.storeconfig.StandardServiceSF">
</Description>
<Description
- tag="Engine"
- standard="true"
- default="true"
+ tag="Engine"
+ standard="true"
+ default="true"
childs="true"
tagClass="org.apache.catalina.core.StandardEngine"
storeFactoryClass="org.apache.catalina.storeconfig.StandardEngineSF">
- <TransientAttribute>domain</TransientAttribute>
+ <TransientAttribute>domain</TransientAttribute>
</Description>
<Description
- tag="Host"
- standard="true"
- default="true"
+ tag="Host"
+ standard="true"
+ default="true"
childs="true"
tagClass="org.apache.catalina.core.StandardHost"
storeFactoryClass="org.apache.catalina.storeconfig.StandardHostSF">
- <TransientAttribute>domain</TransientAttribute>
+ <TransientAttribute>domain</TransientAttribute>
</Description>
<Description
- tag="Context"
- standard="true"
- default="true"
- externalAllowed="true"
- externalOnly="true"
- storeSeparate="true"
- backup="true"
+ tag="Context"
+ standard="true"
+ default="true"
+ externalAllowed="true"
+ externalOnly="true"
+ storeSeparate="true"
+ backup="true"
childs="true"
tagClass="org.apache.catalina.core.StandardContext"
storeFactoryClass="org.apache.catalina.storeconfig.StandardContextSF"
storeAppenderClass="org.apache.catalina.storeconfig.StoreContextAppender">
- <TransientAttribute>available</TransientAttribute>
- <TransientAttribute>configFile</TransientAttribute>
- <TransientAttribute>configured</TransientAttribute>
- <TransientAttribute>displayName</TransientAttribute>
- <TransientAttribute>distributable</TransientAttribute>
- <TransientAttribute>domain</TransientAttribute>
- <TransientAttribute>name</TransientAttribute>
- <TransientAttribute>publicId</TransientAttribute>
- <TransientAttribute>originalDocBase</TransientAttribute>
- <TransientAttribute>replaceWelcomeFiles</TransientAttribute>
- <TransientAttribute>sessionTimeout</TransientAttribute>
- <TransientAttribute>startupTime</TransientAttribute>
- <TransientAttribute>tldScanTime</TransientAttribute>
+ <TransientAttribute>available</TransientAttribute>
+ <TransientAttribute>configFile</TransientAttribute>
+ <TransientAttribute>configured</TransientAttribute>
+ <TransientAttribute>displayName</TransientAttribute>
+ <TransientAttribute>distributable</TransientAttribute>
+ <TransientAttribute>domain</TransientAttribute>
+ <TransientAttribute>name</TransientAttribute>
+ <TransientAttribute>publicId</TransientAttribute>
+ <TransientAttribute>originalDocBase</TransientAttribute>
+ <TransientAttribute>replaceWelcomeFiles</TransientAttribute>
+ <TransientAttribute>sessionTimeout</TransientAttribute>
+ <TransientAttribute>startupTime</TransientAttribute>
+ <TransientAttribute>tldScanTime</TransientAttribute>
<TransientAttribute>effectiveMajorVersion</TransientAttribute>
- <TransientAttribute>effectiveMinorVersion</TransientAttribute>
+ <TransientAttribute>effectiveMinorVersion</TransientAttribute>
</Description>
<Description
id="org.apache.catalina.deploy.NamingResources.[GlobalNamingResources]"
- tag="GlobalNamingResources"
- standard="true"
- default="false"
- attributes="false"
+ tag="GlobalNamingResources"
+ standard="true"
+ default="false"
+ attributes="false"
childs="true"
tagClass="org.apache.catalina.deploy.NamingResources"
storeFactoryClass="org.apache.catalina.storeconfig.GlobalNamingResourcesSF">
</Description>
<Description
- tag="Connector"
- standard="true"
- default="true"
+ tag="Connector"
+ standard="true"
+ default="true"
tagClass="org.apache.catalina.connector.Connector"
childs="true"
storeFactoryClass="org.apache.catalina.storeconfig.ConnectorSF"
storeAppenderClass="org.apache.catalina.storeconfig.ConnectorStoreAppender">
- <TransientAttribute>URIEncoding</TransientAttribute>
- <TransientAttribute>maxProcessor</TransientAttribute>
- <TransientAttribute>minProcessor</TransientAttribute>
+ <TransientAttribute>URIEncoding</TransientAttribute>
+ <TransientAttribute>maxProcessor</TransientAttribute>
+ <TransientAttribute>minProcessor</TransientAttribute>
</Description>
<Description
- tag="NamingResources"
- standard="true"
- default="false"
- attributes="false"
+ tag="NamingResources"
+ standard="true"
+ default="false"
+ attributes="false"
childs="true"
tagClass="org.apache.catalina.deploy.NamingResources"
storeFactoryClass="org.apache.catalina.storeconfig.NamingResourcesSF">
</Description>
- <Description
- tag="Manager"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.Manager"
+ <Description
+ tag="Manager"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.Manager"
storeFactoryClass="org.apache.catalina.storeconfig.ManagerSF">
- <TransientAttribute>entropy</TransientAttribute>
- <TransientAttribute>distributable</TransientAttribute>
+ <TransientAttribute>entropy</TransientAttribute>
+ <TransientAttribute>distributable</TransientAttribute>
</Description>
<Description
- tag="Manager"
- standard="false"
- default="false"
+ tag="Manager"
+ standard="false"
+ default="false"
childs="true"
- tagClass="org.apache.catalina.session.PersistentManager"
+ tagClass="org.apache.catalina.session.PersistentManager"
storeFactoryClass="org.apache.catalina.storeconfig.PersistentManagerSF">
<TransientAttribute>entropy</TransientAttribute>
- <TransientAttribute>distributable</TransientAttribute>
+ <TransientAttribute>distributable</TransientAttribute>
</Description>
<Description
- tag="Store"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.session.FileStore"
+ tag="Store"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.session.FileStore"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Store"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.session.JDBCStore"
+ tag="Store"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.session.JDBCStore"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Cluster"
- standard="false"
- default="false"
+ tag="Cluster"
+ standard="false"
+ default="false"
childs="true"
- tagClass="org.apache.catalina.ha.CatalinaCluster"
+ tagClass="org.apache.catalina.ha.CatalinaCluster"
storeFactoryClass="org.apache.catalina.storeconfig.CatalinaClusterSF">
</Description>
<Description
tag="Realm"
standard="false"
- default="false"
+ default="false"
childs="false"
tagClass="org.apache.catalina.Realm"
storeFactoryClass="org.apache.catalina.storeconfig.RealmSF">
@@ -162,24 +162,24 @@
<TransientAttribute>realmPath</TransientAttribute>
</Description>
<Description
- tag="Parameter"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ApplicationParameter"
+ tag="Parameter"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ApplicationParameter"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Loader"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.loader.WebappLoader"
+ tag="Loader"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.loader.WebappLoader"
storeFactoryClass="org.apache.catalina.storeconfig.LoaderSF">
</Description>
<Description
- tag="Listener"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.LifecycleListener"
+ tag="Listener"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.LifecycleListener"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
<TransientChild>org.apache.catalina.mbeans.ServerLifecycleListener</TransientChild>
<TransientChild>org.apache.catalina.core.NamingContextListener</TransientChild>
@@ -193,66 +193,66 @@
</Description>
<Description
id="org.apache.catalina.core.StandardServer.[ServerLifecycleListener]"
- tag="Listener"
- standard="false"
- default="false"
+ tag="Listener"
+ standard="false"
+ default="false"
tagClass="org.apache.catalina.mbeans.ServerLifecycleListener"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Valve"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.Valve"
- storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
- <TransientChild>org.apache.catalina.authenticator.BasicAuthenticator</TransientChild>
- <TransientChild>org.apache.catalina.authenticator.DigestAuthenticator</TransientChild>
- <TransientChild>org.apache.catalina.authenticator.FormAuthenticator</TransientChild>
- <TransientChild>org.apache.catalina.authenticator.NonLoginAuthenticator</TransientChild>
- <TransientChild>org.apache.catalina.authenticator.SSLAuthenticator</TransientChild>
- <TransientChild>org.apache.catalina.core.StandardContextValve</TransientChild>
- <TransientChild>org.apache.catalina.core.StandardEngineValve</TransientChild>
- <TransientChild>org.apache.catalina.core.StandardHostValve</TransientChild>
- <TransientChild>org.apache.catalina.valves.CertificatesValve</TransientChild>
- <TransientChild>org.apache.catalina.valves.ErrorReportValve</TransientChild>
- <TransientChild>org.apache.catalina.valves.RequestListenerValve</TransientChild>
+ tag="Valve"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.Valve"
+ storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
+ <TransientChild>org.apache.catalina.authenticator.BasicAuthenticator</TransientChild>
+ <TransientChild>org.apache.catalina.authenticator.DigestAuthenticator</TransientChild>
+ <TransientChild>org.apache.catalina.authenticator.FormAuthenticator</TransientChild>
+ <TransientChild>org.apache.catalina.authenticator.NonLoginAuthenticator</TransientChild>
+ <TransientChild>org.apache.catalina.authenticator.SSLAuthenticator</TransientChild>
+ <TransientChild>org.apache.catalina.core.StandardContextValve</TransientChild>
+ <TransientChild>org.apache.catalina.core.StandardEngineValve</TransientChild>
+ <TransientChild>org.apache.catalina.core.StandardHostValve</TransientChild>
+ <TransientChild>org.apache.catalina.valves.CertificatesValve</TransientChild>
+ <TransientChild>org.apache.catalina.valves.ErrorReportValve</TransientChild>
+ <TransientChild>org.apache.catalina.valves.RequestListenerValve</TransientChild>
<TransientChild>org.apache.catalina.ha.session.JvmRouteBinderValve</TransientChild>
<TransientChild>org.apache.catalina.ha.tcp.ReplicationValve</TransientChild>
- </Description>
+ </Description>
<Description
- tag="Environment"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextEnvironment"
+ tag="Environment"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextEnvironment"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="EJB"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextEjb"
+ tag="EJB"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextEjb"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="LocalEjb"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextLocalEjb"
+ tag="LocalEjb"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextLocalEjb"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Resource"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextResource"
+ tag="Resource"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextResource"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Resources"
- standard="false"
- default="false"
+ tag="Resources"
+ standard="false"
+ default="false"
childs="true"
- tagClass="org.apache.catalina.WebResourceRoot"
+ tagClass="org.apache.catalina.WebResourceRoot"
storeFactoryClass="org.apache.catalina.storeconfig.WebResourceRootSF">
<TransientAttribute>allowLinking</TransientAttribute>
<TransientAttribute>cachingAllowed</TransientAttribute>
@@ -267,7 +267,7 @@
id="org.apache.catalina.WebResourceSet.[PreResources]"
tag="PreResources"
standard="false"
- default="false"
+ default="false"
tagClass="org.apache.catalina.WebResourceSet"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
@@ -275,7 +275,7 @@
id="org.apache.catalina.WebResourceSet.[JarResources]"
tag="JarResources"
standard="false"
- default="false"
+ default="false"
tagClass="org.apache.catalina.WebResourceSet"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
@@ -283,111 +283,111 @@
id="org.apache.catalina.WebResourceSet.[PostResources]"
tag="PostResources"
standard="false"
- default="false"
+ default="false"
tagClass="org.apache.catalina.WebResourceSet"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="ResourceEnvRef"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextResourceEnvRef"
+ tag="ResourceEnvRef"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextResourceEnvRef"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="ResourceLink"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextResourceLink"
+ tag="ResourceLink"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextResourceLink"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Transaction"
- standard="true"
- default="false"
- tagClass="org.apache.catalina.deploy.ContextTransaction"
+ tag="Transaction"
+ standard="true"
+ default="false"
+ tagClass="org.apache.catalina.deploy.ContextTransaction"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- id="org.apache.catalina.core.StandardContext.[InstanceListener]"
- tag="InstanceListener"
- standard="true"
- default="false"
- attributes="false"
+ id="org.apache.catalina.core.StandardContext.[InstanceListener]"
+ tag="InstanceListener"
+ standard="true"
+ default="false"
+ attributes="false"
storeFactoryClass="org.apache.catalina.storeconfig.InstanceListenerSF">
</Description>
<Description
- id="org.apache.catalina.core.StandardContext.[WrapperLifecycle]"
- tag="WrapperLifecycle"
- standard="true"
- default="false"
- attributes="false"
+ id="org.apache.catalina.core.StandardContext.[WrapperLifecycle]"
+ tag="WrapperLifecycle"
+ standard="true"
+ default="false"
+ attributes="false"
storeFactoryClass="org.apache.catalina.storeconfig.WrapperLifecycleSF">
</Description>
<Description
- id="org.apache.catalina.core.StandardContext.[WrapperListener]"
- tag="WrapperListener"
- standard="true"
- default="false"
- attributes="false"
+ id="org.apache.catalina.core.StandardContext.[WrapperListener]"
+ tag="WrapperListener"
+ standard="true"
+ default="false"
+ attributes="false"
storeFactoryClass="org.apache.catalina.storeconfig.WrapperListenerSF">
</Description>
<Description
- id="org.apache.catalina.core.StandardContext.[WatchedResource]"
- tag="WatchedResource"
- standard="true"
- default="false"
- attributes="false"
+ id="org.apache.catalina.core.StandardContext.[WatchedResource]"
+ tag="WatchedResource"
+ standard="true"
+ default="false"
+ attributes="false"
storeFactoryClass="org.apache.catalina.storeconfig.WatchedResourceSF">
</Description>
<Description
- tag="Sender"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
+ tag="Sender"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Sender"
- standard="false"
- default="false"
- childs="true"
- tagClass="org.apache.catalina.tribes.ChannelSender"
+ tag="Sender"
+ standard="false"
+ default="false"
+ childs="true"
+ tagClass="org.apache.catalina.tribes.ChannelSender"
storeFactoryClass="org.apache.catalina.storeconfig.SenderSF">
</Description>
<Description
tag="Transport"
standard="false"
- default="false"
+ default="false"
tagClass="org.apache.catalina.tribes.transport.DataSender"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Receiver"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.tribes.ChannelReceiver"
+ tag="Receiver"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.tribes.ChannelReceiver"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Membership"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.tribes.MembershipService"
+ tag="Membership"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.tribes.MembershipService"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- tag="Deployer"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.ha.ClusterDeployer"
+ tag="Deployer"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.ha.ClusterDeployer"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
- </Description>
+ </Description>
<Description
- tag="ClusterListener"
- standard="false"
- default="false"
- tagClass="org.apache.catalina.ha.ClusterListener"
+ tag="ClusterListener"
+ standard="false"
+ default="false"
+ tagClass="org.apache.catalina.ha.ClusterListener"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
@@ -416,7 +416,7 @@
<Description
tag="Executor"
standard="false"
- default="false"
+ default="false"
tagClass="org.apache.catalina.core.StandardThreadExecutor"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Thread.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Thread.java?rev=1444300&r1=1444299&r2=1444300&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Thread.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Thread.java Sat Feb 9 00:46:07 2013
@@ -24,10 +24,10 @@ package org.apache.tomcat.jni;
*/
public class Thread {
-
+
/**
* Get the current thread ID handle.
*/
- public static native long current();
+ public static native long current();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org