Move WebRuleSet to new o.a.t.u.descriptor.web package
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1501195 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 7539c1d..da21256 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -106,6 +106,7 @@
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;
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index 56bf946..c0ccec7 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -130,12 +130,5 @@
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}].
diff --git a/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties b/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
index af03526..b5aacc4 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
@@ -21,6 +21,14 @@
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}]
diff --git a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
new file mode 100644
index 0000000..a73e14f
--- /dev/null
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
@@ -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
diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
similarity index 98%
rename from java/org/apache/catalina/startup/WebRuleSet.java
rename to java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
index fa5f13e..4c83303 100644
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
@@ -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 @@
* The string resources for this package.
*/
protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ StringManager.getManager(Constants.PACKAGE_NAME);
// ----------------------------------------------------- Instance Variables
diff --git a/test/javax/servlet/resources/TestSchemaValidation.java b/test/javax/servlet/resources/TestSchemaValidation.java
index 97b381a..5715154 100644
--- a/test/javax/servlet/resources/TestSchemaValidation.java
+++ b/test/javax/servlet/resources/TestSchemaValidation.java
@@ -21,9 +21,9 @@
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;
diff --git a/test/org/apache/catalina/startup/TestWebRuleSet.java b/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
similarity index 97%
rename from test/org/apache/catalina/startup/TestWebRuleSet.java
rename to test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
index a9896ca..c0b274a 100644
--- a/test/org/apache/catalina/startup/TestWebRuleSet.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
@@ -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 org.junit.Test;
-import org.apache.tomcat.util.descriptor.web.WebXml;
import org.apache.tomcat.util.digester.Digester;
public class TestWebRuleSet {
