Author: markt
Date: Tue Jul 9 10:41:35 2013
New Revision: 1501195
URL: http://svn.apache.org/r1501195
Log:
Move WebRuleSet to new o.a.t.u.descriptor.web package
Added:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
- copied, changed from r1501133,
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
- copied, changed from r1501133,
tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java
Removed:
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1501195&r1=1501194&r2=1501195&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jul 9
10:41:35 2013
@@ -106,6 +106,7 @@ import org.apache.tomcat.util.descriptor
import org.apache.tomcat.util.descriptor.web.SecurityRoleRef;
import org.apache.tomcat.util.descriptor.web.ServletDef;
import org.apache.tomcat.util.descriptor.web.SessionConfig;
+import org.apache.tomcat.util.descriptor.web.WebRuleSet;
import org.apache.tomcat.util.descriptor.web.WebXml;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1501195&r1=1501194&r2=1501195&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Jul 9 10:41:35 2013
@@ -130,12 +130,5 @@ userConfig.start=UserConfig: Processing
userConfig.stop=UserConfig: Processing STOP
userConfig.deploy.threaded.error=Error waiting for multi-thread deployment of
user directories to complete
webAnnotationSet.invalidInjection=Invalid method resource injection annotation.
-webRuleSet.absoluteOrdering=<absolute-ordering> element not valid in
web-fragment.xml and will be ignored
-webRuleSet.absoluteOrderingCount=<absolute-ordering> element is limited to 1
occurrence
-webRuleSet.nameCount=<name> element is limited to 1 occurrence
-webRuleSet.postconstruct.duplicate=Duplicate post construct method definition
for class {0}
-webRuleSet.predestroy.duplicate=Duplicate pre destroy method definition for
class {0}
-webRuleSet.relativeOrdering=<ordering> element not valid in web.xml and will
be ignored
-webRuleSet.relativeOrderingCount=<ordering> element is limited to 1 occurrence
xmlErrorHandler.error=Non-fatal error [{0}] reported processing [{1}].
xmlErrorHandler.warning=Warning [{0}] reported processing [{1}].
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1501195&r1=1501194&r2=1501195&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
Tue Jul 9 10:41:35 2013
@@ -21,6 +21,14 @@ securityConstraint.uncoveredHttpOmittedM
servletDef.invalidServletName=Invalid <servlet-name> [{0}] in servlet
definition.
+webRuleSet.absoluteOrdering=<absolute-ordering> element not valid in
web-fragment.xml and will be ignored
+webRuleSet.absoluteOrderingCount=<absolute-ordering> element is limited to 1
occurrence
+webRuleSet.nameCount=<name> element is limited to 1 occurrence
+webRuleSet.postconstruct.duplicate=Duplicate post construct method definition
for class {0}
+webRuleSet.predestroy.duplicate=Duplicate pre destroy method definition for
class {0}
+webRuleSet.relativeOrdering=<ordering> element not valid in web.xml and will
be ignored
+webRuleSet.relativeOrderingCount=<ordering> element is limited to 1 occurrence
+
webXml.duplicateEnvEntry=Duplicate env-entry name [{0}]
webXml.duplicateFilter=Duplicate filter name [{0}]
webXml.duplicateMessageDestination=Duplicate message-destination name [{0}]
Added:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties?rev=1501195&view=auto
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
(added)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
Tue Jul 9 10:41:35 2013
@@ -0,0 +1,17 @@
+# 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.
+
+webRuleSet.absoluteOrdering = Elemento <absolute-ordering> no v\u00E1lido en
web-fragment.xml y ser\u00E1 ignorado
+webRuleSet.relativeOrdering = elemento <ordering> no v\u00E1lido en web.xml y
ser\u00E1 ignorado
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
(from r1501133, tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?p2=tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java&p1=tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java&r1=1501133&r2=1501195&rev=1501195&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java Tue
Jul 9 10:41:35 2013
@@ -14,21 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-package org.apache.catalina.startup;
-
+package org.apache.tomcat.util.descriptor.web;
import java.lang.reflect.Method;
import java.util.ArrayList;
import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.tomcat.util.descriptor.web.ContextHandler;
-import org.apache.tomcat.util.descriptor.web.ContextService;
-import org.apache.tomcat.util.descriptor.web.ResourceBase;
-import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.apache.tomcat.util.descriptor.web.ServletDef;
-import org.apache.tomcat.util.descriptor.web.WebXml;
import org.apache.tomcat.util.digester.CallMethodRule;
import org.apache.tomcat.util.digester.CallParamRule;
import org.apache.tomcat.util.digester.Digester;
@@ -53,7 +44,7 @@ public class WebRuleSet extends RuleSetB
* The string resources for this package.
*/
protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ StringManager.getManager(Constants.PACKAGE_NAME);
// ----------------------------------------------------- Instance Variables
Modified: tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java?rev=1501195&r1=1501194&r2=1501195&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
(original)
+++ tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java Tue Jul
9 10:41:35 2013
@@ -21,9 +21,9 @@ import java.io.File;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.catalina.startup.WebRuleSet;
import org.apache.tomcat.util.descriptor.DigesterFactory;
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
+import org.apache.tomcat.util.descriptor.web.WebRuleSet;
import org.apache.tomcat.util.descriptor.web.WebXml;
import org.apache.tomcat.util.digester.Digester;
Copied:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
(from r1501133,
tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java?p2=tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java&p1=tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java&r1=1501133&r2=1501195&rev=1501195&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
Tue Jul 9 10:41:35 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.startup;
+package org.apache.tomcat.util.descriptor.web;
import java.io.File;
import java.io.FileInputStream;
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTru
import org.junit.Test;
-import org.apache.tomcat.util.descriptor.web.WebXml;
import org.apache.tomcat.util.digester.Digester;
public class TestWebRuleSet {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
