Author: veithen
Date: Fri Dec 7 09:31:36 2012
New Revision: 1418233
URL: http://svn.apache.org/viewvc?rev=1418233&view=rev
Log:
* Added an EMF model to load/save WSDD files.
* Added a Maven plug-in to manipulate WSDD files.
* Changed axis-codegen to use the EMF model to generate the (deploy) WSDD file.
* Removed manually maintained WSDD file from Spring tests.
Added:
axis/axis1/java/trunk/axis-model/ (props changed)
- copied from r1418230, axis/axis1/java/branches/EMF/axis-model/
axis/axis1/java/trunk/axis-model/model/
- copied from r1418230, axis/axis1/java/branches/EMF/axis-model/model/
axis/axis1/java/trunk/axis-model/model/axis.genmodel
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/model/axis.genmodel
axis/axis1/java/trunk/axis-model/model/soap.ecore
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/model/soap.ecore
axis/axis1/java/trunk/axis-model/model/wsdd.ecore
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore
axis/axis1/java/trunk/axis-model/model/xml.ecore
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/model/xml.ecore
axis/axis1/java/trunk/axis-model/pom.xml
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/pom.xml
axis/axis1/java/trunk/axis-model/src/
- copied from r1418230, axis/axis1/java/branches/EMF/axis-model/src/
axis/axis1/java/trunk/axis-model/src/main/
- copied from r1418230, axis/axis1/java/branches/EMF/axis-model/src/main/
axis/axis1/java/trunk/axis-model/src/main/java/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/
axis/axis1/java/trunk/axis-model/src/main/java/org/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/soap/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/soap/impl/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/util/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/util/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDUtil.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDUtil.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/xml/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/xml/XmlFactory.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/XmlFactory.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/xml/impl/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlFactoryImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlFactoryImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
axis/axis1/java/trunk/axis-model/src/test/
- copied from r1418230, axis/axis1/java/branches/EMF/axis-model/src/test/
axis/axis1/java/trunk/axis-model/src/test/java/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/
axis/axis1/java/trunk/axis-model/src/test/java/org/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/org/
axis/axis1/java/trunk/axis-model/src/test/java/org/apache/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/org/apache/
axis/axis1/java/trunk/axis-model/src/test/java/org/apache/axis/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/org/apache/axis/
axis/axis1/java/trunk/axis-model/src/test/java/org/apache/axis/model/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/org/apache/axis/model/
axis/axis1/java/trunk/axis-model/src/test/java/org/apache/axis/model/wsdd/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/org/apache/axis/model/wsdd/
axis/axis1/java/trunk/axis-model/src/test/java/org/apache/axis/model/wsdd/LoadTest.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/java/org/apache/axis/model/wsdd/LoadTest.java
axis/axis1/java/trunk/axis-model/src/test/wsdd/
- copied from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/wsdd/
axis/axis1/java/trunk/axis-model/src/test/wsdd/client-config.wsdd
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/wsdd/client-config.wsdd
axis/axis1/java/trunk/axis-model/src/test/wsdd/schema2.wsdd
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/wsdd/schema2.wsdd
axis/axis1/java/trunk/axis-model/src/test/wsdd/server-config.wsdd
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/axis-model/src/test/wsdd/server-config.wsdd
axis/axis1/java/trunk/maven/maven-wsdd-plugin/ (props changed)
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/pom.xml
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/pom.xml
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/apache/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/
- copied from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
- copied unchanged from r1418230,
axis/axis1/java/branches/EMF/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
Removed:
axis/axis1/java/trunk/tests/spring-compat-tests/src/main/webapp/WEB-INF/server-config.wsdd
Modified:
axis/axis1/java/trunk/ (props changed)
axis/axis1/java/trunk/axis-codegen/pom.xml
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
axis/axis1/java/trunk/axis-rt-core/src/main/java/ (props changed)
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
axis/axis1/java/trunk/maven/pom.xml
axis/axis1/java/trunk/pom.xml
axis/axis1/java/trunk/test/wsdl/interop/ (props changed)
axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
Propchange: axis/axis1/java/trunk/
------------------------------------------------------------------------------
Merged /axis/axis1/java/branches/EMF:r1417039-1418230
Modified: axis/axis1/java/trunk/axis-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/pom.xml?rev=1418233&r1=1418232&r2=1418233&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-codegen/pom.xml (original)
+++ axis/axis1/java/trunk/axis-codegen/pom.xml Fri Dec 7 09:31:36 2012
@@ -41,6 +41,15 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java?rev=1418233&r1=1418232&r2=1418233&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Fri Dec 7 09:31:36 2012
@@ -22,6 +22,14 @@ import org.apache.axis.components.logger
import org.apache.axis.constants.Scope;
import org.apache.axis.constants.Style;
import org.apache.axis.constants.Use;
+import org.apache.axis.model.wsdd.ArrayMapping;
+import org.apache.axis.model.wsdd.Deployment;
+import org.apache.axis.model.wsdd.Fault;
+import org.apache.axis.model.wsdd.OperationParameter;
+import org.apache.axis.model.wsdd.ParameterMode;
+import org.apache.axis.model.wsdd.TypeMapping;
+import org.apache.axis.model.wsdd.WSDDFactory;
+import org.apache.axis.model.wsdd.WSDDUtil;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
@@ -31,6 +39,7 @@ import org.apache.axis.wsdl.symbolTable.
import org.apache.axis.wsdl.symbolTable.SchemaUtils;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import javax.wsdl.Binding;
@@ -135,10 +144,6 @@ public class JavaDeployWriter extends Ja
pw.println(Messages.getMessage("deploy07"));
pw.println(Messages.getMessage("deploy09"));
pw.println();
- pw.println("<deployment");
- pw.println(" xmlns=\"" + WSDDConstants.URI_WSDD + "\"");
- pw.println(" xmlns:" + WSDDConstants.NS_PREFIX_WSDD_JAVA + "=\""
- + WSDDConstants.URI_WSDD_JAVA + "\">");
} // writeFileHeader
/**
@@ -148,8 +153,9 @@ public class JavaDeployWriter extends Ja
* @throws IOException
*/
protected void writeFileBody(PrintWriter pw) throws IOException {
- writeDeployServices(pw);
- pw.println("</deployment>");
+ Deployment deployment = WSDDFactory.INSTANCE.createDeployment();
+ writeDeployServices(deployment);
+ WSDDUtil.save(deployment, pw);
} // writeFileBody
/**
@@ -158,7 +164,7 @@ public class JavaDeployWriter extends Ja
* @param pw
* @throws IOException
*/
- protected void writeDeployServices(PrintWriter pw) throws IOException {
+ protected void writeDeployServices(Deployment deployment) throws
IOException {
// deploy the ports on each service
Map serviceMap = definition.getServices();
@@ -167,13 +173,6 @@ public class JavaDeployWriter extends Ja
mapIterator.hasNext();) {
Service myService = (Service) mapIterator.next();
- pw.println();
- pw.println(
- " <!-- "
- + Messages.getMessage(
- "wsdlService00",
myService.getQName().getLocalPart()) + " -->");
- pw.println();
-
for (Iterator portIterator =
myService.getPorts().values().iterator();
portIterator.hasNext();) {
Port myPort = (Port) portIterator.next();
@@ -185,7 +184,7 @@ public class JavaDeployWriter extends Ja
continue;
}
- writeDeployPort(pw, myPort, myService, bEntry);
+ writeDeployPort(deployment, myPort, myService, bEntry);
}
}
} // writeDeployServices
@@ -201,20 +200,19 @@ public class JavaDeployWriter extends Ja
* @throws IOException
*/
protected void writeDeployTypes(
- PrintWriter pw, Binding binding, boolean hasLiteral, boolean
hasMIME, Use use)
+ org.apache.axis.model.wsdd.Service service, Binding binding,
boolean hasLiteral, boolean hasMIME, Use use)
throws IOException {
- pw.println();
-
if (hasMIME) {
QName bQName = binding.getQName();
- writeTypeMapping(
- pw, bQName.getNamespaceURI(), "DataHandler",
- "javax.activation.DataHandler",
-
"org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory",
-
"org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory",
- use.getEncoding());
+ TypeMapping typeMapping = WSDDFactory.INSTANCE.createTypeMapping();
+ typeMapping.setQname(new QName(bQName.getNamespaceURI(),
"DataHandler"));
+ typeMapping.setType(new QName(WSDDConstants.URI_WSDD_JAVA,
"javax.activation.DataHandler", WSDDConstants.NS_PREFIX_WSDD_JAVA));
+
typeMapping.setSerializer("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
+
typeMapping.setDeserializer("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
+ typeMapping.setEncodingStyle(use.getEncoding());
+ service.getTypeMappings().add(typeMapping);
}
Map types = symbolTable.getTypeIndex();
@@ -232,8 +230,6 @@ public class JavaDeployWriter extends Ja
}
if (process) {
- String namespaceURI = type.getQName().getNamespaceURI();
- String localPart = type.getQName().getLocalPart();
String javaType = type.getName();
String serializerFactory;
String deserializerFactory;
@@ -282,70 +278,27 @@ public class JavaDeployWriter extends Ja
if (innerType == null) {
// no arrays
- writeTypeMapping(pw, namespaceURI, localPart, javaType,
- serializerFactory, deserializerFactory,
- encodingStyle);
+ TypeMapping typeMapping =
WSDDFactory.INSTANCE.createTypeMapping();
+ typeMapping.setQname(type.getQName());
+ typeMapping.setType(new QName(WSDDConstants.URI_WSDD_JAVA,
javaType));
+ typeMapping.setSerializer(serializerFactory);
+ typeMapping.setDeserializer(deserializerFactory);
+ typeMapping.setEncodingStyle(encodingStyle);
+ service.getTypeMappings().add(typeMapping);
} else {
// arrays
- writeArrayTypeMapping(pw, namespaceURI, localPart,
javaType,
- encodingStyle, innerType);
+ ArrayMapping arrayMapping =
WSDDFactory.INSTANCE.createArrayMapping();
+ arrayMapping.setQname(type.getQName());
+ arrayMapping.setType(new
QName(WSDDConstants.URI_WSDD_JAVA, javaType));
+ arrayMapping.setEncodingStyle(encodingStyle);
+ arrayMapping.setInnerType(innerType);
+ service.getArrayMappings().add(arrayMapping);
}
}
}
} // writeDeployTypes
/**
- * Raw routine that writes out the typeMapping.
- *
- * @param pw
- * @param namespaceURI
- * @param localPart
- * @param javaType
- * @param serializerFactory
- * @param deserializerFactory
- * @param encodingStyle
- * @throws IOException
- */
- protected void writeArrayTypeMapping(
- PrintWriter pw, String namespaceURI, String localPart, String
javaType, String encodingStyle, QName innerType)
- throws IOException {
-
- pw.println(" <arrayMapping");
- pw.println(" xmlns:ns=\"" + namespaceURI + "\"");
- pw.println(" qname=\"ns:" + localPart + '"');
- pw.println(" type=\"java:" + javaType + '"');
- pw.println(" innerType=\"" +
Utils.genQNameAttributeString(innerType, "cmp-ns") + '"');
- pw.println(" encodingStyle=\"" + encodingStyle + "\"");
- pw.println(" />");
- }
-
- /**
- * Raw routine that writes out the typeMapping.
- *
- * @param pw
- * @param namespaceURI
- * @param localPart
- * @param javaType
- * @param serializerFactory
- * @param deserializerFactory
- * @param encodingStyle
- * @throws IOException
- */
- protected void writeTypeMapping(
- PrintWriter pw, String namespaceURI, String localPart, String
javaType, String serializerFactory, String deserializerFactory, String
encodingStyle)
- throws IOException {
-
- pw.println(" <typeMapping");
- pw.println(" xmlns:ns=\"" + namespaceURI + "\"");
- pw.println(" qname=\"ns:" + localPart + '"');
- pw.println(" type=\"java:" + javaType + '"');
- pw.println(" serializer=\"" + serializerFactory + "\"");
- pw.println(" deserializer=\"" + deserializerFactory + "\"");
- pw.println(" encodingStyle=\"" + encodingStyle + "\"");
- pw.println(" />");
- }
-
- /**
* Write out deployment and undeployment instructions for given WSDL port
*
* @param pw
@@ -355,14 +308,13 @@ public class JavaDeployWriter extends Ja
* @throws IOException
*/
protected void writeDeployPort(
- PrintWriter pw, Port port, Service service, BindingEntry bEntry)
+ Deployment deployment, Port port, Service service, BindingEntry
bEntry)
throws IOException {
String serviceName = port.getName();
boolean hasLiteral = bEntry.hasLiteral();
boolean hasMIME = Utils.hasMIME(bEntry);
- String prefix = WSDDConstants.NS_PREFIX_WSDD_JAVA;
- String styleStr = "";
+ Style style;
Iterator iterator =
bEntry.getBinding().getExtensibilityElements().iterator();
@@ -375,28 +327,26 @@ public class JavaDeployWriter extends Ja
}
if (symbolTable.isWrapped()) {
- styleStr = " style=\"" + Style.WRAPPED + "\"";
+ style = Style.WRAPPED;
use = Use.LITERAL;
} else {
- styleStr = " style=\"" + bEntry.getBindingStyle().getName() + "\"";
+ style = bEntry.getBindingStyle();
if (hasLiteral) {
use = Use.LITERAL;
}
}
- String useStr = " use=\"" + use + "\"";
-
- pw.println(" <service name=\"" + serviceName + "\" provider=\""
- + prefix + ":RPC" + "\"" + styleStr + useStr + ">");
- pw.println(" <parameter name=\"wsdlTargetNamespace\" value=\""
- + service.getQName().getNamespaceURI() + "\"/>");
- pw.println(" <parameter name=\"wsdlServiceElement\" value=\""
- + service.getQName().getLocalPart() + "\"/>");
+ org.apache.axis.model.wsdd.Service wsddService =
WSDDFactory.INSTANCE.createService();
+ wsddService.setName(serviceName);
+ wsddService.setProvider(new QName(WSDDConstants.URI_WSDD_JAVA, "RPC"));
+ wsddService.setStyle(style);
+ wsddService.setUse(use);
+ wsddService.setParameter("wsdlTargetNamespace",
service.getQName().getNamespaceURI());
+ wsddService.setParameter("wsdlServiceElement",
service.getQName().getLocalPart());
// MIME attachments don't work with multiref, so turn it off.
if (hasMIME) {
- pw.println(
- " <parameter name=\"sendMultiRefs\"
value=\"false\"/>");
+ wsddService.setParameter("sendMultiRefs", "false");
}
ArrayList qualified = new ArrayList();
ArrayList unqualified = new ArrayList();
@@ -410,31 +360,16 @@ public class JavaDeployWriter extends Ja
}
}
if(qualified.size()>0){
- pw.print(" <parameter name=\"schemaQualified\" value=\"");
- for(int i=0;i<qualified.size();i++){
- pw.print(qualified.get(i));
- if(i != qualified.size()-1){
- pw.print(',');
- }
- }
- pw.println("\"/>");
+ wsddService.setParameter("schemaQualified",
StringUtils.join(qualified, ','));
}
if(unqualified.size()>0){
- pw.print(" <parameter name=\"schemaUnqualified\" value=\"");
- for(int i=0;i<unqualified.size();i++){
- pw.print(unqualified.get(i));
- if(i != unqualified.size()-1){
- pw.print(',');
- }
- }
- pw.println("\"/>");
+ wsddService.setParameter("schemaUnqualified",
StringUtils.join(unqualified, ','));
}
- pw.println(" <parameter name=\"wsdlServicePort\" value=\""
- + serviceName + "\"/>");
+ wsddService.setParameter("wsdlServicePort", serviceName);
- writeDeployBinding(pw, bEntry);
- writeDeployTypes(pw, bEntry.getBinding(), hasLiteral, hasMIME, use);
- pw.println(" </service>");
+ writeDeployBinding(wsddService, bEntry);
+ writeDeployTypes(wsddService, bEntry.getBinding(), hasLiteral,
hasMIME, use);
+ deployment.getServices().add(wsddService);
} // writeDeployPort
/**
@@ -444,7 +379,7 @@ public class JavaDeployWriter extends Ja
* @param bEntry
* @throws IOException
*/
- protected void writeDeployBinding(PrintWriter pw, BindingEntry bEntry)
+ protected void writeDeployBinding(org.apache.axis.model.wsdd.Service
service, BindingEntry bEntry)
throws IOException {
Binding binding = bEntry.getBinding();
@@ -461,14 +396,9 @@ public class JavaDeployWriter extends Ja
className += "Impl";
}
- pw.println(" <parameter name=\"className\" value=\"" + className
- + "\"/>");
-
- pw.println(" <parameter name=\"wsdlPortType\" value=\""
- + binding.getPortType().getQName().getLocalPart() + "\"/>");
-
- pw.println(" <parameter name=\"typeMappingVersion\" value=\""
- + emitter.getTypeMappingVersion() + "\"/>");
+ service.setParameter("className", className);
+ service.setParameter("wsdlPortType",
binding.getPortType().getQName().getLocalPart());
+ service.setParameter("typeMappingVersion",
emitter.getTypeMappingVersion());
HashSet allowedMethods = new HashSet();
@@ -549,40 +479,19 @@ public class JavaDeployWriter extends Ja
String SOAPAction =
Utils.getOperationSOAPAction(bindingOper);
// Write the operation metadata
- writeOperation(pw, javaOperName, elementQName, returnQName,
+ writeOperation(service, javaOperName, elementQName,
returnQName,
returnType, params, binding.getQName(),
faults, SOAPAction);
}
}
}
- pw.print(" <parameter name=\"allowedMethods\" value=\"");
-
- if (allowedMethods.isEmpty()) {
- pw.println("*\"/>");
- } else {
- boolean first = true;
-
- for (Iterator i = allowedMethods.iterator(); i.hasNext();) {
- String method = (String) i.next();
-
- if (first) {
- pw.print(method);
-
- first = false;
- } else {
- pw.print(" " + method);
- }
- }
-
- pw.println("\"/>");
- }
+ service.setParameter("allowedMethods", allowedMethods.isEmpty() ? "*"
: StringUtils.join(allowedMethods, ' '));
Scope scope = emitter.getScope();
if (scope != null) {
- pw.println(" <parameter name=\"scope\" value=\""
- + scope.getName() + "\"/>");
+ service.setParameter("scope", scope.getName());
}
} // writeDeployBinding
@@ -598,70 +507,43 @@ public class JavaDeployWriter extends Ja
* @param bindingQName
* @param faults
*/
- protected void writeOperation(PrintWriter pw, String javaOperName,
+ protected void writeOperation(org.apache.axis.model.wsdd.Service service,
String javaOperName,
QName elementQName, QName returnQName,
QName returnType, Parameters params,
QName bindingQName, ArrayList faults,
String SOAPAction) {
- pw.print(" <operation name=\"" + javaOperName + "\"");
+ org.apache.axis.model.wsdd.Operation operation =
WSDDFactory.INSTANCE.createOperation();
+
+ operation.setName(javaOperName);
- if (elementQName != null) {
- pw.print(" qname=\""
- + Utils.genQNameAttributeString(elementQName, "operNS")
- + "\"");
- }
+ operation.setQname(elementQName);
if (returnQName != null) {
- pw.print(" returnQName=\""
- +
Utils.genQNameAttributeStringWithLastLocalPart(returnQName, "retNS")
- + "\"");
+ operation.setReturnQName(new QName(returnQName.getNamespaceURI(),
Utils.getLastLocalPart(returnQName.getLocalPart())));
}
- if (returnType != null) {
- pw.print(" returnType=\""
- + Utils.genQNameAttributeString(returnType, "rtns")
- + "\"");
- }
+ operation.setReturnType(returnType);
Parameter retParam = params.returnParam;
if (retParam != null) {
TypeEntry type = retParam.getType();
- QName returnItemQName = Utils.getItemQName(type);
- if (returnItemQName != null) {
- pw.print(" returnItemQName=\"");
- pw.print(Utils.genQNameAttributeString(returnItemQName,
"tns"));
- pw.print("\"");
- }
- QName returnItemType = Utils.getItemType(type);
- if (returnItemType != null && use == Use.ENCODED) {
- pw.print(" returnItemType=\"");
- pw.print(Utils.genQNameAttributeString(returnItemType,
"tns2"));
- pw.print("\"");
+ operation.setReturnItemQName(Utils.getItemQName(type));
+ if (use == Use.ENCODED) {
+ operation.setReturnItemType(Utils.getItemType(type));
}
}
- if (SOAPAction != null) {
- pw.print(" soapAction=\""
- + SOAPAction
- + "\"");
- }
+ operation.setSoapAction(SOAPAction);
if (!OperationType.REQUEST_RESPONSE.equals(params.mep)) {
- String mepString = getMepString(params.mep);
- if (mepString != null) {
- pw.print(" mep=\""
- + mepString
- + "\"");
- }
+ operation.setMep(getMepString(params.mep));
}
if ((params.returnParam != null) && params.returnParam.isOutHeader()) {
- pw.print(" returnHeader=\"true\"");
+ operation.setReturnHeader(Boolean.TRUE);
}
- pw.println(" >");
-
Vector paramList = params.list;
for (int i = 0; i < paramList.size(); i++) {
@@ -671,41 +553,33 @@ public class JavaDeployWriter extends Ja
QName paramQName = param.getQName();
QName paramType = Utils.getXSIType(param);
- pw.print(" <parameter");
+ OperationParameter parameter =
WSDDFactory.INSTANCE.createOperationParameter();
if (paramQName == null) {
- pw.print(" name=\"" + param.getName() + "\"");
+ parameter.setName(param.getName());
} else {
- pw.print(" qname=\""
- +
Utils.genQNameAttributeStringWithLastLocalPart(paramQName, "pns")
- + "\"");
+ parameter.setQname(new QName(paramQName.getNamespaceURI(),
Utils.getLastLocalPart(paramQName.getLocalPart())));
}
- pw.print(" type=\""
- + Utils.genQNameAttributeString(paramType, "tns") + "\"");
+ parameter.setType(paramType);
// Get the parameter mode
if (param.getMode() != Parameter.IN) {
- pw.print(" mode=\"" + getModeString(param.getMode()) + "\"");
+ parameter.setMode(ParameterMode.get(param.getMode()));
}
// Is this a header?
if (param.isInHeader()) {
- pw.print(" inHeader=\"true\"");
+ parameter.setInHeader(Boolean.TRUE);
}
if (param.isOutHeader()) {
- pw.print(" outHeader=\"true\"");
+ parameter.setOutHeader(Boolean.TRUE);
}
- QName itemQName = Utils.getItemQName(param.getType());
- if (itemQName != null) {
- pw.print(" itemQName=\"");
- pw.print(Utils.genQNameAttributeString(itemQName, "itns"));
- pw.print("\"");
- }
+ parameter.setItemQName(Utils.getItemQName(param.getType()));
- pw.println("/>");
+ operation.getParameters().add(parameter);
}
if (faults != null) {
@@ -718,39 +592,17 @@ public class JavaDeployWriter extends Ja
Utils.getFullExceptionName(faultInfo.getMessage(),
symbolTable);
- pw.print(" <fault");
- pw.print(" name=\"" + faultInfo.getName() + "\"");
- pw.print(" qname=\""
- + Utils.genQNameAttributeString(faultQName, "fns")
- + "\"");
- pw.print(" class=\"" + className + "\"");
- pw.print(
- " type=\""
- + Utils.genQNameAttributeString(
- faultInfo.getXMLType(), "tns") + "\"");
- pw.println("/>");
+ Fault fault = WSDDFactory.INSTANCE.createFault();
+ fault.setName(faultInfo.getName());
+ fault.setQname(faultQName);
+ fault.setClass(className);
+ fault.setType(faultInfo.getXMLType());
+ operation.getFaults().add(fault);
}
}
}
- pw.println(" </operation>");
- }
-
- /**
- * Method getModeString
- *
- * @param mode
- * @return
- */
- public String getModeString(byte mode) {
-
- if (mode == Parameter.IN) {
- return "IN";
- } else if (mode == Parameter.INOUT) {
- return "INOUT";
- } else {
- return "OUT";
- }
+ service.getOperations().add(operation);
}
/**
Propchange: axis/axis1/java/trunk/axis-model/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 7 09:31:36 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Propchange: axis/axis1/java/trunk/axis-rt-core/src/main/java/
------------------------------------------------------------------------------
Merged
/axis/axis1/java/branches/EMF/axis-rt-core/src/main/java:r1417039-1418230
Modified:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java?rev=1418233&r1=1418232&r2=1418233&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
Fri Dec 7 09:31:36 2012
@@ -745,41 +745,6 @@ public class Utils {
*/
} // getNestedTypes
- /**
- * Generate an XML prefixed attribute value with a corresponding xmlns
- * declaration for the prefix. If there is no namespace,
- * don't prefix the name or emit the xmlns attribute.
- * <p/>
- * Caller should provide the enclosing quotes.
- * <p/>
- * Usage: println("name=\"" + genXMLQNameString(qname, "foo") + "\""
- *
- * @param qname
- * @param prefix
- * @return
- */
- public static String genQNameAttributeString(QName qname, String prefix) {
-
- if ((qname.getNamespaceURI() == null)
- || qname.getNamespaceURI().equals("")) {
- return qname.getLocalPart();
- }
-
- return prefix + ":" + qname.getLocalPart() + "\" xmlns:" + prefix
- + "=\"" + qname.getNamespaceURI();
- }
-
- public static String genQNameAttributeStringWithLastLocalPart(QName qname,
String prefix) {
- String lastLocalPart = getLastLocalPart(qname.getLocalPart());
- if ((qname.getNamespaceURI() == null)
- || qname.getNamespaceURI().equals("")) {
- return lastLocalPart;
- }
-
- return prefix + ":" + lastLocalPart + "\" xmlns:" + prefix
- + "=\"" + qname.getNamespaceURI();
- }
-
public static String getLastLocalPart(String localPart) {
int anonymousDelimitorIndex = localPart.lastIndexOf('>');
if (anonymousDelimitorIndex > -1 && anonymousDelimitorIndex <
localPart.length()-1) {
Propchange: axis/axis1/java/trunk/maven/maven-wsdd-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 7 09:31:36 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Modified: axis/axis1/java/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/pom.xml?rev=1418233&r1=1418232&r2=1418233&view=diff
==============================================================================
--- axis/axis1/java/trunk/maven/pom.xml (original)
+++ axis/axis1/java/trunk/maven/pom.xml Fri Dec 7 09:31:36 2012
@@ -68,6 +68,7 @@
</dependencyManagement>
<modules>
<module>nsmap</module>
+ <module>maven-wsdd-plugin</module>
<module>maven-wsdl2java-plugin</module>
<module>maven-java2wsdl-plugin</module>
<module>maven-axis-server-plugin</module>
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1418233&r1=1418232&r2=1418233&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Fri Dec 7 09:31:36 2012
@@ -61,6 +61,7 @@
<module>axis-ant</module>
<module>axis-codegen</module>
<module>axis-jaxrpc</module>
+ <module>axis-model</module>
<module>axis-rt-compat</module>
<module>axis-rt-core</module>
<module>axis-rt-jws</module>
@@ -125,6 +126,11 @@
<artifactId>axiom-testutils</artifactId>
<version>1.2.13</version>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<prerequisites>
Propchange: axis/axis1/java/trunk/test/wsdl/interop/
------------------------------------------------------------------------------
Merged /axis/axis1/java/branches/EMF/test/wsdl/interop:r1417039-1418230
Modified: axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml?rev=1418233&r1=1418232&r2=1418233&view=diff
==============================================================================
--- axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml (original)
+++ axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml Fri Dec 7 09:31:36
2012
@@ -68,13 +68,32 @@
<deployScope>application</deployScope>
<implementationClassName>org.apache.axis.test.spring.OrderEndpoint</implementationClassName>
<writeStubToTestSources>true</writeStubToTestSources>
- <!-- TODO: need to merge the output into
server-config.wsdd -->
<deployWsdd>${project.build.directory}/wsdd/OrderService.wsdd</deployWsdd>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-wsdd-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>generate-wsdd</goal>
+ </goals>
+ <configuration>
+ <type>server</type>
+ <files>
+
<file>${project.build.directory}/wsdd/OrderService.wsdd</file>
+ </files>
+
<output>${project.build.directory}/webapp/WEB-INF/server-config.wsdd</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -104,6 +123,12 @@
<port>${test.httpPort}</port>
</connector>
</connectors>
+ <webApp>
+ <resourceBases>
+
<resourceBase>${basedir}/src/main/webapp</resourceBase>
+
<resourceBase>${project.build.directory}/webapp</resourceBase>
+ </resourceBases>
+ </webApp>
</configuration>
<executions>
<execution>
