geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r539548 - in /geronimo/server/trunk/modules: geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/ geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ geronimo-jaxws-builder/src/main/java/org/a...
Date Fri, 18 May 2007 18:29:41 GMT
Author: dwoods
Date: Fri May 18 11:29:40 2007
New Revision: 539548

URL: http://svn.apache.org/viewvc?view=rev&rev=539548
Log:
GERONIMO-348 Change throw() to log.warn() due to EJB and other deployment failures.

Modified:
    geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?view=diff&rev=539548&r1=539547&r2=539548
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
Fri May 18 11:29:40 2007
@@ -28,6 +28,8 @@
 
 import javax.xml.namespace.QName;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -52,6 +54,7 @@
  * @version $Rev$ $Date$
  */
 public class AxisServiceRefBuilder extends AbstractNamingBuilder implements ServiceRefBuilder
{
+    private static final Log log = LogFactory.getLog(AxisServiceRefBuilder.class);
     private final QNameSet serviceRefQNameSet;
     private static final QName GER_SERVICE_REF_QNAME = GerServiceRefDocument.type.getDocumentElementName();
     private static final QNameSet GER_SERVICE_REF_QNAME_SET = QNameSet.singleton(GER_SERVICE_REF_QNAME);
@@ -82,7 +85,7 @@
         }
 
         if (serviceRefMap.size() > 0) {
-            throw new DeploymentException("Failed to build reference to service reference
"+serviceRefMap.keySet()+" defined in plan file, reason - corresponding entry in deployment
descriptor missing.");
+            log.warn("Failed to build reference to service reference "+serviceRefMap.keySet()+"
defined in plan file, reason - corresponding entry in deployment descriptor missing.");
         }
     }
 

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=539548&r1=539547&r2=539548
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Fri May 18 11:29:40 2007
@@ -157,7 +157,7 @@
         }
         
         if (refMap.size() > 0) {
-            throw new DeploymentException("Failed to build reference to Admin object reference
"+refMap.keySet()+" defined in plan file, reason - corresponding entry in deployment descriptor
missing.");
+            log.warn("Failed to build reference to Admin object reference "+refMap.keySet()+"
defined in plan file, reason - corresponding entry in deployment descriptor missing.");
         }
         
         //message-destination-refs

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=539548&r1=539547&r2=539548
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Fri May 18 11:29:40 2007
@@ -200,7 +200,7 @@
         }
 
         if (refMap.size() > 0) {
-            throw new DeploymentException("Failed to build reference to resource reference
"+refMap.keySet()+" defined in plan file, reason - corresponding entry in deployment descriptor
missing.");
+            log.warn("Failed to build reference to resource reference "+refMap.keySet()+"
defined in plan file, reason - corresponding entry in deployment descriptor missing.");
         }
     }
 

Modified: geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java?view=diff&rev=539548&r1=539547&r2=539548
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
Fri May 18 11:29:40 2007
@@ -26,6 +26,8 @@
 import javax.xml.ws.Service;
 import javax.xml.ws.handler.Handler;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -43,6 +45,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 public abstract class JAXWSServiceRefBuilder extends AbstractNamingBuilder implements ServiceRefBuilder
{
+    private static final Log log = LogFactory.getLog(JAXWSServiceRefBuilder.class);
 
     private static final QName GER_SERVICE_REF_QNAME = 
         GerServiceRefDocument.type.getDocumentElementName();
@@ -79,7 +82,7 @@
         }        
 
         if (serviceRefMap.size() > 0) {
-            throw new DeploymentException("Failed to build reference to service reference
"+serviceRefMap.keySet()+" defined in plan file, reason - corresponding entry in deployment
descriptor missing.");
+            log.warn("Failed to build reference to service reference "+serviceRefMap.keySet()+"
defined in plan file, reason - corresponding entry in deployment descriptor missing.");
         }
     }
 

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?view=diff&rev=539548&r1=539547&r2=539548
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
Fri May 18 11:29:40 2007
@@ -141,7 +141,7 @@
         }
 
         if (serviceRefMap.size() > 0) {
-            throw new DeploymentException("Failed to build reference to service reference
"+serviceRefMap.keySet()+" defined in plan file, reason - corresponding entry in deployment
descriptor missing.");
+            log.warn("Failed to build reference to service reference "+serviceRefMap.keySet()+"
defined in plan file, reason - corresponding entry in deployment descriptor missing.");
         }
     }
 



Mime
View raw message