You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2007/06/03 04:05:29 UTC
svn commit: r543827 - in /geronimo/server/trunk: ./ configs/jasper/src/plan/
modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/
modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/
modules/geronimo-tomcat6/src/test/java/org...
Author: kevan
Date: Sat Jun 2 19:05:28 2007
New Revision: 543827
URL: http://svn.apache.org/viewvc?view=rev&rev=543827
Log:
GERONIMO-3206 Updates to match the patched version of Tomcat. There's also some plugin updates in pom.xml for GERONIMO-3205
Modified:
geronimo/server/trunk/configs/jasper/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JAASSecurityTest.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JACCSecurityTest.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/configs/jasper/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/src/plan/plan.xml?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/configs/jasper/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jasper/src/plan/plan.xml Sat Jun 2 19:05:28 2007
@@ -19,5 +19,7 @@
<!-- $Rev$ $Date$ -->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-
+ <gbean name="JasperSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+ <attribute name="systemProperties">org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS=true</attribute>
+ </gbean>
</module>
Modified: geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java (original)
+++ geronimo/server/trunk/modules/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java Sat Jun 2 19:05:28 2007
@@ -31,7 +31,7 @@
import org.apache.geronimo.j2ee.RuntimeCustomizer;
import org.apache.geronimo.j2ee.annotation.Holder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.jasper.instanceManagement.InstanceManager;
+import org.apache.InstanceManager;
/**
* @version $Rev$ $Date$
@@ -63,7 +63,6 @@
private final Holder holder;
private final Context context;
-
public JasperInstanceManager(Holder holder, Context context) {
this.holder = holder;
this.context = context;
@@ -80,7 +79,15 @@
throw new InvocationTargetException(e, "Attempted to destroy instance");
}
}
-
+
+ public void newInstance(Object o) throws IllegalAccessException, InvocationTargetException, NamingException {
+ throw new UnsupportedOperationException("separate instantiation and injection is not supported");
+ }
+
+ public Object newInstance(String fqcn) throws IllegalAccessException, InvocationTargetException, NamingException,
+ InstantiationException, ClassNotFoundException {
+ throw new UnsupportedOperationException("separate instantiation and injection is not supported");
+ }
}
public static final GBeanInfo GBEAN_INFO;
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java Sat Jun 2 19:05:28 2007
@@ -25,7 +25,7 @@
import org.apache.catalina.Context;
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
-import org.apache.catalina.instanceManagement.InstanceManager;
+import org.apache.InstanceManager;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.apache.geronimo.kernel.Kernel;
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java Sat Jun 2 19:05:28 2007
@@ -26,7 +26,7 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.apache.catalina.instanceManagement.InstanceManager;
+import org.apache.InstanceManager;
import org.apache.geronimo.j2ee.annotation.Holder;
/**
@@ -45,6 +45,10 @@
this.context = context;
}
+ public Object newInstance(String fqcn, ClassLoader classLoader) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
+ return holder.newInstance(fqcn, classLoader, context);
+ }
+
public Object newInstance(String className) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
return holder.newInstance(className, classLoader, context);
}
@@ -56,6 +60,8 @@
throw new InvocationTargetException(e, "Attempted to destroy instance");
}
}
-
-
+
+ public void newInstance(Object o) throws IllegalAccessException, InvocationTargetException, NamingException {
+ throw new UnsupportedOperationException("separate instantiation and injection is not supported");
+ }
}
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Sat Jun 2 19:05:28 2007
@@ -39,7 +39,7 @@
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
-import org.apache.catalina.instanceManagement.InstanceManager;
+import org.apache.InstanceManager;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.commons.logging.Log;
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Sat Jun 2 19:05:28 2007
@@ -56,6 +56,7 @@
protected final static String securityRealmName = "demo-properties-realm";
protected ConnectorGBean connector;
protected TomcatContainer container;
+ protected static int port = 8181;
private TransactionManager transactionManager;
private ConnectionTrackingCoordinator connectionTrackingCoordinator;
@@ -180,7 +181,7 @@
container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(), null, engine, serverInfo, null, null);
container.doStart();
- connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);
+ connector = new ConnectorGBean("HTTP", null, "localhost", port++, container);
connector.doStart();
TransactionManagerImpl transactionManager = new TransactionManagerImpl();
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java Sat Jun 2 19:05:28 2007
@@ -36,7 +36,7 @@
null,
null);
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/hello.txt").openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/hello.txt").openConnection();
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
assertEquals("Hello World", reader.readLine());
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java Sat Jun 2 19:05:28 2007
@@ -36,7 +36,7 @@
String contextPath = "/foo/webservice.ws";
MockWebServiceContainer webServiceInvoker = new MockWebServiceContainer();
container.addWebService(contextPath, null, webServiceInvoker, null, null, null,null, cl);
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181" + contextPath).openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + contextPath).openConnection();
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
@@ -45,7 +45,7 @@
connection.disconnect();
}
container.removeWebService(contextPath);
- connection = (HttpURLConnection) new URL("http://localhost:8181" + contextPath).openConnection();
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + contextPath).openConnection();
try {
connection.getInputStream();
fail();
@@ -54,7 +54,6 @@
assertEquals(HttpURLConnection.HTTP_NOT_FOUND, connection.getResponseCode());
connection.disconnect();
}
-
}
public void testSecureWebServiceHandler() throws Exception {
@@ -66,7 +65,7 @@
container.addWebService(contextPath, null, webServiceInvoker, securityRealmName, securityRealmName, "NONE", "BASIC", cl);
//Veryify its secured
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181" + contextPath).openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + contextPath).openConnection();
try {
connection.getInputStream();
fail();
@@ -77,7 +76,7 @@
}
//Authenticate
- connection = (HttpURLConnection) new URL("http://localhost:8181" + contextPath).openConnection();
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + contextPath).openConnection();
String authentication = new String(Base64.encode("alan:starcraft".getBytes()));
connection.setRequestProperty("Authorization", "Basic " + authentication);
try {
@@ -88,7 +87,7 @@
connection.disconnect();
}
container.removeWebService(contextPath);
- connection = (HttpURLConnection) new URL("http://localhost:8181" + contextPath).openConnection();
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + contextPath).openConnection();
try {
connection.getInputStream();
fail();
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JAASSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JAASSecurityTest.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JAASSecurityTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JAASSecurityTest.java Sat Jun 2 19:05:28 2007
@@ -44,7 +44,7 @@
startWebApp();
//Begin the test
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
connection.setInstanceFollowRedirects(false);
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
//Be sure we have been given the login page
@@ -54,7 +54,7 @@
String cookie = connection.getHeaderField("Set-Cookie");
cookie = cookie.substring(0, cookie.lastIndexOf(';'));
- String location = "http://localhost:8181/test/protected/j_security_check?j_username=alan&j_password=starcraft";
+ String location = connector.getConnectUrl() + "/test/protected/j_security_check?j_username=alan&j_password=starcraft";
connection = (HttpURLConnection) new URL(location).openConnection();
connection.setRequestMethod("POST");
connection.setRequestProperty("Cookie", cookie);
@@ -76,7 +76,7 @@
startWebApp();
//Begin the test
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
connection.setInstanceFollowRedirects(false);
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
@@ -87,7 +87,7 @@
String cookie = connection.getHeaderField("Set-Cookie");
cookie = cookie.substring(0, cookie.lastIndexOf(';'));
- String location = "http://localhost:8181/test/protected/j_security_check?j_username=alan&j_password=basspassword";
+ String location = connector.getConnectUrl() + "/test/protected/j_security_check?j_username=alan&j_password=basspassword";
connection = (HttpURLConnection) new URL(location).openConnection();
connection.setRequestMethod("POST");
@@ -108,43 +108,39 @@
}
public void testGoodAuthentication() throws Exception {
-// startWebApp();
-//
-// //Give the container some time to load the web context
-// //this is wierd..it only needs to be done on this test
-// Thread.sleep(5000);
-//
-// //Begin the test
-// HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
-// connection.setInstanceFollowRedirects(false);
-// assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
-//
-// //Be sure we have been given the login page
-// BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-// assertEquals("<!-- Login Page -->", reader.readLine());
-// reader.close();
-//
-// String cookie = connection.getHeaderField("Set-Cookie");
-// cookie = cookie.substring(0, cookie.lastIndexOf(';'));
-// String location = "http://localhost:8181/test/protected/j_security_check?j_username=izumi&j_password=violin";
-//
-// connection = (HttpURLConnection) new URL(location).openConnection();
-// connection.setRequestMethod("POST");
-// connection.setRequestProperty("Referer","http://localhost:8181/test/auth/logon.html?param=test");
-// connection.setRequestProperty("Cookie", cookie);
-// connection.setInstanceFollowRedirects(false);
-// assertEquals(HttpURLConnection.HTTP_MOVED_TEMP, connection.getResponseCode());
-//
-// connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
-// connection.setRequestProperty("Cookie", cookie);
-// connection.setInstanceFollowRedirects(false);
-// reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-//
-// assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
-// assertEquals("Hello World", reader.readLine());
-// connection.disconnect();
-//
-// stopWebApp();
+ startWebApp();
+
+ //Begin the test
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
+ connection.setInstanceFollowRedirects(false);
+ assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
+
+ //Be sure we have been given the login page
+ BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ assertEquals("<!-- Login Page -->", reader.readLine());
+ reader.close();
+
+ String cookie = connection.getHeaderField("Set-Cookie");
+ cookie = cookie.substring(0, cookie.lastIndexOf(';'));
+ String location = connector.getConnectUrl() + "/test/protected/j_security_check?j_username=izumi&j_password=violin";
+
+ connection = (HttpURLConnection) new URL(location).openConnection();
+ connection.setRequestMethod("POST");
+ connection.setRequestProperty("Referer",connector.getConnectUrl() + "/test/auth/logon.html?param=test");
+ connection.setRequestProperty("Cookie", cookie);
+ connection.setInstanceFollowRedirects(false);
+ assertEquals(HttpURLConnection.HTTP_MOVED_TEMP, connection.getResponseCode());
+
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
+ connection.setRequestProperty("Cookie", cookie);
+ connection.setInstanceFollowRedirects(false);
+ reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+
+ assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
+ assertEquals("Hello World", reader.readLine());
+ connection.disconnect();
+
+ stopWebApp();
}
protected void startWebApp() throws Exception {
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JACCSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JACCSecurityTest.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JACCSecurityTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JACCSecurityTest.java Sat Jun 2 19:05:28 2007
@@ -97,7 +97,7 @@
defaultPrincipal, permissions);
//Begin the test
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
connection.setInstanceFollowRedirects(false);
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
@@ -108,16 +108,16 @@
String cookie = connection.getHeaderField("Set-Cookie");
cookie = cookie.substring(0, cookie.lastIndexOf(';'));
- String location = "http://localhost:8181/test/protected/j_security_check?j_username=alan&j_password=starcraft";
+ String location = connector.getConnectUrl() + "/test/protected/j_security_check?j_username=alan&j_password=starcraft";
connection = (HttpURLConnection) new URL(location).openConnection();
connection.setRequestMethod("POST");
- connection.setRequestProperty("Referer", "http://localhost:8181/test/auth/logon.html?param=test");
+ connection.setRequestProperty("Referer", connector.getConnectUrl() + "/test/auth/logon.html?param=test");
connection.setRequestProperty("Cookie", cookie);
connection.setInstanceFollowRedirects(false);
assertEquals(HttpURLConnection.HTTP_MOVED_TEMP, connection.getResponseCode());
- connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
connection.setRequestProperty("Cookie", cookie);
connection.setInstanceFollowRedirects(false);
reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
@@ -127,7 +127,7 @@
connection.disconnect();
//Now lets try it with izumi
- connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
connection.setInstanceFollowRedirects(false);
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
@@ -139,7 +139,7 @@
assertEquals("<!-- Login Page -->", reader.readLine());
reader.close();
- location = "http://localhost:8181/test/protected/j_security_check?j_username=izumi&j_password=violin";
+ location = connector.getConnectUrl() + "/test/protected/j_security_check?j_username=izumi&j_password=violin";
connection = (HttpURLConnection) new URL(location).openConnection();
connection.setRequestMethod("POST");
@@ -148,7 +148,7 @@
assertEquals(HttpURLConnection.HTTP_MOVED_TEMP, connection.getResponseCode());
try {
- connection = (HttpURLConnection) new URL("http://localhost:8181/test/protected/hello.txt").openConnection();
+ connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/protected/hello.txt").openConnection();
connection.setRequestProperty("Cookie", cookie);
connection.setInstanceFollowRedirects(false);
reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java Sat Jun 2 19:05:28 2007
@@ -38,7 +38,7 @@
webModule = setUpInsecureAppContext(new File(BASEDIR, "target/var/catalina/webapps/war1/").toURI(), new File(
BASEDIR, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(), null, null, null);
- HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/hello.txt")
+ HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/hello.txt")
.openConnection();
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=543827&r1=543826&r2=543827
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Jun 2 19:05:28 2007
@@ -71,7 +71,7 @@
<!--
HACK: Used by jsp and servlet example configs to point to the tomcat deployer
-->
- <tomcatVersion>6.0.10</tomcatVersion>
+ <tomcatVersion>6.0.13</tomcatVersion>
<!--
HACK: Used by uddi-jetty and uddi-tomcat config plans
@@ -928,7 +928,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0-G525637</version>
+ <version>6.0.13-G543818</version>
</dependency>
<dependency>
@@ -958,7 +958,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0-G525637</version>
+ <version>6.0.13-G543818</version>
</dependency>
<dependency>
@@ -1569,19 +1569,23 @@
</configuration>
</plugin>
+ <!--
+ The jspc 1.4.7 plugin uses a version of jasper which is incompatible with our version of jasper.
+ We've incorporated a geronimo-specific version until this is resolved...
+ -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <version>1.4.7-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-jspc-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
<executions>
<execution>
<id>jspc</id>
<goals>
- <goal>compile</goal>
+ <goal>compile</goal>
</goals>
<configuration>
<warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <inputWebXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
+<!-- <inputWebXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml> -->
</configuration>
</execution>
</executions>