Author: markt
Date: Mon Sep 16 13:16:48 2013
New Revision: 1523635
URL: http://svn.apache.org/r1523635
Log:
Re-order parameters to be more logical
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
tomcat/trunk/java/org/apache/catalina/webresources/FileResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.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/TestDirResourceSetVirtual.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/TestJarResourceSetInternal.java
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java Mon
Sep 16 13:16:48 2013
@@ -48,23 +48,23 @@ public class DirResourceSet extends Abst
* @param root The {@link WebResourceRoot} this new
* {@link org.apache.catalina.WebResourceSet} will
* be added to.
- * @param base The absolute path to the directory on the file
- * system from which the resources will be served.
* @param webAppMount The path within the web application at which this
* {@link org.apache.catalina.WebResourceSet} will
* be mounted. For example, to add a directory of
* JARs to a web application, the directory would
* be mounted at "/WEB-INF/lib/"
+ * @param base The absolute path to the directory on the file
+ * system from which the resources will be served.
* @param internalPath The path within this new {@link
* org.apache.catalina.WebResourceSet} where
* resources will be served from.
*/
- public DirResourceSet(WebResourceRoot root, String base, String
webAppMount,
+ public DirResourceSet(WebResourceRoot root, String webAppMount, String
base,
String internalPath) {
super(internalPath);
setRoot(root);
- setBase(base);
setWebAppMount(webAppMount);
+ setBase(base);
if (root.getContext().getAddWebinfClassesResources()) {
File f = new File(base, internalPath);
@@ -99,7 +99,7 @@ public class DirResourceSet extends Abst
if (f.isDirectory() && path.charAt(path.length() - 1) != '/') {
path = path += '/';
}
- return new FileResource(root, f, path);
+ return new FileResource(root, path, f);
} else {
return new EmptyResource(root, path);
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Mon
Sep 16 13:16:48 2013
@@ -41,8 +41,8 @@ public class FileResource extends Abstra
private final File resource;
private final String name;
- public FileResource(WebResourceRoot root, File resource,
- String webAppPath) {
+ public FileResource(WebResourceRoot root, String webAppPath,
+ File resource) {
super(root,webAppPath);
this.resource = resource;
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/FileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResourceSet.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResourceSet.java Mon
Sep 16 13:16:48 2013
@@ -45,23 +45,23 @@ public class FileResourceSet extends Abs
* @param root The {@link WebResourceRoot} this new
* {@link org.apache.catalina.WebResourceSet} will
* be added to.
- * @param base The absolute path to the file on the file system
- * from which the resource will be served.
* @param webAppMount The path within the web application at which this
* {@link org.apache.catalina.WebResourceSet} will
* be mounted. For example, to add a directory of
* JARs to a web application, the directory would
* be mounted at "WEB-INF/lib/"
+ * @param base The absolute path to the file on the file system
+ * from which the resource will be served.
* @param internalPath The path within this new {@link
* org.apache.catalina.WebResourceSet} where
* resources will be served from.
*/
- public FileResourceSet(WebResourceRoot root, String base, String
webAppMount,
- String internalPath) {
+ public FileResourceSet(WebResourceRoot root, String webAppMount,
+ String base, String internalPath) {
super(internalPath);
setRoot(root);
- setBase(base);
setWebAppMount(webAppMount);
+ setBase(base);
if (getRoot().getState().isAvailable()) {
try {
@@ -84,7 +84,7 @@ public class FileResourceSet extends Abs
if (f == null) {
return new EmptyResource(root, path);
}
- return new FileResource(root, f, path);
+ return new FileResource(root, path, f);
}
if (path.charAt(path.length() - 1) != '/') {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Mon Sep
16 13:16:48 2013
@@ -38,8 +38,8 @@ public class JarResource extends Abstrac
private final String base;
private final String baseUrl;
- public JarResource(WebResourceRoot root, String base, String baseUrl,
- JarEntry jarEntry, String internalPath, String webAppPath) {
+ public JarResource(WebResourceRoot root, String webAppPath, String base,
+ String baseUrl, JarEntry jarEntry, String internalPath) {
super(root, webAppPath, jarEntry);
this.base = base;
this.baseUrl = "jar:" + baseUrl;
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Mon
Sep 16 13:16:48 2013
@@ -45,22 +45,22 @@ public class JarResourceSet extends Abst
* @param root The {@link WebResourceRoot} this new
* {@link org.apache.catalina.WebResourceSet} will
* be added to.
- * @param base The absolute path to the JAR file on the file
system
- * from which the resources will be served.
* @param webAppMount The path within the web application at which this
* {@link org.apache.catalina.WebResourceSet} will
* be mounted.
+ * @param base The absolute path to the JAR file on the file
system
+ * from which the resources will be served.
* @param internalPath The path within this new {@link
* org.apache.catalina.WebResourceSet} where
* resources will be served from. E.g. for a
* resource JAR, this would be
"META-INF/resources"
*/
- public JarResourceSet(WebResourceRoot root, String base, String
webAppMount,
+ public JarResourceSet(WebResourceRoot root, String webAppMount, String
base,
String internalPath) throws IllegalArgumentException {
setRoot(root);
+ setWebAppMount(webAppMount);
setBase(base);
setInternalPath(internalPath);
- setWebAppMount(webAppMount);
if (getRoot().getState().isAvailable()) {
try {
@@ -74,8 +74,8 @@ public class JarResourceSet extends Abst
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath) {
- return new JarResource(getRoot(), getBase(), baseUrl, jarEntry,
- getInternalPath(), webAppPath);
+ return new JarResource(getRoot(), webAppPath, getBase(), baseUrl,
+ jarEntry, getInternalPath());
}
//-------------------------------------------------------- Lifecycle
methods
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Mon
Sep 16 13:16:48 2013
@@ -40,9 +40,9 @@ public class JarWarResource extends Abst
private final String baseUrl;
private final String archivePath;
- public JarWarResource(WebResourceRoot root, String base, String baseUrl,
- JarEntry jarEntry, String archivePath, String internalPath,
- String webAppPath) {
+ public JarWarResource(WebResourceRoot root, String webAppPath, String base,
+ String baseUrl, JarEntry jarEntry, String archivePath,
+ String internalPath) {
super(root, webAppPath, jarEntry);
this.base = base;
this.archivePath = archivePath;
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Mon Sep 16 13:16:48 2013
@@ -77,8 +77,8 @@ public class JarWarResourceSet extends A
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath) {
- return new JarWarResource(getRoot(), getBase(), baseUrl, jarEntry,
- archivePath, getInternalPath(), webAppPath);
+ return new JarWarResource(getRoot(), webAppPath, getBase(), baseUrl,
+ jarEntry, archivePath, getInternalPath());
}
//-------------------------------------------------------- Lifecycle
methods
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Mon
Sep 16 13:16:48 2013
@@ -269,15 +269,15 @@ public class StandardRoot extends Lifecy
resourceSet = new JarWarResourceSet(this, webAppMount, base,
archivePath, internalPath);
} else if
(file.getName().toLowerCase(Locale.ENGLISH).endsWith(".jar")) {
- resourceSet = new JarResourceSet(this, base, webAppMount,
+ resourceSet = new JarResourceSet(this, webAppMount, base,
internalPath);
} else {
- resourceSet = new FileResourceSet(this, base, webAppMount,
+ resourceSet = new FileResourceSet(this, webAppMount, base,
internalPath);
}
} else if (file.isDirectory()) {
resourceSet =
- new DirResourceSet(this, base, webAppMount, internalPath);
+ new DirResourceSet(this, webAppMount, base, internalPath);
} else {
throw new IllegalArgumentException(
sm.getString("standardRoot.createInvalidFile", file));
@@ -445,9 +445,9 @@ public class StandardRoot extends Lifecy
f = new File(((Host)context.getParent()).getAppBaseFile(),
f.getName());
}
if (f.isDirectory()) {
- main = new DirResourceSet(this, f.getAbsolutePath(), "/", "/");
+ main = new DirResourceSet(this, "/", f.getAbsolutePath(), "/");
} else if(f.isFile() && docBase.endsWith(".war")) {
- main = new JarResourceSet(this, f.getAbsolutePath(), "/", "/");
+ main = new JarResourceSet(this, "/", f.getAbsolutePath(), "/");
} else {
throw new IllegalArgumentException(
sm.getString("standardRoot.startInvalidMain",
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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
Mon Sep 16 13:16:48 2013
@@ -30,8 +30,8 @@ public class TestDirResourceSet extends
File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "/");
+ new DirResourceSet(new TesterWebResourceRoot(), "/",
+ f.getAbsolutePath(), "/");
root.setMainResources(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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
Mon Sep 16 13:16:48 2013
@@ -28,8 +28,8 @@ public class TestDirResourceSetInternal
File f = new File("test/");
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "/webresources/dir1");
+ new DirResourceSet(new TesterWebResourceRoot(), "/",
+ f.getAbsolutePath(), "/webresources/dir1");
root.setMainResources(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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
Mon Sep 16 13:16:48 2013
@@ -28,8 +28,8 @@ public class TestDirResourceSetMount ext
File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), getMount(), "/");
+ new DirResourceSet(new TesterWebResourceRoot(), getMount(),
+ f.getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
return root;
}
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
Mon Sep 16 13:16:48 2013
@@ -28,24 +28,24 @@ public class TestDirResourceSetVirtual e
File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "/");
+ new DirResourceSet(new TesterWebResourceRoot(), "/",
+ f.getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
- WebResourceSet f1 = new FileResourceSet(root,
- "test/webresources/dir1/f1.txt", "/f1.txt", "/");
+ WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
+ "test/webresources/dir1/f1.txt", "/");
root.addPreResources(f1);
- WebResourceSet f2 = new FileResourceSet(root,
- "test/webresources/dir1/f2.txt", "/f2.txt", "/");
+ WebResourceSet f2 = new FileResourceSet(root, "/f2.txt",
+ "test/webresources/dir1/f2.txt", "/");
root.addPreResources(f2);
- WebResourceSet d1 = new DirResourceSet(root,
- "test/webresources/dir1/d1", "/d1", "/");
+ WebResourceSet d1 = new DirResourceSet(root, "/d1",
+ "test/webresources/dir1/d1", "/");
root.addPreResources(d1);
- WebResourceSet d2 = new DirResourceSet(root,
- "test/webresources/dir1/d2", "/d2", "/");
+ WebResourceSet d2 = new DirResourceSet(root, "/d2",
+ "test/webresources/dir1/d2", "/");
root.addPreResources(d2);
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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
Mon Sep 16 13:16:48 2013
@@ -30,24 +30,24 @@ public class TestFileResourceSet extends
File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new DirResourceSet(new TesterWebResourceRoot(),
- f.getAbsolutePath(), "/", "/");
+ new DirResourceSet(new TesterWebResourceRoot(), "/",
+ f.getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
- WebResourceSet f1 = new FileResourceSet(root,
- "test/webresources/dir1/f1.txt", "/f1.txt", "/");
+ WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
+ "test/webresources/dir1/f1.txt", "/");
root.addPreResources(f1);
- WebResourceSet f2 = new FileResourceSet(root,
- "test/webresources/dir1/f2.txt", "/f2.txt", "/");
+ WebResourceSet f2 = new FileResourceSet(root, "/f2.txt",
+ "test/webresources/dir1/f2.txt", "/");
root.addPreResources(f2);
- WebResourceSet d1f1 = new FileResourceSet(root,
- "test/webresources/dir1/d1/d1-f1.txt", "/d1/d1-f1.txt", "/");
+ WebResourceSet d1f1 = new FileResourceSet(root, "/d1/d1-f1.txt",
+ "test/webresources/dir1/d1/d1-f1.txt", "/");
root.addPreResources(d1f1);
- WebResourceSet d2f1 = new FileResourceSet(root,
- "test/webresources/dir1/d2/d2-f1.txt", "/d2/d2-f1.txt", "/");
+ WebResourceSet d2f1 = new FileResourceSet(root, "/d2/d2-f1.txt",
+ "test/webresources/dir1/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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
Mon Sep 16 13:16:48 2013
@@ -30,7 +30,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.setMainResources(webResourceSet);
return root;
}
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java?rev=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
Mon Sep 16 13:16:48 2013
@@ -30,7 +30,7 @@ public class TestJarResourceSetInternal
File f = new File("test/webresources/dir1-internal.jar");
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new JarResourceSet(root, f.getAbsolutePath(), "/", "/dir1");
+ new JarResourceSet(root, "/", f.getAbsolutePath(), "/dir1");
root.setMainResources(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=1523635&r1=1523634&r2=1523635&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
Mon Sep 16 13:16:48 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(), getMount(), "/");
+ new JarResourceSet(root, getMount(), f.getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
return root;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
