[Jboss-cvs] JBossAS SVN: r56963 - in trunk/server/src/main/org/jboss: metadata webservice/metadata/serviceref

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-09-19 07:26:25 -0400 (Tue, 19 Sep 2006)
New Revision: 56963

Modified:
   trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
   trunk/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
Log:
Relax the requirement that service-ref must appear in application-client.xml

Modified: trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2006-09-19 11:21:55 UTC (rev 56962)
+++ trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2006-09-19 11:26:25 UTC (rev 56963)
@@ -23,6 +23,7 @@
 
 // $Id$
 
+import org.jboss.logging.Logger;
 import org.jboss.deployment.DeploymentException;
 import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
 import org.w3c.dom.Element;
@@ -40,6 +41,9 @@
  */
 public class ClientMetaData
 {
+   // provide logging
+   private static Logger log = Logger.getLogger(ClientMetaData.class);
+
    /** The application-client/display-name */
    private String displayName;
    /** The location for the server side client context ENC bindings */
@@ -266,8 +270,10 @@
          ServiceRefMetaData refMetaData = (ServiceRefMetaData)serviceReferences.get(serviceRefName);
          if (refMetaData == null)
          {
-            throw new DeploymentException("service-ref " + serviceRefName
-               + " found in jboss-client.xml but not in application-client.xml");
+            // J2EE5 allows service-ref overrides in jboss-client.xml without corresponding elements in application-client.xml
+            log.warn("service-ref " + serviceRefName + " found in jboss-client.xml but not in application-client.xml");
+            refMetaData = new ServiceRefMetaData(serviceRefName);  
+            serviceReferences.put(serviceRefName, refMetaData);
          }
          refMetaData.importJBossXml(serviceRef);
       }

Modified: trunk/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java	2006-09-19 11:21:55 UTC (rev 56962)
+++ trunk/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java	2006-09-19 11:26:25 UTC (rev 56963)
@@ -85,6 +85,13 @@
    {
    }
 
+   /** Constructor with a given service ref name
+    */
+   public ServiceRefMetaData(String serviceRefName)
+   {
+      this.serviceRefName = serviceRefName;
+   }
+
    /** Constructor with a given resource classloader, used on the server side
     */
    public ServiceRefMetaData(URLClassLoader resourceCl)