Author: markt
Date: Tue Oct 4 11:01:44 2016
New Revision: 1763259
URL: http://svn.apache.org/viewvc?rev=1763259&view=rev
Log:
Move the WAR handling code to a separate package to provide the option to
register it via the java.protocol.handler.pkgs system property
Added:
tomcat/trunk/java/org/apache/catalina/webresources/war/
tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java
- copied, changed from r1763193,
tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java
tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java
- copied, changed from r1763255,
tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java
tomcat/trunk/test/org/apache/catalina/webresources/war/
tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandler.java
- copied, changed from r1763193,
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java
tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java
- copied, changed from r1763193,
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
tomcat/trunk/test/org/apache/catalina/webresources/war/TestWarURLConnection.java
- copied, changed from r1763193,
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java
Removed:
tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java
tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1763259&r1=1763258&r2=1763259&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
Tue Oct 4 11:01:44 2016
@@ -22,6 +22,8 @@ import java.net.URLStreamHandlerFactory;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.catalina.webresources.war.Handler;
+
public class TomcatURLStreamHandlerFactory implements URLStreamHandlerFactory {
private static final String WAR_PROTOCOL = "war";
@@ -155,7 +157,7 @@ public class TomcatURLStreamHandlerFacto
// Tomcat's handler always takes priority so applications can't
override
// it.
if (WAR_PROTOCOL.equals(protocol)) {
- return new WarURLStreamHandler();
+ return new Handler();
} else if (CLASSPTH_PROTOCOL.equals(protocol)) {
return new ClasspathURLStreamHandler();
}
Copied: tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java
(from r1763193,
tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java?p2=tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java&p1=tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java&r1=1763193&r2=1763259&rev=1763259&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/WarURLStreamHandler.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/war/Handler.java Tue Oct
4 11:01:44 2016
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.webresources;
+package org.apache.catalina.webresources.war;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-public class WarURLStreamHandler extends URLStreamHandler {
+public class Handler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL u) throws IOException {
Copied:
tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java
(from r1763255,
tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java?p2=tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java&p1=tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java&r1=1763255&r2=1763259&rev=1763259&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/WarURLConnection.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java
Tue Oct 4 11:01:44 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.webresources;
+package org.apache.catalina.webresources.war;
import java.io.IOException;
import java.io.InputStream;
Copied: tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandler.java
(from r1763193,
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandler.java?p2=tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandler.java&p1=tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java&r1=1763193&r2=1763259&rev=1763259&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandler.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandler.java Tue
Oct 4 11:01:44 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.webresources;
+package org.apache.catalina.webresources.war;
import java.io.File;
import java.net.URL;
@@ -24,7 +24,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class TestWarURLStreamHandler {
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
+
+public class TestHandler {
@Before
public void register() {
Copied:
tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java
(from r1763193,
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java?p2=tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java&p1=tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java&r1=1763193&r2=1763259&rev=1763259&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/war/TestHandlerIntegration.java
Tue Oct 4 11:01:44 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.webresources;
+package org.apache.catalina.webresources.war;
import java.io.File;
import java.net.URL;
@@ -27,7 +27,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-public class TestWarURLStreamHandlerIntegration extends TomcatBaseTest {
+public class TestHandlerIntegration extends TomcatBaseTest {
@Test
public void testToURI() throws Exception {
Copied:
tomcat/trunk/test/org/apache/catalina/webresources/war/TestWarURLConnection.java
(from r1763193,
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/war/TestWarURLConnection.java?p2=tomcat/trunk/test/org/apache/catalina/webresources/war/TestWarURLConnection.java&p1=tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java&r1=1763193&r2=1763259&rev=1763259&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLConnection.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/war/TestWarURLConnection.java
Tue Oct 4 11:01:44 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.webresources;
+package org.apache.catalina.webresources.war;
import java.io.File;
import java.net.URL;
@@ -24,6 +24,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
+
public class TestWarURLConnection {
@Before
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
