62527: Revert restriction of JNDI to the java: namespace.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1835545 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties b/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
index ca0307c..59ec693 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
@@ -15,7 +15,6 @@
filterDef.invalidFilterName=Invalid <filter-name> [{0}] in filter definition.
-resourceBase.lookupNotJava=Lookup-name values must explicitly reference the java: namespace but [{0}] does not
securityConstraint.uncoveredHttpMethod=For security constraints with URL pattern [{0}] only the HTTP methods [{1}] are covered. All other methods are uncovered.
securityConstraint.uncoveredHttpMethodFix=Adding security constraints with URL pattern [{0}] to deny access with the uncovered HTTP methods that are not one of the following [{1}]
securityConstraint.uncoveredHttpOmittedMethod=For security constraints with URL pattern [{0}] the HTTP methods [{1}] are uncovered.
diff --git a/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java b/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
index 9c2506c..f3b46ab 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
@@ -90,15 +90,10 @@
}
public void setLookupName(String lookupName) {
- // EE.5.3.3: Must explicitly use java: namespace
if (lookupName == null || lookupName.length() == 0) {
this.lookupName = null;
return;
}
- if (!lookupName.startsWith("java:")) {
- throw new IllegalArgumentException(
- sm.getString("resourceBase.lookupNotJava", lookupName));
- }
this.lookupName = lookupName;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a2fa78f..aa81156 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.0.54 (violetagg)" rtext="In development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>62527</bug>: Revert restriction of JNDI to the <code>java:</code>
+ namespace. (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.53 (violetagg)" rtext="2018-07-05">
<subsection name="Catalina">
