svn commit: r928643 - in /axis/axis2/java/core/trunk/modules: jaxbri/pom.xml jibx/pom.xml kernel/pom.xml samples/pom.xml soapmonitor/module/pom.xml soapmonitor/servlet/pom.xml spring/pom.xml
Author: veithen Date: Mon Mar 29 08:45:04 2010 New Revision: 928643 URL: http://svn.apache.org/viewvc?rev=928643&view=rev Log: Fixed some project.description entries in POM files. Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml axis/axis2/java/core/trunk/modules/jibx/pom.xml axis/axis2/java/core/trunk/modules/kernel/pom.xml axis/axis2/java/core/trunk/modules/samples/pom.xml axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml axis/axis2/java/core/trunk/modules/spring/pom.xml Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Mon Mar 29 08:45:04 2010 @@ -30,7 +30,7 @@ axis2-jaxbri Apache Axis2 - JAXB-RI Data Binding -JAXB-RI data binding support for Axis 2.0 +JAXB-RI data binding support for Axis2 org.apache.axis2 Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Mon Mar 29 08:45:04 2010 @@ -30,7 +30,7 @@ axis2-jibx Apache Axis2 - JiBX Data Binding -JiBX data binding support for Axis 2.0 +JiBX data binding support for Axis2 org.apache.axis2 Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Mon Mar 29 08:45:04 2010 @@ -30,7 +30,7 @@ axis2-kernel Apache Axis2 - Kernel -Core Parts of Axis 2.0. This includes Axis 2.0 engine, Client API, Addressing support, etc., +Core Parts of Axis2. This includes Axis2 engine, Client API, Addressing support, etc., Modified: axis/axis2/java/core/trunk/modules/samples/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/samples/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/pom.xml Mon Mar 29 08:45:04 2010 @@ -30,8 +30,7 @@ axis2-samples Apache Axis2 - Samples -Core Parts of Axis 2.0. This includes Axis 2.0 engine, Client API, Addressing support, etc., - +Axis2 samples javax.servlet Modified: axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml Mon Mar 29 08:45:04 2010 @@ -31,7 +31,7 @@ soapmonitor mar Apache Axis2 - SOAP Monitor Module -soapmonitor module for Axis 2.0 +soapmonitor module for Axis2 org.apache.axis2 Modified: axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml Mon Mar 29 08:45:04 2010 @@ -31,7 +31,7 @@ soapmonitor-servlet jar Apache Axis2 - SOAP Monitor Servlet -soapmonitor servlet for Axis 2.0 +soapmonitor servlet for Axis2 javax.servlet Modified: axis/axis2/java/core/trunk/modules/spring/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/spring/pom.xml?rev=928643&r1=928642&r2=928643&view=diff == --- axis/axis2/java/core/trunk/modules/spring/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/spring/pom.xml Mon Mar 29 08:45:04 2010 @@ -30,7 +30,7 @@ axis2-spring Apache Axis2 - spring -spr
svn commit: r928727 - in /axis/axis2/java/core/scratch/java/veithen/spring: ./ axis2-spring-core/ axis2-spring-core/src/ axis2-spring-core/src/main/ axis2-spring-core/src/main/java/ axis2-spring-core/
Author: veithen
Date: Mon Mar 29 11:44:48 2010
New Revision: 928727
URL: http://svn.apache.org/viewvc?rev=928727&view=rev
Log:
AXIS2-4662: Added some Spring related PoC code to my scratch area.
Added:
axis/axis2/java/core/scratch/java/veithen/spring/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationFactory.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationParser.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/Constants.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportInDescriptionFactory.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportReceiverParser.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/META-INF/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/META-INF/spring.handlers
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/META-INF/spring.schemas
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/spring-axis2.xsd
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/DummyTransportListener.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/MultiConfigurationTest.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/multi_configuration.xml
(with props)
Added:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml?rev=928727&view=auto
==
--- axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml
(added)
+++ axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml
Mon Mar 29 11:44:48 2010
@@ -0,0 +1,86 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.axis2
+axis2-parent
+SNAPSHOT
+
+
+axis2-spring-core
+Apache Axis2 - Spring - Core
+Spring support for Axis2
+
+
+org.apache.axis2
+axis2-kernel
+${project.version}
+
+
+org.springframework
+spring-core
+
+
svn commit: r928797 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi: Provider.java ServiceDelegate.java
Author: nagy
Date: Mon Mar 29 14:55:09 2010
New Revision: 928797
URL: http://svn.apache.org/viewvc?rev=928797&view=rev
Log:
Added method signatures to support JAX-WS 2.2 changes.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java?rev=928797&r1=928796&r2=928797&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
Mon Mar 29 14:55:09 2010
@@ -46,8 +46,12 @@ public class Provider extends javax.xml.
private static final Element[] ZERO_LENGTH_ARRAY = new Element[0];
-@Override
+ @Override
public Endpoint createAndPublishEndpoint(String s, Object obj) {
+ return createAndPublishEndpoint(s, obj, (WebServiceFeature[]) null);
+}
+
+public Endpoint createAndPublishEndpoint(String s, Object obj,
WebServiceFeature... features) {
Endpoint ep = new EndpointImpl(obj);
ep.publish(s);
return ep;
@@ -55,12 +59,27 @@ public class Provider extends javax.xml.
@Override
public Endpoint createEndpoint(String binding, Object obj) {
+return createEndpoint(binding, obj, (WebServiceFeature[])null);
+}
+
+//TODO: Fix the Endpoint to support WebServiceFeatures (for non-JEE users)
+public Endpoint createEndpoint(String binding, Object obj,
WebServiceFeature... features) {
return new EndpointImpl(obj);
}
+//TODO: Fix the Endpoint to support WebServiceFeatures (for non-JEE users)
+//@Override
+//public Endpoint createEndpoint(String binding, Class clazz, Invoker
invoker, WebServiceFeature... features) {
+//
+//}
+
@Override
public ServiceDelegate createServiceDelegate(URL url, QName qname, Class
clazz) {
-return new org.apache.axis2.jaxws.spi.ServiceDelegate(url, qname,
clazz);
+return createServiceDelegate(url, qname, clazz,
(WebServiceFeature[])null);
+}
+
+public ServiceDelegate createServiceDelegate(URL url, QName qname, Class
clazz, WebServiceFeature... features) {
+return new org.apache.axis2.jaxws.spi.ServiceDelegate(url, qname,
clazz, features);
}
@Override
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java?rev=928797&r1=928796&r2=928797&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
Mon Mar 29 14:55:09 2010
@@ -85,6 +85,8 @@ public class ServiceDelegate extends jav
private HandlerResolver handlerResolver = null;
+private WebServiceFeature[] features = null;
+
/**
* NON-STANDARD SPI! Set any metadata to be used on the creation of the
NEXT Service by this thread.
* NOTE that this uses ThreadLocal to store the metadata, and that
ThreadLocal is cleared after it is
@@ -195,9 +197,10 @@ public class ServiceDelegate extends jav
sparsePortCompositeThreadLocal.set(null);
}
-public ServiceDelegate(URL url, QName qname, Class clazz) throws
WebServiceException {
+public ServiceDelegate(URL url, QName qname, Class clazz,
WebServiceFeature... features) throws WebServiceException {
super();
this.serviceQname = qname;
+this.features = features;
if (!isValidServiceName()) {
throw ExceptionFactory
@@ -228,7 +231,7 @@ public class ServiceDelegate extends jav
ApplicationContextMigratorUtil.addApplicationContextMigrator(context,
Constants.APPLICATION_CONTEXT_MIGRATOR_LIST_ID, new
PropertyMigrator());
}
-
+
//
// JAX-WS API methods
//
@@ -263,7 +266,7 @@ public class ServiceDelegate extends jav
*/
public Dispatch createDispatch(QName portName, Class type, Mode
mode)
throws WebServiceException {
-return createDispatch(portName, type, mode, (WebServiceFeature[])
null);
+return createDispatch(portName, type, mode, (WebServiceFeature[])
features);
}
/*
@@ -271,7 +274,7 @@ public class ServiceDelegate extends jav
* @
svn commit: r928819 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src: main/java/org/apache/axis2/spring/ main/resources/schemas/ test/java/org/apache/axis2/spring/ test/res
Author: veithen
Date: Mon Mar 29 16:05:30 2010
New Revision: 928819
URL: http://svn.apache.org/viewvc?rev=928819&view=rev
Log:
AXIS2-4662: Some refactorings to the PoC code to support the standalone
scenario, i.e. to create a ListenerManager using Spring.
Added:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextFactoryBean.java
- copied, changed from r928727,
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationFactory.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextParser.java
- copied, changed from r928727,
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationParser.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ListenerManagerFactoryBean.java
(with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ListenerManagerParser.java
(with props)
Removed:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationFactory.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationParser.java
Modified:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/Constants.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportReceiverParser.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/spring-axis2.xsd
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/MultiConfigurationTest.java
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/multi_configuration.xml
Modified:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java?rev=928819&r1=928818&r2=928819&view=diff
==
---
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
(original)
+++
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
Mon Mar 29 16:05:30 2010
@@ -23,8 +23,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.engine.AxisConfiguration;
import org.springframework.beans.BeansException;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -32,46 +32,47 @@ import org.springframework.beans.factory
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.util.StringUtils;
public class AxisConfigurationBeanFactoryPostProcessor implements
BeanFactoryPostProcessor {
public void postProcessBeanFactory(ConfigurableListableBeanFactory
beanFactory) throws BeansException {
-Map axisConfigurations = new
HashMap();
-for (String name :
beanFactory.getBeanNamesForType(AxisConfiguration.class)) {
-axisConfigurations.put(name, beanFactory.getBeanDefinition(name));
+Map configurationContextMap = new
HashMap();
+for (String name :
beanFactory.getBeanNamesForType(ConfigurationContext.class)) {
+configurationContextMap.put(name,
beanFactory.getBeanDefinition(name));
}
-processItems(beanFactory, axisConfigurations,
TransportInDescription.class, "transportInDescriptions");
+processItems(beanFactory, configurationContextMap,
TransportInDescription.class, "transportInDescriptions");
}
private void processItems(ConfigurableListableBeanFactory beanFactory,
svn commit: r928871 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test-resources/wsdl/ jaxws-integration/test/org/apache/axis2/jaxws/sample/ jaxws-integration/test/org/apache/axis2/jaxws
Author: scheu Date: Mon Mar 29 19:08:34 2010 New Revision: 928871 URL: http://svn.apache.org/viewvc?rev=928871&view=rev Log: (empty) Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/doclitbare.wsdl axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/BareTests.java axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/DocLitBarePortTypeImpl.java axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/META-INF/doclitbare.wsdl axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/sei/DocLitBarePortType.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/Constants.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/MethodMarshaller.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMinimalMethodMarshaller.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/doclitbare.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/doclitbare.wsdl?rev=928871&r1=928870&r2=928871&view=diff == --- axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/doclitbare.wsdl (original) +++ axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/doclitbare.wsdl Mon Mar 29 19:08:34 2010 @@ -20,173 +20,196 @@ --> http://schemas.xmlsoap.org/wsdl/"; - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; - xmlns:tns="http://doclitbare.sample.test.org"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="DoclitBare" - targetNamespace="http://doclitbare.sample.test.org";> - - - http://doclitbare.sample.test.org"; - xmlns:tns="http://doclitbare.sample.test.org"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema";> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; +xmlns:tns="http://doclitbare.sample.test.org"; +xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="DoclitBare" +targetNamespace="http://doclitbare.sample.test.org";> + + +http://doclitbare.sample.test.org"; +xmlns:tns="http://doclitbare.sample.test.org"; +xmlns:xsd="http://www.w3.org/2001/XMLSchema";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - - - -
svn commit: r928941 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: deployment/util/Utils.java receivers/AbstractMessageReceiver.java util/Utils.java
Author: veithen
Date: Mon Mar 29 23:43:21 2010
New Revision: 928941
URL: http://svn.apache.org/viewvc?rev=928941&view=rev
Log:
Eliminated some duplicate code originally introduced in r439555 and that has
grown over time.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=928941&r1=928940&r2=928941&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Mon Mar 29 23:43:21 2010
@@ -62,9 +62,7 @@ import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import java.io.*;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -429,60 +427,11 @@ public class Utils {
public static void fillAxisService(final AxisService axisService,
AxisConfiguration axisConfig,
ArrayList excludeOperations,
ArrayList nonRpcMethods) throws
Exception {
-String serviceClass;
-Parameter implInfoParam = axisService
-.getParameter(Constants.SERVICE_CLASS);
-ClassLoader serviceClassLoader = axisService.getClassLoader();
-
-if (implInfoParam != null) {
-serviceClass = (String)implInfoParam.getValue();
-} else {
-// if Service_Class is null, every AbstractMR will look for
-// ServiceObjectSupplier. This is user specific and may contain
-// other looks.
-implInfoParam = axisService
-.getParameter(Constants.SERVICE_OBJECT_SUPPLIER);
-if (implInfoParam != null) {
-String className = ((String)implInfoParam.getValue()).trim();
-final Class serviceObjectMaker = Loader.loadClass(
-serviceClassLoader, className);
-if (serviceObjectMaker.getModifiers() != Modifier.PUBLIC) {
-throw new AxisFault("Service class " + className
-+ " must have public as access
Modifier");
-}
-
-// Find static getServiceObject() method, call it if there
-final Method method =
(Method)org.apache.axis2.java.security.AccessController
-.doPrivileged(new PrivilegedExceptionAction() {
-public Object run() throws NoSuchMethodException {
-return serviceObjectMaker.getMethod(
-"getServiceObject",
-AxisService.class);
-}
-});
-Object obj = null;
-if (method != null) {
-obj = org.apache.axis2.java.security.AccessController
-.doPrivileged(new PrivilegedExceptionAction() {
-public Object run()
-throws InstantiationException,
-IllegalAccessException,
-InvocationTargetException {
-return
method.invoke(serviceObjectMaker.newInstance(),
- axisService);
-}
-});
-}
-if (obj == null) {
-log.warn("ServiceObjectSupplier implmentation Object could
not be found");
-throw new DeploymentException(
-"ServiceClass or ServiceObjectSupplier
implmentation Object could not be found");
-}
-serviceClass = obj.getClass().getName();
-} else {
-return;
-}
+Class serviceClass =
org.apache.axis2.util.Utils.getServiceClass(axisService);
+if (serviceClass == null) {
+return;
}
+ClassLoader serviceClassLoader = axisService.getClassLoader();
// adding name spaces
NamespaceMap map = new NamespaceMap();
map.put(Java2WSDLConstants.AXIS2_N
