cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r784864 - in /cxf/sandbox/geronimo-jaxws_2.2_spec: ./ src/main/java/javax/xml/ws/ src/main/java/javax/xml/ws/handler/soap/ src/main/java/javax/xml/ws/soap/ src/main/java/javax/xml/ws/spi/ src/main/java/javax/xml/ws/spi/http/ src/main/java/j...
Date Mon, 15 Jun 2009 17:04:49 GMT
Author: dkulp
Date: Mon Jun 15 17:04:48 2009
New Revision: 784864

URL: http://svn.apache.org/viewvc?rev=784864&view=rev
Log:
Bunch more minor fixes

Modified:
    cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Action.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/AsyncHandler.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Binding.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/BindingProvider.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/RespectBinding.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Response.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/WebServiceContext.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/handler/soap/SOAPHandler.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/Addressing.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/MTOM.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/SOAPBinding.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
    cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml Mon Jun 15 17:04:48 2009
@@ -106,7 +106,9 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>javax.xml.ws*;version=2.2</Export-Package>
+                        <Export-Package>javax.xml.ws*;version=2.2;-split-package:=merge-first</Export-Package>
+                        <DynamicImport-Package>org.apache.servicemix.specs.locator.*</DynamicImport-Package>
+                        <Import-Package>*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Action.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Action.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Action.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Action.java Mon Jun 15
17:04:48 2009
@@ -25,10 +25,14 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;                                                     
                 
                                                                                         
                     
+          
+/**
+ * The Action annotation allows controlling the WS-Addressing Action properties 
+ * for the input/output/fault messages                                                  
                                                
+ */
 @Documented                                                                             
                     
 @Retention(value=RetentionPolicy.RUNTIME)                                               
                     
 @Target(value=ElementType.METHOD)                                                       
                       
-                                                                                        
                     
 public @interface Action {                                                              
             
                                                                                         
                     
     public FaultAction[] fault() default {};

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/AsyncHandler.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/AsyncHandler.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/AsyncHandler.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/AsyncHandler.java Mon Jun
15 17:04:48 2009
@@ -19,7 +19,16 @@
 
 package javax.xml.ws;
 
-
+/**
+ * The AsyncHandler interface in implemented for clients that would like to
+ * receive their responses back asynchronously. 
+ * @param <T>
+ */
 public interface AsyncHandler<T> {
+    
+    /**
+     * Called when the response is available.
+     * @param response
+     */
     public abstract void handleResponse(Response<T> response);
 }

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Binding.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Binding.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Binding.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Binding.java Mon Jun 15
17:04:48 2009
@@ -24,9 +24,21 @@
 
 public interface Binding {
 
+    /**
+     * Get the BindingId of this binding instance
+     * @return
+     */
     public abstract String getBindingID();
     
+    /**
+     * Get the list of handlers that are associated with this binding instance
+     * @return
+     */
     public abstract List<Handler> getHandlerChain();
 
+    /**
+     * Set's the list of handlers for this binding instance
+     * @param list
+     */
     public abstract void setHandlerChain(List<Handler> list);
 }

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/BindingProvider.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/BindingProvider.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/BindingProvider.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/BindingProvider.java Mon
Jun 15 17:04:48 2009
@@ -27,9 +27,9 @@
     
     public abstract <T extends EndpointReference> T getEndpointReference(Class<T>
clazz);
 
-    public abstract Map<java.lang.String, java.lang.Object>      getRequestContext();
+    public abstract Map<String, Object> getRequestContext();
 
-    public abstract Map<java.lang.String, java.lang.Object>      getResponseContext();
+    public abstract Map<String, Object> getResponseContext();
 
     public abstract Binding getBinding();
 
@@ -39,4 +39,9 @@
     public static final String SESSION_MAINTAIN_PROPERTY = "javax.xml.ws.session.maintain";
     public static final String SOAPACTION_USE_PROPERTY = "javax.xml.ws.soap.http.soapaction.use";
     public static final String SOAPACTION_URI_PROPERTY = "javax.xml.ws.soap.http.soapaction.uri";
+    
+    public static final String FAULTTO_PROPERTY = "javax.xml.ws.addressing.faultto";
+    public static final String TO_PROPERTY = "javax.xml.ws.addressing.to";
+    public static final String REPLYTO_PROPERTY = "javax.xml.ws.addressing.replyto";
+    
 }

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java Mon Jun 15
17:04:48 2009
@@ -19,7 +19,11 @@
 
 package javax.xml.ws;
 
+import javax.xml.transform.Source;
 import javax.xml.ws.spi.Provider;
+
+import org.w3c.dom.Element;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
@@ -72,21 +76,21 @@
 
     public abstract boolean isPublished();
 
-    public abstract List<javax.xml.transform.Source> getMetadata();
+    public abstract List<Source> getMetadata();
 
-    public abstract void setMetadata(List<javax.xml.transform.Source> list);
+    public abstract void setMetadata(List<Source> list);
 
     public abstract Executor getExecutor();
 
     public abstract void setExecutor(Executor executor);
 
-    public abstract Map<java.lang.String, java.lang.Object> getProperties();
+    public abstract Map<String, Object> getProperties();
 
-    public abstract void setProperties(Map<java.lang.String, java.lang.Object> map);
+    public abstract void setProperties(Map<String, Object> map);
 
-    public abstract EndpointReference getEndpointReference(org.w3c.dom.Element... referenceParameters);
+    public abstract EndpointReference getEndpointReference(Element... referenceParameters);
 
-    public abstract <T extends EndpointReference> T getEndpointReference(Class<T>
clazz, org.w3c.dom.Element... referenceParameters);
+    public abstract <T extends EndpointReference> T getEndpointReference(Class<T>
clazz, Element... referenceParameters);
 
     
     /**

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/RespectBinding.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/RespectBinding.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/RespectBinding.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/RespectBinding.java Mon
Jun 15 17:04:48 2009
@@ -28,7 +28,7 @@
                                                                                         
                     
 @Documented                                                                             
                     
 @Retention(value=RetentionPolicy.RUNTIME)                                               
                     
-@Target(value=ElementType.TYPE)                                                         
                     
+@Target(value={ElementType.TYPE,ElementType.METHOD,ElementType.FIELD})                  
                                                            
 @WebServiceFeatureAnnotation(id=RespectBindingFeature.ID, bean=RespectBindingFeature.class)
                                                                                         
                   
 
 public @interface RespectBinding {                                                      
                     

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Response.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Response.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Response.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Response.java Mon Jun 15
17:04:48 2009
@@ -25,5 +25,5 @@
 public interface Response<T>
         extends Future<T> {
 
-    public abstract Map<java.lang.String, java.lang.Object> getContext();
+    public abstract Map<String, Object> getContext();
 }

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/WebServiceContext.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/WebServiceContext.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/WebServiceContext.java
(original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/WebServiceContext.java
Mon Jun 15 17:04:48 2009
@@ -20,13 +20,16 @@
 package javax.xml.ws;
 
 import javax.xml.ws.handler.MessageContext;
+
+import org.w3c.dom.Element;
+
 import java.security.Principal;
 
 public interface WebServiceContext {
 
-    public abstract EndpointReference getEndpointReference(org.w3c.dom.Element... referenceParameters);
+    public abstract EndpointReference getEndpointReference(Element... referenceParameters);
 
-    public abstract <T extends EndpointReference> T getEndpointReference(Class<T>
clazz, org.w3c.dom.Element... referenceParameters);
+    public abstract <T extends EndpointReference> T getEndpointReference(Class<T>
clazz, Element... referenceParameters);
 
     public abstract MessageContext getMessageContext();
 

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/handler/soap/SOAPHandler.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/handler/soap/SOAPHandler.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/handler/soap/SOAPHandler.java
(original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/handler/soap/SOAPHandler.java
Mon Jun 15 17:04:48 2009
@@ -19,11 +19,12 @@
 
 package javax.xml.ws.handler.soap;
 
+import javax.xml.namespace.QName;
 import javax.xml.ws.handler.Handler;
 import java.util.Set;
 
 public interface SOAPHandler<T extends SOAPMessageContext>
         extends Handler<T> {
 
-    public abstract Set<javax.xml.namespace.QName> getHeaders();
+    public abstract Set<QName> getHeaders();
 }

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/Addressing.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/Addressing.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/Addressing.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/Addressing.java Mon
Jun 15 17:04:48 2009
@@ -29,7 +29,7 @@
                                                                                         
                     
 @Documented                                                                             
                     
 @Retention(value=RetentionPolicy.RUNTIME)                                               
                     
-@Target(value=ElementType.TYPE)                                                         
                     
+@Target(value={ElementType.TYPE,ElementType.METHOD,ElementType.FIELD})                  
                                                            
 @WebServiceFeatureAnnotation(id=AddressingFeature.ID, bean=AddressingFeature.class)
                                                                                         
                     
 public @interface Addressing {

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/MTOM.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/MTOM.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/MTOM.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/MTOM.java Mon Jun
15 17:04:48 2009
@@ -28,9 +28,8 @@
                                                                                         
                     
 @Documented                                                                             
                     
 @Retention(value=RetentionPolicy.RUNTIME)                                               
                     
-@Target(value=ElementType.TYPE)                                                         
                     
+@Target(value={ElementType.TYPE,ElementType.METHOD,ElementType.FIELD})                  
                                                            
 @WebServiceFeatureAnnotation(id=MTOMFeature.ID, bean=MTOMFeature.class)
-                                                                                        
                     
 public @interface MTOM {                                                                
           
                                                                                         
                     
     public boolean enabled() default true;

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/SOAPBinding.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/SOAPBinding.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/SOAPBinding.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/soap/SOAPBinding.java Mon
Jun 15 17:04:48 2009
@@ -27,9 +27,9 @@
 public interface SOAPBinding
         extends Binding {
 
-    public abstract Set<java.lang.String> getRoles();
+    public abstract Set<String> getRoles();
 
-    public abstract void setRoles(Set<java.lang.String> set);
+    public abstract void setRoles(Set<String> set);
 
     public abstract boolean isMTOMEnabled();
 

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
(original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
Mon Jun 15 17:04:48 2009
@@ -169,6 +169,18 @@
                     
                     ClassLoader classLoader = findClassLoader();
                     
+                    try {
+                        //If we are deployed into an OSGi environment, leverage it
+                        Class<?> cls = Class.forName("org.apache.servicemix.specs.locator.OsgiLocator");
+                        Method m = cls.getMethod("locate", new Class[] {String.class});
+                        Class<?> spiClass = (Class)m.invoke(null, iFactoryId);
+                        if (spiClass != null) {
+                            return spiClass.newInstance();
+                        }
+                    } catch (Throwable e) {
+                        //ignore
+                    }
+			
                     // Use the system property first
                     try {
                         String systemProp =

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
(original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
Mon Jun 15 17:04:48 2009
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 /**
+ * 
  * @since 2.2
  */
 public abstract class HttpContext {
@@ -31,7 +32,6 @@
     }
     
     public abstract Object getAttribute(String name);
-    
     public abstract Set<String> getAttributeNames(); 
     public abstract String  getPath(); 
     

Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java?rev=784864&r1=784863&r2=784864&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
(original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
Mon Jun 15 17:04:48 2009
@@ -28,6 +28,10 @@
 import java.util.List;
 import java.util.Map;
 
+
+/**
+ * Utility class to build W3CEndpointReference instances.  
+ */
 public final class W3CEndpointReferenceBuilder {
     private String address;
     private QName serviceName;



Mime
View raw message