geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1341511 - in /geronimo/server/trunk/plugins: axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/ jetty8/...
Date Tue, 22 May 2012 15:05:05 GMT
Author: xuhaihong
Date: Tue May 22 15:05:04 2012
New Revision: 1341511

URL: http://svn.apache.org/viewvc?rev=1341511&view=rev
Log:
Merge changes from GERONIMO-6341 orm.xml does not take effect in latest Geronimo 3.0 beta
branch.

Modified:
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
    geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
(original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
Tue May 22 15:05:04 2012
@@ -327,7 +327,13 @@ public class AxisServiceGenerator
         if (wsdlFile == null) {
             return null;
         }
-        URL wsdlURL = BundleUtils.getEntry(bundle, wsdlFile);
+        URL wsdlURL;
+        try {
+            wsdlURL = BundleUtils.getEntry(bundle, wsdlFile);
+        } catch (MalformedURLException e) {
+            log.warn("MalformedURLException when getting entry:" + wsdlFile + " from bundle
" + bundle.getSymbolicName(), e);
+            wsdlURL = null;
+        }
         if (wsdlURL == null) {
             wsdlURL = bundle.getResource(wsdlFile);
             if (wsdlURL == null) {

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
(original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
Tue May 22 15:05:04 2012
@@ -45,9 +45,13 @@ import org.apache.geronimo.jaxws.annotat
 import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
 import org.apache.xbean.osgi.bundle.util.BundleUtils;
 import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class CXFEndpoint {
 
+    private static final Logger log = LoggerFactory.getLogger(CXFEndpoint.class);
+
     protected Bus bus;
 
     protected Object implementor;
@@ -88,7 +92,11 @@ public abstract class CXFEndpoint {
             // Not a URL, try as a resource
             wsdlURL = bundle.getResource("/" + wsdlFile);
             if (wsdlURL == null) {
-                wsdlURL = BundleUtils.getEntry(bundle, wsdlFile);
+                 try {
+                    wsdlURL = BundleUtils.getEntry(bundle, wsdlFile);
+                } catch (MalformedURLException e1) {
+                    log.warn("MalformedURLException when getting entry:" + wsdlFile + " from
bundle " + bundle.getSymbolicName(), e);
+                }
             }
         }
         return wsdlURL;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
Tue May 22 15:05:04 2012
@@ -106,7 +106,12 @@ public abstract class JAXWSServiceRefere
             if (wsdlURL == null) {
                 wsdlURL = bundle.getResource(this.wsdlURI.toString());
                 if (wsdlURL == null) {
-                    wsdlURL = BundleUtils.getEntry(bundle, wsdlURI.toString());
+                    try {
+                        wsdlURL = BundleUtils.getEntry(bundle, wsdlURI.toString());
+                    } catch (MalformedURLException e) {
+                        LOG.warn("MalformedURLException when getting entry:" + wsdlURI +
" from bundle " + bundle.getSymbolicName(), e);
+                        wsdlURL = null;
+                    }
                 }
                 if (wsdlURL == null) {
                     LOG.warn("Failed to obtain WSDL: " + this.wsdlURI);

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
Tue May 22 15:05:04 2012
@@ -20,6 +20,7 @@ package org.apache.geronimo.jetty8.deplo
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.Collection;
@@ -165,9 +166,8 @@ public class JettyModuleBuilder extends 
         super(kernel, serviceBuilders, namingBuilders, resourceEnvironmentSetter, webServiceBuilder,
moduleBuilderExtensions, bundleContext);
         this.defaultEnvironment = defaultEnvironment;
         this.defaultSessionTimeoutMinutes = (defaultSessionTimeoutSeconds == null) ? 30 *
60 : defaultSessionTimeoutSeconds;
-        this.jettyContainerObjectName = jettyContainerName;        
+        this.jettyContainerObjectName = jettyContainerName;
         this.webAppInfoFactory = new StandardWebAppInfoFactory(defaultWebApp, null);
-
         this.clusteringBuilders = new NamespaceDrivenBuilderCollection(clusteringBuilders);//,
GerClusteringDocument.type.getDocumentElementName());
     }
 
@@ -181,7 +181,7 @@ public class JettyModuleBuilder extends 
         XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
         kernel.getLifecycleMonitor().removeLifecycleListener(jspServletInfoProviderListener);
         //TODO not yet implemented
-        // SchemaConversionUtils.unregisterNamespaceConversions(GERONIMO_SCHEMA_CONVERSIONS);
+//        SchemaConversionUtils.unregisterNamespaceConversions(GERONIMO_SCHEMA_CONVERSIONS);
     }
 
     public void doFail() {
@@ -201,7 +201,14 @@ public class JettyModuleBuilder extends 
         String specDD = null;
         WebApp webApp = null;
 
-        URL specDDUrl = BundleUtils.getEntry(bundle, "WEB-INF/web.xml");
+        URL specDDUrl;
+        try {
+            specDDUrl = BundleUtils.getEntry(bundle, "WEB-INF/web.xml");
+        } catch (MalformedURLException e) {
+            log.warn("MalformedURLException when getting entry:" + "WEB-INF/web.xml" + "
from bundle " + bundle.getSymbolicName(), e);
+            specDDUrl = null;
+        }
+        
         if (specDDUrl == null) {
             webApp = new WebApp();
         } else {
@@ -486,7 +493,7 @@ public class JettyModuleBuilder extends 
 
             //TODO merge from default web app
             if (webAppInfo.sessionConfig != null) {
-                if (webAppInfo.sessionConfig.sessionTimeoutMinutes == -1 && defaultSessionTimeoutMinutes
!= -1) {
+                if (webAppInfo.sessionConfig.sessionTimeoutMinutes == null && defaultSessionTimeoutMinutes
!= -1) {
                     webAppInfo.sessionConfig.sessionTimeoutMinutes = defaultSessionTimeoutMinutes;
                 }
             }

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
Tue May 22 15:05:04 2012
@@ -379,7 +379,13 @@ public class GeronimoWebAppContext exten
 
     private Resource lookupResource(String uriInContext) {
         Bundle bundle = integrationContext.getBundle();
-        URL url = BundleUtils.getEntry(bundle, uriInContext);
+        URL url;
+        try {
+            url = BundleUtils.getEntry(bundle, uriInContext);
+        } catch (MalformedURLException e) {
+            logger.warn("MalformedURLException when getting entry:" + uriInContext + " from
bundle " + bundle.getSymbolicName(), e);
+            url = null;
+        }
         if (url == null) {
             url = bundle.getResource("META-INF/resources" + uriInContext);
             if (url == null) {

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Tue May 22 15:05:04 2012
@@ -212,7 +212,13 @@ public class TomcatModuleBuilder extends
         String specDD = null;
         WebApp webApp = null;
 
-        URL specDDUrl = BundleUtils.getEntry(bundle, "WEB-INF/web.xml");
+        URL specDDUrl;
+        try {
+            specDDUrl = BundleUtils.getEntry(bundle, "WEB-INF/web.xml");
+        } catch (MalformedURLException e) {
+            log.warn("MalformedURLException when getting entry:" + "WEB-INF/web.xml" + "
from bundle " + bundle.getSymbolicName(), e);
+            specDDUrl = null;
+        }
         if (specDDUrl == null) {
             webApp = new WebApp();
         } else {

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java?rev=1341511&r1=1341510&r2=1341511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
Tue May 22 15:05:04 2012
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -233,7 +234,13 @@ public class BundleDirContext extends Ba
     @Override
     protected Attributes doGetAttributes(String name, String[] attrIds) throws NamingException
{
         name = getName(name);
-        URL url = BundleUtils.getEntry(bundle, name);
+        URL url;
+        try {
+            url = BundleUtils.getEntry(bundle, name);
+        } catch (MalformedURLException e) {
+            logger.warn("MalformedURLException when getting entry:" + name + " from bundle
" + bundle.getSymbolicName(), e);
+            url = null;
+        }
         if (url == null) {
             return null;
         }
@@ -264,7 +271,13 @@ public class BundleDirContext extends Ba
     @Override
     protected Object doLookup(String name) {
         name = getName(name);
-        URL url = BundleUtils.getEntry(bundle, name);
+        URL url;
+        try {
+            url = BundleUtils.getEntry(bundle, name);
+        } catch (MalformedURLException e) {
+            logger.warn("MalformedURLException when getting entry:" + name + " from bundle
" + bundle.getSymbolicName(), e);
+            url = null;
+        }
         if (url == null) {
             return null;
         }



Mime
View raw message