[jboss-cvs] JBossAS SVN: r61270 - in trunk: ejb3/src/main/org/jboss/injection and 2 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2007-03-11 06:59:47 -0400 (Sun, 11 Mar 2007)
New Revision: 61270

Modified:
   trunk/build/build-thirdparty.xml
   trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
   trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
   trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
Log:
Use untyped Object instead of AnnotatedElement for jdk14 compatibility

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-03-11 10:28:34 UTC (rev 61269)
+++ trunk/build/build-thirdparty.xml	2007-03-11 10:59:47 UTC (rev 61270)
@@ -92,7 +92,7 @@
       <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
       <componentref name="jboss/jaxr" version="1.2.0.GA"/>
       <componentref name="jboss/jbossxb" version="2.0.0.CR1"/>
-      <componentref name="jboss/jbossws" version="2.0.0.CR5"/>
+      <componentref name="jboss/jbossws" version="1.2.0.SP1"/>
       <componentref name="jboss/jbossws-wsconsume-impl" version="2.0.0"/>
       <componentref name="jboss/messaging" version="1.2.0.CR1"/>
       <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/>

Modified: trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-03-11 10:28:34 UTC (rev 61269)
+++ trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-03-11 10:59:47 UTC (rev 61270)
@@ -144,8 +144,7 @@
       {
          log.debug("No override for @WebServiceRef.name: " + name);
          sref = new ServiceRefDelegate().newServiceRefMetaData();
-         if (sref != null)
-            sref.setServiceRefName(name);
+         sref.setServiceRefName(name);
       }
       return sref;
    }

Modified: trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2007-03-11 10:28:34 UTC (rev 61269)
+++ trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2007-03-11 10:59:47 UTC (rev 61270)
@@ -1115,11 +1115,8 @@
          if (ServiceRefObjectFactory.isJ2EE14Descriptor(serviceRef))
          {
             ServiceRefMetaData sref = new ServiceRefDelegate().newServiceRefMetaData();
-            if (sref != null)
-            {
-               sref.importStandardXml(serviceRef);
-               serviceRefs.put(sref.getServiceRefName(), sref);
-            }
+            sref.importStandardXml(serviceRef);
+            serviceRefs.put(sref.getServiceRefName(), sref);
          }
       }
 

Modified: trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2007-03-11 10:28:34 UTC (rev 61269)
+++ trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2007-03-11 10:59:47 UTC (rev 61270)
@@ -179,11 +179,8 @@
          if (ServiceRefObjectFactory.isJ2EE14Descriptor(serviceRef))
          {
             ServiceRefMetaData sref = new ServiceRefDelegate().newServiceRefMetaData();
-            if (sref != null)
-            {
-               sref.importStandardXml(serviceRef);
-               serviceRefs.put(sref.getServiceRefName(), sref);
-            }
+            sref.importStandardXml(serviceRef);
+            serviceRefs.put(sref.getServiceRefName(), sref);
          }
       }
 
@@ -275,11 +272,8 @@
          {
             log.warn("service-ref " + serviceRefName + " found in jboss-web.xml but not in web.xml");
             sref = new ServiceRefDelegate().newServiceRefMetaData();
-            if (sref != null)
-            {
-               sref.setServiceRefName(serviceRefName);
-               serviceRefs.put(serviceRefName, sref);
-            }
+            sref.setServiceRefName(serviceRefName);
+            serviceRefs.put(serviceRefName, sref);
          }
          sref.importJBossXml(serviceRef);
       }

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-03-11 10:28:34 UTC (rev 61269)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-03-11 10:59:47 UTC (rev 61270)
@@ -1338,11 +1338,8 @@
          {
             log.warn("service-ref " + serviceRefName + " found in jboss-web.xml but not in web.xml");
             sref = new ServiceRefDelegate().newServiceRefMetaData();
-            if (sref != null)
-            {
-               sref.setServiceRefName(serviceRefName);
-               serviceRefs.put(serviceRefName, sref);
-            }
+            sref.setServiceRefName(serviceRefName);
+            serviceRefs.put(serviceRefName, sref);
          }
          sref.importJBossXml(refElement);
       }

Modified: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-03-11 10:28:34 UTC (rev 61269)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-03-11 10:59:47 UTC (rev 61270)
@@ -37,6 +37,7 @@
 import org.jboss.ws.integration.ServiceRefMetaData;
 import org.jboss.ws.integration.UnifiedVirtualFile;
 import org.jboss.xb.binding.UnmarshallingContext;
+import org.w3c.dom.Element;
 import org.xml.sax.Attributes;
 
 /**
@@ -77,9 +78,11 @@
 
    public ServiceRefMetaData newServiceRefMetaData()
    {
-      ServiceRefMetaData sref = null;
+      ServiceRefMetaData sref;
       if (delegate != null)
          sref = delegate.newServiceRefMetaData();
+      else
+         sref = new DummyServiceRef();
       return sref;
    }
 
@@ -102,4 +105,58 @@
       if (delegate != null)
          delegate.bindServiceRef(encCtx, encName, vfsRoot, sref);
    }
+
+   public static class DummyServiceRef extends ServiceRefMetaData
+   {
+      private String refName;
+
+      @Override
+      public void setServiceRefName(String name)
+      {
+         this.refName = name;
+      }
+
+      @Override
+      public String getServiceRefName()
+      {
+         return refName;
+      }
+
+      @Override
+      public Object getAnnotatedElement()
+      {
+         return null;
+      }
+
+      @Override
+      public void setAnnotatedElement(Object anElement)
+      {
+      }
+
+      @Override
+      public void importJBossXml(Element element)
+      {
+      }
+
+      @Override
+      public void importStandardXml(Element element)
+      {
+      }
+
+      @Override
+      public boolean isProcessed()
+      {
+         return false;
+      }
+
+      @Override
+      public void setProcessed(boolean flag)
+      {
+      }
+
+      @Override
+      public void merge(ServiceRefMetaData serviceRef)
+      {
+      }
+   }
 }