You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/07/27 16:20:55 UTC
svn commit: r225525 - in
/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat:
TomcatEJBWebServiceContext.java TomcatGeronimoEmbedded.java
Author: jgenender
Date: Wed Jul 27 07:20:51 2005
New Revision: 225525
URL: http://svn.apache.org/viewcvs?rev=225525&view=rev
Log:
Fixed classloader issues by implementing delegation and fixed a URL for the EJB context
Modified:
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java?rev=225525&r1=225524&r2=225525&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Wed Jul 27 07:20:51 2005
@@ -36,10 +36,15 @@
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.valves.ValveBase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.tomcat.realm.TomcatJAASRealm;
import org.apache.geronimo.webservices.WebServiceContainer;
public class TomcatEJBWebServiceContext extends StandardContext{
+
+ private static final Log log = LogFactory.getLog(TomcatEJBWebServiceContext.class);
+
private final String contextPath;
private final WebServiceContainer webServiceContainer;
private final boolean isSecureTransportGuarantee;
@@ -55,6 +60,7 @@
this.setDocBase("");
this.setParentClassLoader(classLoader);
+ log.info("EJB Webservice Context = " + contextPath);
if (securityRealmName != null) {
TomcatJAASRealm realm = new TomcatJAASRealm();
@@ -131,6 +137,7 @@
} catch (IOException e) {
throw e;
} catch (Exception e) {
+ log.error(e);
res.sendError(500,"Could not fetch wsdl!");
return;
}
@@ -176,7 +183,7 @@
public java.net.URI getURI() {
if (uri == null) {
try {
- String uriString = request.getScheme() + "://" + request.getHost() + ":" + request.getLocalPort() + request.getRequestURI();
+ String uriString = request.getScheme() + "://" + request.getServerName() + ":" + request.getLocalPort() + request.getRequestURI();
//return new java.net.URI(uri.getScheme(),uri.getHost(),uri.getPath(),uri.);
uri = new java.net.URI(uriString);
} catch (URISyntaxException e) {
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java?rev=225525&r1=225524&r2=225525&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java Wed Jul 27 07:20:51 2005
@@ -49,6 +49,7 @@
config.setCustomAuthenticators(authenticators);
((Lifecycle) context).addLifecycleListener(config);
+ context.setDelegate(true);
return (context);
}