You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/01/08 15:13:32 UTC
svn commit: r1430293 - in /tomcat/trunk: java/org/apache/catalina/
java/org/apache/catalina/core/ java/org/apache/catalina/startup/
java/org/apache/catalina/webresources/ test/javax/el/
test/org/apache/catalina/core/ test/org/apache/catalina/loader/ te...
Author: markt
Date: Tue Jan 8 14:13:31 2013
New Revision: 1430293
URL: http://svn.apache.org/viewvc?rev=1430293&view=rev
Log:
Improve consistency within new resources implementation.
Place same requirements on internalPath as for path (although internal representation is different).
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java
tomcat/trunk/test/javax/el/TestCompositeELResolver.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java Tue Jan 8 14:13:31 2013
@@ -185,7 +185,7 @@ public interface WebResourceRoot extends
* resources should be published at. It must start
* with '/'.
* @param internalPath The path within the resource where the content is to
- * be found.
+ * be found. It must start with '/'.
*/
void createWebResourceSet(ResourceSetType type, URL url, String webAppMount,
String internalPath);
@@ -200,7 +200,7 @@ public interface WebResourceRoot extends
* resources should be published at. It must start
* with '/'.
* @param internalPath The path within the resource where the content is to
- * be found.
+ * be found. It must start with '/'.
*/
void createWebResourceSet(ResourceSetType type, String base,
String webAppMount, String internalPath);
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Jan 8 14:13:31 2013
@@ -4786,7 +4786,7 @@ public class StandardContext extends Con
if (webinfClassesResource.isDirectory()) {
getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.RESOURCE_JAR,
- webinfClassesResource.getURL(), "/", "");
+ webinfClassesResource.getURL(), "/", "/");
}
}
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=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jan 8 14:13:31 2013
@@ -1560,7 +1560,7 @@ public class ContextConfig implements Li
if (entryName.startsWith("META-INF/resources/")) {
context.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.RESOURCE_JAR,
- url, "/", "META-INF/resources");
+ url, "/", "/META-INF/resources");
break;
}
jar.nextEntry();
@@ -1572,7 +1572,7 @@ public class ContextConfig implements Li
if (resources.isDirectory()) {
context.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.RESOURCE_JAR,
- file.getAbsolutePath(), "/", "");
+ file.getAbsolutePath(), "/", "/");
}
}
} catch (IOException ioe) {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java Tue Jan 8 14:13:31 2013
@@ -41,7 +41,11 @@ public abstract class AbstractResourceSe
}
protected final String checkInternalPath(String internalPath) {
- //checkPath(internalPath);
+ checkPath(internalPath);
+ // Optimise internal processing
+ if (internalPath.equals("/")) {
+ return "";
+ }
return internalPath;
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java Tue Jan 8 14:13:31 2013
@@ -72,7 +72,7 @@ public class DirResourceSet extends Abst
if (f.isDirectory()) {
root.createWebResourceSet(ResourceSetType.RESOURCE_JAR,
- f.getAbsolutePath(), "/", "");
+ f.getAbsolutePath(), "/", "/");
}
}
Modified: tomcat/trunk/test/javax/el/TestCompositeELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestCompositeELResolver.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestCompositeELResolver.java Tue Jan 8 14:13:31 2013
@@ -47,7 +47,7 @@ public class TestCompositeELResolver ext
ctxt.setResources(new StandardRoot(ctxt));
ctxt.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
- "/WEB-INF/lib", "");
+ "/WEB-INF/lib", "/");
tomcat.start();
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Tue Jan 8 14:13:31 2013
@@ -52,7 +52,7 @@ public class TestStandardContextAliases
ctx.setResources(new StandardRoot(ctx));
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
- "/WEB-INF/lib", "");
+ "/WEB-INF/lib", "/");
Tomcat.addServlet(ctx, "test", new TestServlet());
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Tue Jan 8 14:13:31 2013
@@ -78,22 +78,22 @@ public class TestVirtualContext extends
File f6 = new File("test/webapp-3.0-virtual-webapp/src/main/webapp2");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f2.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f3.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f4.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f5.getAbsolutePath(),
- "/other", "");
+ "/other", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f6.getAbsolutePath(),
- "", "");
+ "/", "/");
StandardJarScanner jarScanner = new StandardJarScanner();
jarScanner.setScanAllDirectories(true);
@@ -281,10 +281,10 @@ public class TestVirtualContext extends
File f2 = new File("test/webapp-3.0-virtual-library/target/classes");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f2.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
tomcat.start();
// first test that without the setting on StandardContext the annotated
@@ -298,14 +298,14 @@ public class TestVirtualContext extends
ctx.setResources(new StandardRoot(ctx));
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f2.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST,
additionWebInfClasses.getAbsolutePath(),
- "/WEB-INF/classes", "");
+ "/WEB-INF/classes", "/");
tomcat.start();
assertPageContains("/test/annotatedServlet", MyAnnotatedServlet.MESSAGE);
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java (original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java Tue Jan 8 14:13:31 2013
@@ -59,7 +59,7 @@ public class TestVirtualWebappLoader ext
File f1 = new File("test/webapp-3.0-fragments/WEB-INF/lib");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
- "/WEB-INF/lib", "");
+ "/WEB-INF/lib", "/");
loader.start();
String[] repos = loader.getLoaderRepositories();
Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java Tue Jan 8 14:13:31 2013
@@ -29,7 +29,7 @@ public class TestDirResourceSet extends
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "");
+ f.getAbsolutePath(), "/", "/");
root.setWebResourceSet(webResourceSet);
return root;
}
Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java Tue Jan 8 14:13:31 2013
@@ -29,7 +29,7 @@ public class TestDirResourceSetInternal
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "webresources/dir1");
+ f.getAbsolutePath(), "/", "/webresources/dir1");
root.setWebResourceSet(webResourceSet);
return root;
}
Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java Tue Jan 8 14:13:31 2013
@@ -29,7 +29,7 @@ public class TestDirResourceSetMount ext
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/mount", "");
+ f.getAbsolutePath(), "/mount", "/");
root.setWebResourceSet(webResourceSet);
return root;
}
Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java Tue Jan 8 14:13:31 2013
@@ -29,23 +29,23 @@ public class TestFileResourceSet extends
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "");
+ f.getAbsolutePath(), "/", "/");
root.setWebResourceSet(webResourceSet);
WebResourceSet f1 = new FileResourceSet(root,
- "test/webresources/dir1/f1.txt", "/f1.txt", "");
+ "test/webresources/dir1/f1.txt", "/f1.txt", "/");
root.addPreResources(f1);
WebResourceSet f2 = new FileResourceSet(root,
- "test/webresources/dir1/f2.txt", "/f2.txt", "");
+ "test/webresources/dir1/f2.txt", "/f2.txt", "/");
root.addPreResources(f2);
WebResourceSet d1f1 = new FileResourceSet(root,
- "test/webresources/dir1/d1/d1-f1.txt", "/d1/d1-f1.txt", "");
+ "test/webresources/dir1/d1/d1-f1.txt", "/d1/d1-f1.txt", "/");
root.addPreResources(d1f1);
WebResourceSet d2f1 = new FileResourceSet(root,
- "test/webresources/dir1/d2/d2-f1.txt", "/d2/d2-f1.txt", "");
+ "test/webresources/dir1/d2/d2-f1.txt", "/d2/d2-f1.txt", "/");
root.addPreResources(d2f1);
return root;
Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java Tue Jan 8 14:13:31 2013
@@ -28,7 +28,7 @@ public class TestJarResourceSet extends
File f = new File("test/webresources/dir1.jar");
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new JarResourceSet(root, f.getAbsolutePath(), "/", "");
+ new JarResourceSet(root, f.getAbsolutePath(), "/", "/");
root.setWebResourceSet(webResourceSet);
return root;
}
Modified: tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java (original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java Tue Jan 8 14:13:31 2013
@@ -28,7 +28,7 @@ public class TestJarResourceSetMount ext
File f = new File("test/webresources/dir1.jar");
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new JarResourceSet(root, f.getAbsolutePath(), "/mount", "");
+ new JarResourceSet(root, f.getAbsolutePath(), "/mount", "/");
root.setWebResourceSet(webResourceSet);
return root;
}
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Tue Jan 8 14:13:31 2013
@@ -122,7 +122,7 @@ public class TestGenerator extends Tomca
ctxt.setResources(new StandardRoot(ctxt));
ctxt.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
- "/WEB-INF/lib", "");
+ "/WEB-INF/lib", "/");
tomcat.start();
Modified: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java?rev=1430293&r1=1430292&r2=1430293&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java (original)
+++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java Tue Jan 8 14:13:31 2013
@@ -44,7 +44,7 @@ public abstract class AbstractTestTag ex
File lib = new File("webapps/examples/WEB-INF/lib");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
- "/WEB-INF/lib", "");
+ "/WEB-INF/lib", "/");
// Configure the use of the plug-in rather than the standard impl
File plugin = new File(
@@ -52,7 +52,7 @@ public abstract class AbstractTestTag ex
Assert.assertTrue(plugin.isFile());
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, plugin.getAbsolutePath(),
- "/WEB-INF/tagPlugins.xml", "");
+ "/WEB-INF/tagPlugins.xml", "/");
tomcat.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org