Author: dkulp
Date: Tue Sep 16 06:36:47 2008
New Revision: 695876
URL: http://svn.apache.org/viewvc?rev=695876&view=rev
Log:
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 16 06:36:47 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=695876&r1=695875&r2=695876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
Tue Sep 16 06:36:47 2008
@@ -48,10 +48,10 @@
import org.apache.cxf.service.model.ServiceInfo;
/**
-* 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;
@@ -64,20 +64,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;
}
@@ -105,10 +105,11 @@
}
/**
- * Creates a JAX-WS proxy that can be used to make remote invocations.
- *
- * @return the proxy. You must cast the returned object to the
approriate class before making remote calls
- */
+ * Creates a JAX-WS proxy that can be used to make remote invocations.
+ *
+ * @return the proxy. You must cast the returned object to the approriate
class
+ * before making remote calls
+ */
@Override
public Object create() {
Object obj = super.create();
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=695876&r1=695875&r2=695876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
Tue Sep 16 06:36:47 2008
@@ -398,10 +398,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.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=695876&r1=695875&r2=695876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
Tue Sep 16 06:36:47 2008
@@ -72,10 +72,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>();
@@ -152,10 +152,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);
}
@@ -173,11 +173,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);
}
@@ -187,11 +187,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);
}
@@ -205,20 +205,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);
}
@@ -265,21 +265,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.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=695876&r1=695875&r2=695876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
Tue Sep 16 06:36:47 2008
@@ -227,22 +227,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;
}
@@ -260,11 +260,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;
}
@@ -286,12 +286,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.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=695876&r1=695875&r2=695876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Tue Sep 16 06:36:47 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] : "";
