cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r695962 - in /cxf/branches/2.0.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/
Date Tue, 16 Sep 2008 16:17:33 GMT
Author: dkulp
Date: Tue Sep 16 09:17:30 2008
New Revision: 695962

URL: http://svn.apache.org/viewvc?rev=695962&view=rev
Log:
Merged revisions 695876 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r695876 | dkulp | 2008-09-16 09:36:47 -0400 (Tue, 16 Sep 2008) | 9 lines
  
  Merged revisions 695684 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r695684 | dkulp | 2008-09-15 19:09:47 -0400 (Mon, 15 Sep 2008) | 2 lines
    
    Fix formatting of javadoc comments.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
    cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
    cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 16 09:17:30 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695876
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=695962&r1=695961&r2=695962&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
Tue Sep 16 09:17:30 2008
@@ -39,10 +39,10 @@
 import org.apache.cxf.resource.ResourceResolver;
 
 /**
-* Factory for creating JAX-WS proxies, This class provides access to the 
-* internal properties used to set-up proxies. Using it provides more control 
-* than the standard JAX-WS APIs.
-*/
+ * Factory for creating JAX-WS proxies, This class provides access to the 
+ * internal properties used to set-up proxies. Using it provides more control 
+ * than the standard JAX-WS APIs.
+ */
 public class JaxWsProxyFactoryBean extends ClientProxyFactoryBean {
     List<Handler> handlers = new ArrayList<Handler>();
     boolean loadHandlers = true;
@@ -55,20 +55,20 @@
     }
 
     /**
-          * Specifies a list of JAX-WS Handler implementations that are to be 
-          * used by the proxy.
-          * 
-          * @param h a <code>List</code> of <code>Handler</code>
objects
-          */
+     * Specifies a list of JAX-WS Handler implementations that are to be 
+     * used by the proxy.
+     * 
+     * @param h a <code>List</code> of <code>Handler</code> objects
+     */
     public void setHandlers(List<Handler> h) {
         handlers.clear();
         handlers.addAll(h);
     }
     /**
-           * Returns the configured list of JAX-WS handlers for the proxy.
-           *
-           * @return a <code>List</code> of <code>Handler</code>
objects
-           */
+     * Returns the configured list of JAX-WS handlers for the proxy.
+     *
+     * @return a <code>List</code> of <code>Handler</code> objects
+     */
     public List<Handler> getHandlers() {
         return handlers;
     }

Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=695962&r1=695961&r2=695962&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
Tue Sep 16 09:17:30 2008
@@ -357,10 +357,10 @@
     }
 
     /**
-          * Specifies the class implementing the service.
-          *
-          * @param serviceClass the service's implementaiton class
-          */
+     * Specifies the class implementing the service.
+     *
+     * @param serviceClass the service's implementaiton class
+     */
     public void setServiceClass(Class serviceClass) {
         this.serviceClass = serviceClass;
     }

Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=695962&r1=695961&r2=695962&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
Tue Sep 16 09:17:30 2008
@@ -67,10 +67,10 @@
     }
 
     /**
-           * Creates a proxy object that can be used to make remote invocations.
-           *
-           * @return the proxy. You must cast the returned object to the appropriate class
before using it.
-           */
+     * Creates a proxy object that can be used to make remote invocations.
+     *
+     * @return the proxy. You must cast the returned object to the appropriate class before
using it.
+     */
     public Object create() {
         if (properties == null) {
             properties = new HashMap<String, Object>();
@@ -147,10 +147,10 @@
     }
 
     /**
-           * Specifies the class representing the SEI the proxy implements.
-           *
-           * @param serviceClass the SEI's class
-           */
+     * Specifies the class representing the SEI the proxy implements.
+     *
+     * @param serviceClass the SEI's class
+     */
     public void setServiceClass(Class serviceClass) {
         clientFactoryBean.setServiceClass(serviceClass);
     }
@@ -168,11 +168,11 @@
     }
     
     /**
-          * Specifies the URL where the proxy can find the WSDL defining the 
-          * service the proxy implements.
-          *
-          * @param wsdlURL a string containing the WSDL's URL
-          */
+     * Specifies the URL where the proxy can find the WSDL defining the 
+     * service the proxy implements.
+     *
+     * @param wsdlURL a string containing the WSDL's URL
+     */
     public void setWsdlLocation(String wsdlURL) {
         setWsdlURL(wsdlURL);
     }
@@ -182,11 +182,11 @@
     }
 
     /**
-          * Specifies the URL where the proxy can find the WSDL defining the 
-          * service the proxy implements.
-          *
-          * @param wsdlURL a string containing the WSDL's URL
-          */
+     * Specifies the URL where the proxy can find the WSDL defining the 
+     * service the proxy implements.
+     *
+     * @param wsdlURL a string containing the WSDL's URL
+     */
     public void setWsdlURL(String wsdlURL) {
         clientFactoryBean.getServiceFactory().setWsdlURL(wsdlURL);
     }
@@ -200,20 +200,20 @@
     }
 
     /**
-           * Returns the QName of the WSDL service the proxy implements
-           * 
-           * @return the WSDL service's QName
-           */
+     * Returns the QName of the WSDL service the proxy implements
+     * 
+     * @return the WSDL service's QName
+     */
     public QName getServiceName() {
         return getServiceFactory().getServiceQName();
     }
 
     /**
-           * Specifies the QName of the WSDL service the proxy implements. The 
-           * service must exist or an error will result.
-           *
-           * @param serviceName the QName of the service for the proxy
-           */
+     * Specifies the QName of the WSDL service the proxy implements. The 
+     * service must exist or an error will result.
+     *
+     * @param serviceName the QName of the service for the proxy
+     */
     public void setServiceName(QName serviceName) {
         getServiceFactory().setServiceName(serviceName);
     }
@@ -260,21 +260,21 @@
     }
 
     /**
-          * Returns the property map for the proxy factory.
-          *
-          * @return the property map
-          */
+     * Returns the property map for the proxy factory.
+     *
+     * @return the property map
+     */
     public Map<String, Object> getProperties() {
         return properties;
     }
 
     /**
-           * Specifies a set of properties used to configure the proxies 
-           * provided by the factory. These properties include things like 
-           * adding a namespace map to the JAXB databinding.
-           *
-           * @param properties the property map
-           */
+     * Specifies a set of properties used to configure the proxies 
+     * provided by the factory. These properties include things like 
+     * adding a namespace map to the JAXB databinding.
+     *
+     * @param properties the property map
+     */
     public void setProperties(Map<String, Object> properties) {
         this.properties = properties;
     }

Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=695962&r1=695961&r2=695962&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
Tue Sep 16 09:17:30 2008
@@ -219,22 +219,22 @@
     }
 
     /**
-           * Whether or not the Server should be started upon creation.
-           *
-          * @return <code>false</code> if the server should not be started upon
creation
-          */
+     * Whether or not the Server should be started upon creation.
+     *
+     * @return <code>false</code> if the server should not be started upon creation
+     */
     public boolean isStart() {
         return start;
     }
 
     /**
-           * Specifies if the Server should be started upon creation. The 
-           * default is for Servers to be started upon creation. Passing 
-           * <code>false</code> tells the factory that the Server will be 
-           * started manually using the start method.
-           *
-           * @param start <code>false</code> specifies that the Server will not
be started upon creation
-           */
+     * Specifies if the Server should be started upon creation. The 
+     * default is for Servers to be started upon creation. Passing 
+     * <code>false</code> tells the factory that the Server will be 
+     * started manually using the start method.
+     *
+     * @param start <code>false</code> specifies that the Server will not be
started upon creation
+     */
     public void setStart(boolean start) {
         this.start = start;
     }
@@ -252,11 +252,11 @@
     }
 
     /**
-           * Sets the bean implementing the service. If this is set a 
-           * <code>BeanInvoker</code> is created for the provided bean.
-          *
-          * @param serviceBean an instantiated implementaiton object
-          */
+     * Sets the bean implementing the service. If this is set a 
+     * <code>BeanInvoker</code> is created for the provided bean.
+     *
+     * @param serviceBean an instantiated implementaiton object
+     */
     public void setServiceBean(Object serviceBean) {
         this.serviceBean = serviceBean;
     }
@@ -278,12 +278,12 @@
     }
 
     /**
-          * Specifies the location of the WSDL defining the service interface 
-          * used by the factory to create services. Typically, the WSDL 
-          * location is specified as a URL.
-          * 
-          * @param locaiton the URL of the WSDL defining the service interface
-          */          
+     * Specifies the location of the WSDL defining the service interface 
+     * used by the factory to create services. Typically, the WSDL 
+     * location is specified as a URL.
+     * 
+     * @param locaiton the URL of the WSDL defining the service interface
+     */          
     public void setWsdlLocation(String location) {
         setWsdlURL(location);
     }

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=695962&r1=695961&r2=695962&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Tue Sep 16 09:17:30 2008
@@ -133,7 +133,7 @@
                 try {
                     String authDecoded = new String(Base64Utility.decode(authEncoded));
                     String authInfo[] = authDecoded.split(":");
-                    String username = authInfo[0];
+                    String username = (authInfo.length > 0) ? authInfo[0] : "";
                     // Below line for systems that blank out password after authentication;
                     // see CXF-1495 for more info
                     String password = (authInfo.length > 1) ? authInfo[1] : "";



Mime
View raw message