[jboss-cvs] JBossAS SVN: r79966 - in projects/ejb3/trunk/core: src/main/java/org/jboss/injection and 1 other directory.

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

Author: wolfc
Date: 2008-10-23 05:42:30 -0400 (Thu, 23 Oct 2008)
New Revision: 79966

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextProxy.java
Log:
EJBTHREE-1536: reverted and added dependencies on jaxws 2.1.1

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-10-23 09:34:22 UTC (rev 79965)
+++ projects/ejb3/trunk/core/pom.xml	2008-10-23 09:42:30 UTC (rev 79966)
@@ -42,6 +42,7 @@
 
   <properties>
     <version.org.jboss.jboss-as>5.0.0.CR2</version.org.jboss.jboss-as>
+    <version.sun-jaxws>2.1.1</version.sun-jaxws>
   </properties>
 
   <!-- Build Information -->
@@ -174,6 +175,10 @@
       <artifactId>jboss-metadata</artifactId>
       <exclusions>
         <exclusion>
+          <groupId>jboss.jbossws</groupId>
+          <artifactId>jboss-jaxws</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.javaee</groupId>
           <artifactId>jboss-javaee</artifactId>
         </exclusion>
@@ -537,6 +542,10 @@
           <groupId>org.jboss.jbossas</groupId>
           <artifactId>jboss-as-security</artifactId>
         </exclusion>        
+        <exclusion>
+          <groupId>org.jboss.ws.native</groupId>
+          <artifactId>jbossws-native-jaxws</artifactId>
+        </exclusion>
       </exclusions>      
       <scope>provided</scope>
     </dependency>
@@ -581,6 +590,18 @@
     </dependency>
     
     <dependency>
+      <groupId>sun-jaxws</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <version>${version.sun-jaxws}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>sun-jaxws</groupId>
+      <artifactId>jsr181-api</artifactId>
+      <version>${version.sun-jaxws}</version>
+    </dependency>
+
+    <dependency>
       <groupId>trove</groupId>
       <artifactId>trove</artifactId>
     </dependency>

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextProxy.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextProxy.java	2008-10-23 09:34:22 UTC (rev 79965)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextProxy.java	2008-10-23 09:42:30 UTC (rev 79966)
@@ -21,10 +21,13 @@
  */
 package org.jboss.injection;
 
-import java.security.Principal;
+import org.w3c.dom.Element;
 
+import javax.xml.ws.EndpointReference;
 import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.handler.MessageContext;
+import java.security.Principal;
 
 /**
  * WebServiceContext proxy that delegates to a ThreadLocal.
@@ -59,18 +62,16 @@
       return delegate().isUserInRole(string);
    }
 
-   // These are no longer in the WebServiceContext API?
-   // EJBTHREE-1536
-//   public EndpointReference getEndpointReference(Element... elements)
-//   {
-//      return delegate().getEndpointReference(elements);
-//   }
-//
-//   public <T extends EndpointReference> T getEndpointReference(Class<T> aClass, Element... elements)
-//   {
-//      return delegate().getEndpointReference(aClass, elements);
-//   }
+   public EndpointReference getEndpointReference(Element... elements)
+   {
+      return delegate().getEndpointReference(elements);
+   }
 
+   public <T extends EndpointReference> T getEndpointReference(Class<T> aClass, Element... elements)
+   {
+      return delegate().getEndpointReference(aClass, elements);
+   }
+
    private WebServiceContext delegate()
    {
       return (msgContextAssoc.get() != null) ? msgContextAssoc.get() : NOOP;
@@ -78,7 +79,7 @@
 
    private static final class DefaultDelagate implements WebServiceContext
    {
-      private final RuntimeException EX = new IllegalStateException("WebServiceContext not available");
+      private final RuntimeException EX = new WebServiceException("WebServiceContext not available");
 
       public MessageContext getMessageContext()
       {
@@ -95,16 +96,14 @@
          throw EX;
       }
 
-      // These are no longer in the WebServiceContext API?
-      // EJBTHREE-1536
-//      public EndpointReference getEndpointReference(Element... elements)
-//      {
-//         throw EX;
-//      }
-//
-//      public <T extends EndpointReference> T getEndpointReference(Class<T> aClass, Element... elements)
-//      {
-//         throw EX;
-//      }
+      public EndpointReference getEndpointReference(Element... elements)
+      {
+         throw EX;
+      }
+
+      public <T extends EndpointReference> T getEndpointReference(Class<T> aClass, Element... elements)
+      {
+         throw EX;
+      }
    }
 }