You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/11/15 19:16:07 UTC
svn commit: r475341 [1/15] - in /webservices/axis2/branches/java/new-trunk:
./ modules/adb-codegen/ modules/adb/
modules/addressing/test-resources/invalid-cardinality-messages/final/
modules/addressing/test-resources/invalid-cardinality-messages/submis...
Author: dims
Date: Wed Nov 15 10:15:56 2006
New Revision: 475341
URL: http://svn.apache.org/viewvc?view=rev&rev=475341
Log:
- fix eol's
- copy over the changes for request*dispatcher to get more integration tests to work
Modified:
webservices/axis2/branches/java/new-trunk/build.xml
webservices/axis2/branches/java/new-trunk/modules/adb-codegen/maven.xml
webservices/axis2/branches/java/new-trunk/modules/adb/maven.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/valid-messages/final/soapmessage.xml
webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml
webservices/axis2/branches/java/new-trunk/modules/integration/conf/axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/SwA-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/deployment/deployment.both.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rahas/policy/service-policy-symm-binding.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rahas/policy/service-policy-transport-binding.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rahas/policy/sts-policy-asymm-binding.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rahas/policy/sts-policy-symm-binding.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rahas/policy/sts-policy-transport-binding.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rahas/s3-services.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/1.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/3.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/4.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/5.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/6.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/7.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/8.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/9.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/sc-1.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/policy/sc-2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-1.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-3.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-4.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-5.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-6.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-7.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-8.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-9.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-sc-1.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/rampart/services-sc-2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/complete.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/complete.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s1.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s1.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s2.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s2.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s2a.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s2a.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s3.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s3.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s4.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s4.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s5.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s5.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s6.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s6.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s7.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/s7.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/sST1.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/sST1.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/secMtom.client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/security/secMtom.service.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
webservices/axis2/branches/java/new-trunk/modules/jaxbri/maven.xml
webservices/axis2/branches/java/new-trunk/modules/jaxbri/project.xml
webservices/axis2/branches/java/new-trunk/modules/jaxws/project.xml
webservices/axis2/branches/java/new-trunk/modules/jaxws/test/org/apache/axis2/META-INF/services.xml
webservices/axis2/branches/java/new-trunk/modules/jibx/maven.xml
webservices/axis2/branches/java/new-trunk/modules/jibx/project.xml
webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/customer-binding.xml
webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/library-binding.xml
webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/xml/customer-data.xml
webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/project.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/src/META-INF/module.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/saml-issuer-config.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/sct-issuer-config.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/services.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-canceler-config.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.1.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.2.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sct-issuer-config.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sts-services.xml
webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/token-dispatcher-configuration.xml
webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/axis2.xml
webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-body.xml
webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-part.xml
webservices/axis2/branches/java/new-trunk/modules/samples/databinding/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/deprecated/amazonqs/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/deprecated/googlesearch/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/deprecated/mtomsample/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/deprecated/mtomsample/src/sample/mtom/filetransfer/service/META-INF/services.xml
webservices/axis2/branches/java/new-trunk/modules/samples/faulthandling/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/googlespellcheck/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/mtom/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/pojo/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/pojo/src/META-INF/services.xml
webservices/axis2/branches/java/new-trunk/modules/samples/quickstart/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/quickstartadb/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/quickstartaxiom/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/quickstartjibx/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/quickstartxmlbeans/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample01/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample02/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample03/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample04/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample05/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample06/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample07/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample08/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample09/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample10/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/basic/sample11/client.axis2.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample01/policy.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample02/policy.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample03/policy.xml
webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample04/policy.xml
webservices/axis2/branches/java/new-trunk/modules/samples/servicelifecycle/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/resources/META-INF/services.xml
webservices/axis2/branches/java/new-trunk/modules/samples/userguide/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/userguide/src/userguide/example3/META-INF/services.xml
webservices/axis2/branches/java/new-trunk/modules/samples/version/build.xml
webservices/axis2/branches/java/new-trunk/modules/samples/version/src/sample/axisversion/META-INF/services.xml
webservices/axis2/branches/java/new-trunk/modules/samples/yahoorestsearch/build.xml
webservices/axis2/branches/java/new-trunk/modules/savan/project.xml
webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-asymm-binding.xml
webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-symm-binding.xml
webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-transport-binding.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindings.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindingsSymm.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyMsg.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-1.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-2-sig-dk.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-3-dk.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-5-ebs.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-6-3des-r15.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-asymm-binding-7-3des-r15-DK.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-policy-1.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-transport-binding-dk.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-transport-binding-no-bst.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/rampart-transport-binding.xml
webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/soapmessage.xml
webservices/axis2/branches/java/new-trunk/modules/soapmonitor/maven.xml
webservices/axis2/branches/java/new-trunk/modules/spring/maven.xml
webservices/axis2/branches/java/new-trunk/modules/spring/test-resources/applicationContext.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-aar-maven-plugin/src/site/site.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-idea-plugin/maven.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-idea-plugin/plugin/META-INF/plugin.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-idea-plugin/project.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-idea-plugin/src/main/resources/META-INF/plugin.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-idea-plugin/src/site/site.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/site/site.xml
webservices/axis2/branches/java/new-trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/site/site.xml
webservices/axis2/branches/java/new-trunk/modules/webapp/scripts/build.xml
webservices/axis2/branches/java/new-trunk/modules/xmlbeans/maven.xml
Modified: webservices/axis2/branches/java/new-trunk/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/build.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/build.xml (original)
+++ webservices/axis2/branches/java/new-trunk/build.xml Wed Nov 15 10:15:56 2006
@@ -1,274 +1,274 @@
-<?xml version="1.0"?>
-<project name="axis2" default="quick"
-
- >
-
- <!--
- This is an ant build file to
- -invoke maven to build the distribution
- -copy the created files into the local Maven2 cache
- -maybe deploy to a local cache, though that is NPE'ing right now.
- -->
-
-
- <!--
- not putting this at the top level as it breaks idea's ant-awareness
- xmlns:m2="antlib:org.apache.maven.artifact.ant"
- -->
-
- <!--any personal overrides; not read by maven-->
- <property file="build.properties"/>
-
- <!--any personal overrides; also read by maven-->
- <property file="project.properties"/>
- <!--read in project properties, including library versions-->
- <property file="etc/project.properties"/>
-
-
-
- <target name="default">
-
- </target>
-
- <target name="init" >
- <!--macro for maven -->
- <property name="maven.commoncmd" value="--emacs" />
- <condition property="maven.line"
- value="--offline ${maven.commoncmd}">
- <istrue value="${offline}"/>
- </condition>
-
- <condition property="maven.executable" value="maven.bat">
- <os family="windows" />
- </condition>
- <property name="maven.executable" value="maven" />
-
- <property name="maven.line" value="${maven.commoncmd}" />
- <presetdef name="maven">
- <exec failonerror="true" executable="${maven.executable}">
- <arg line="${maven.line}" />
- </exec>
- </presetdef>
-
- <!-- location of m2 repository (with new layout) -->
- <property name="m2.repository" location="${user.home}/.m2/repository"/>
- <!-- original m1 repository -->
- <property name="m1.repository" location="${user.home}/.maven/repository"/>
-
- <property name="project.xml" location="etc/project.xml" />
- <!-- pull out the value of the project version from the maven1 file-->
- <xmlproperty file="${project.xml}"
- keeproot="true" semanticAttributes="true" />
-
- <property name="target.dir" location="target"/>
- <property name="project.version" value="${axis2_version}" />
- <property name="artifact.title" value="${project.id}-${project.version}" />
- <property name="target.jar" location="${target.dir}/${artifact.title}.jar"/>
- <property name="target.pom" location="${target.dir}/${artifact.title}.pom"/>
- <!-- use a proper m2 hierarchy -->
- <property name="maven2.groupId" value="org.apache.ws.${project.groupId}"/>
-
- <available file="${basedir}/target/lib/wsdl4j-${wsdl4j.version}.jar" property="jars.present"/>
-
- </target>
-
- <target name="clean" depends="init"
- description="clean everything">
- <maven>
- <arg value="clean"/>
- </maven>
- </target>
-
- <target name="dist" depends="init"
- description="make a distribution">
- <maven>
- </maven>
- </target>
-
- <target name="dist-lite" depends="init"
- description="make a distribution, skip testing">
- <maven>
- <arg value="-Dmaven.test.skip=true" />
- </maven>
- </target>
-
- <target name="create-lib" unless="jars.present" depends="init"
- description="creates the libraries">
- <maven>
- <arg value="create-lib" />
- </maven>
- </target>
-
- <!-- inline creation of a very minimal pom
- Only libraries that absolutely must be present should be listed.
- This POM omits a choice of StAX parser, because there are so many.
- -->
- <target name="m2-pom" depends="init" xmlns:m2="antlib:org.apache.maven.artifact.ant">
- <echo message="Creating Pom ${target.pom}" level="verbose"/>
- <!--ant1.7's echoxml makes this easier -->
-
-
-<echo file="${target.pom}"><![CDATA[<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>${maven2.groupId}</groupId>
- <artifactId>${project.id}</artifactId>
- <packaging>jar</packaging>
- <version>${project.version}</version>
- <dependencies>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>neethi</artifactId>
- <version>${policy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.m2.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- </dependencies>
-</project>
-]]></echo>
- <m2:pom id="m2.pom" file="${target.pom}"/>
- </target>
-
-
- <target name="m2-wagons" depends="init"
- xmlns:m2="antlib:org.apache.maven.artifact.ant">
- <property name="wagon.version" value="1.0-alpha-5"/>
- <m2:install-provider artifactId="wagon-ssh"
- version="${wagon.version}"/>
- <m2:install-provider artifactId="wagon-ssh-external"
- version="${wagon.version}"/>
- <m2:install-provider artifactId="wagon-file"
- version="${wagon.version}"/>
- <m2:install-provider artifactId="wagon-ftp"
- version="${wagon.version}"/>
- </target>
-
- <target name="ready-to-deploy" depends="m2-pom" />
-
- <target name="m2-install" depends="ready-to-deploy"
- description="install the libray into the local m2 repository"
- xmlns:m2="antlib:org.apache.maven.artifact.ant">
- <m2:install file="${target.jar}">
- <pom refid="m2.pom"/>
- </m2:install>
- </target>
-
- <target name="m2-filesys-deploy" depends="ready-to-deploy"
- xmlns:m2="antlib:org.apache.maven.artifact.ant">
- <fail unless="filesys.url">
- filesys.url needs to be set to a file: url of the local destination
- for in-filesystem deployment
- </fail>
- <m2:deploy file="${target.jar}">
- <remoteRepository url="${filesys.url}"/>
- <pom refid="m2.pom"/>
- </m2:deploy>
- </target>
-
- <target name="installed"
- description="locally installed"
- depends="dist-lite,m2-install" />
-
- <target name="quick" depends="create-lib"
- description="make a distribution">
- <mkdir dir="${basedir}/target/classes/"/>
- <path id="classpath">
- <fileset dir="${basedir}/target/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <javac srcdir="${basedir}/modules"
- destdir="${basedir}/target/classes/"
- debug="true"
- source="1.5"
- classpathref="classpath">
- <include name="adb/src/**/*.java"/>
- <include name="adb-codegen/src/**/*.java"/>
- <include name="addressing/src/**/*.java"/>
- <include name="codegen/src/**/*.java"/>
- <include name="common/src/**/*.java"/>
- <include name="core/src/**/*.java"/>
- <include name="integration/src/**/*.java"/>
- <include name="java2wsdl/src/**/*.java"/>
- <include name="jaxbri/src/**/*.java"/>
- <include name="jaxws/src/**/*.java"/>
- <include name="jibx/src/**/*.java"/>
- <include name="rahas/src/**/*.java"/>
- <include name="saaj/src/**/*.java"/>
- <include name="samples/src/**/*.java"/>
- <include name="savan/src/**/*.java"/>
- <include name="security/src/**/*.java"/>
- <include name="soapmonitor/src/**/*.java"/>
- <include name="spring/src/**/*.java"/>
- <include name="xmlbeans/src/**/*.java"/>
- </javac>
- <copy todir="${basedir}/target/classes/">
- <fileset dir="${basedir}/modules/common/src">
- <include name="**/*.properties"/>
- <include name="**/*.xsl"/>
- </fileset>
- <fileset dir="${basedir}/modules/core/conf">
- <include name="**/*.properties"/>
- </fileset>
- <fileset dir="${basedir}/modules/core/src">
- <include name="**/*axis2*.xml"/>
- </fileset>
- <fileset dir="${basedir}/modules/codegen/src">
- <include name="**/*.properties"/>
- <include name="**/*.xsl"/>
- <include name="**/*.xsd"/>
- </fileset>
- </copy>
- <mkdir dir="${basedir}/target/repo/modules"/>
- <copy todir="${basedir}/target/repo/modules" flatten="true">
- <fileset dir="${basedir}/modules/">
- <include name="**/target/*.mar"/>
- </fileset>
- </copy>
- <copy todir="${basedir}/target/repo">
- <fileset dir="${basedir}/modules/core/src/org/apache/axis2/deployment">
- <include name="axis2.xml"/>
- </fileset>
- </copy>
- </target>
-
- <target name="diag" depends="init">
- <!-- probably ant 1.7+ only -->
- <diagnostics/>
- <echoproperties/>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<project name="axis2" default="quick"
+
+ >
+
+ <!--
+ This is an ant build file to
+ -invoke maven to build the distribution
+ -copy the created files into the local Maven2 cache
+ -maybe deploy to a local cache, though that is NPE'ing right now.
+ -->
+
+
+ <!--
+ not putting this at the top level as it breaks idea's ant-awareness
+ xmlns:m2="antlib:org.apache.maven.artifact.ant"
+ -->
+
+ <!--any personal overrides; not read by maven-->
+ <property file="build.properties"/>
+
+ <!--any personal overrides; also read by maven-->
+ <property file="project.properties"/>
+ <!--read in project properties, including library versions-->
+ <property file="etc/project.properties"/>
+
+
+
+ <target name="default">
+
+ </target>
+
+ <target name="init" >
+ <!--macro for maven -->
+ <property name="maven.commoncmd" value="--emacs" />
+ <condition property="maven.line"
+ value="--offline ${maven.commoncmd}">
+ <istrue value="${offline}"/>
+ </condition>
+
+ <condition property="maven.executable" value="maven.bat">
+ <os family="windows" />
+ </condition>
+ <property name="maven.executable" value="maven" />
+
+ <property name="maven.line" value="${maven.commoncmd}" />
+ <presetdef name="maven">
+ <exec failonerror="true" executable="${maven.executable}">
+ <arg line="${maven.line}" />
+ </exec>
+ </presetdef>
+
+ <!-- location of m2 repository (with new layout) -->
+ <property name="m2.repository" location="${user.home}/.m2/repository"/>
+ <!-- original m1 repository -->
+ <property name="m1.repository" location="${user.home}/.maven/repository"/>
+
+ <property name="project.xml" location="etc/project.xml" />
+ <!-- pull out the value of the project version from the maven1 file-->
+ <xmlproperty file="${project.xml}"
+ keeproot="true" semanticAttributes="true" />
+
+ <property name="target.dir" location="target"/>
+ <property name="project.version" value="${axis2_version}" />
+ <property name="artifact.title" value="${project.id}-${project.version}" />
+ <property name="target.jar" location="${target.dir}/${artifact.title}.jar"/>
+ <property name="target.pom" location="${target.dir}/${artifact.title}.pom"/>
+ <!-- use a proper m2 hierarchy -->
+ <property name="maven2.groupId" value="org.apache.ws.${project.groupId}"/>
+
+ <available file="${basedir}/target/lib/wsdl4j-${wsdl4j.version}.jar" property="jars.present"/>
+
+ </target>
+
+ <target name="clean" depends="init"
+ description="clean everything">
+ <maven>
+ <arg value="clean"/>
+ </maven>
+ </target>
+
+ <target name="dist" depends="init"
+ description="make a distribution">
+ <maven>
+ </maven>
+ </target>
+
+ <target name="dist-lite" depends="init"
+ description="make a distribution, skip testing">
+ <maven>
+ <arg value="-Dmaven.test.skip=true" />
+ </maven>
+ </target>
+
+ <target name="create-lib" unless="jars.present" depends="init"
+ description="creates the libraries">
+ <maven>
+ <arg value="create-lib" />
+ </maven>
+ </target>
+
+ <!-- inline creation of a very minimal pom
+ Only libraries that absolutely must be present should be listed.
+ This POM omits a choice of StAX parser, because there are so many.
+ -->
+ <target name="m2-pom" depends="init" xmlns:m2="antlib:org.apache.maven.artifact.ant">
+ <echo message="Creating Pom ${target.pom}" level="verbose"/>
+ <!--ant1.7's echoxml makes this easier -->
+
+
+<echo file="${target.pom}"><![CDATA[<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${maven2.groupId}</groupId>
+ <artifactId>${project.id}</artifactId>
+ <packaging>jar</packaging>
+ <version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${policy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.m2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ </dependencies>
+</project>
+]]></echo>
+ <m2:pom id="m2.pom" file="${target.pom}"/>
+ </target>
+
+
+ <target name="m2-wagons" depends="init"
+ xmlns:m2="antlib:org.apache.maven.artifact.ant">
+ <property name="wagon.version" value="1.0-alpha-5"/>
+ <m2:install-provider artifactId="wagon-ssh"
+ version="${wagon.version}"/>
+ <m2:install-provider artifactId="wagon-ssh-external"
+ version="${wagon.version}"/>
+ <m2:install-provider artifactId="wagon-file"
+ version="${wagon.version}"/>
+ <m2:install-provider artifactId="wagon-ftp"
+ version="${wagon.version}"/>
+ </target>
+
+ <target name="ready-to-deploy" depends="m2-pom" />
+
+ <target name="m2-install" depends="ready-to-deploy"
+ description="install the libray into the local m2 repository"
+ xmlns:m2="antlib:org.apache.maven.artifact.ant">
+ <m2:install file="${target.jar}">
+ <pom refid="m2.pom"/>
+ </m2:install>
+ </target>
+
+ <target name="m2-filesys-deploy" depends="ready-to-deploy"
+ xmlns:m2="antlib:org.apache.maven.artifact.ant">
+ <fail unless="filesys.url">
+ filesys.url needs to be set to a file: url of the local destination
+ for in-filesystem deployment
+ </fail>
+ <m2:deploy file="${target.jar}">
+ <remoteRepository url="${filesys.url}"/>
+ <pom refid="m2.pom"/>
+ </m2:deploy>
+ </target>
+
+ <target name="installed"
+ description="locally installed"
+ depends="dist-lite,m2-install" />
+
+ <target name="quick" depends="create-lib"
+ description="make a distribution">
+ <mkdir dir="${basedir}/target/classes/"/>
+ <path id="classpath">
+ <fileset dir="${basedir}/target/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <javac srcdir="${basedir}/modules"
+ destdir="${basedir}/target/classes/"
+ debug="true"
+ source="1.5"
+ classpathref="classpath">
+ <include name="adb/src/**/*.java"/>
+ <include name="adb-codegen/src/**/*.java"/>
+ <include name="addressing/src/**/*.java"/>
+ <include name="codegen/src/**/*.java"/>
+ <include name="common/src/**/*.java"/>
+ <include name="core/src/**/*.java"/>
+ <include name="integration/src/**/*.java"/>
+ <include name="java2wsdl/src/**/*.java"/>
+ <include name="jaxbri/src/**/*.java"/>
+ <include name="jaxws/src/**/*.java"/>
+ <include name="jibx/src/**/*.java"/>
+ <include name="rahas/src/**/*.java"/>
+ <include name="saaj/src/**/*.java"/>
+ <include name="samples/src/**/*.java"/>
+ <include name="savan/src/**/*.java"/>
+ <include name="security/src/**/*.java"/>
+ <include name="soapmonitor/src/**/*.java"/>
+ <include name="spring/src/**/*.java"/>
+ <include name="xmlbeans/src/**/*.java"/>
+ </javac>
+ <copy todir="${basedir}/target/classes/">
+ <fileset dir="${basedir}/modules/common/src">
+ <include name="**/*.properties"/>
+ <include name="**/*.xsl"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/core/conf">
+ <include name="**/*.properties"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/core/src">
+ <include name="**/*axis2*.xml"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/codegen/src">
+ <include name="**/*.properties"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.xsd"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${basedir}/target/repo/modules"/>
+ <copy todir="${basedir}/target/repo/modules" flatten="true">
+ <fileset dir="${basedir}/modules/">
+ <include name="**/target/*.mar"/>
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/repo">
+ <fileset dir="${basedir}/modules/core/src/org/apache/axis2/deployment">
+ <include name="axis2.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="diag" depends="init">
+ <!-- probably ant 1.7+ only -->
+ <diagnostics/>
+ <echoproperties/>
+ </target>
+
+</project>
Modified: webservices/axis2/branches/java/new-trunk/modules/adb-codegen/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/adb-codegen/maven.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/adb-codegen/maven.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/adb-codegen/maven.xml Wed Nov 15 10:15:56 2006
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
-
-<project default="jar"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:maven="jelly:maven"
- xmlns:util="jelly:util"
- xmlns:deploy="deploy"
- xmlns:ant="jelly:ant">
-
- <preGoal name="itest:compile">
- <u:file var="file" name="${maven.itest.src}"/>
- <j:if test="${!file.exists()}">
- <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
- </j:if>
- </preGoal>
-
-<!-- run the schema compiler -->
- <preGoal name="test:compile">
- <!--<j:if test="context.getVariable('maven.test.skip') != 'true'}">-->
-
- <j:set var="compiled.classes.dir" value="target/classes"/>
- <!-- Theres got to be a better way to do this -->
- <j:set var="schema.source.dir" value="test-resources/xsd"/>
- <j:set var="testsuite.source.dir" value="test-resources/testsuite"/>
- <j:set var="schema.output.base.dir" value="target/schema"/>
- <j:set var="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
- <j:set var="schema.generated.classes.dir" value="${schema.output.base.dir}/classes"/>
- <!-- make the dirs -->
- <mkdir dir="${schema.output.base.dir}"/>
- <mkdir dir="${schema.generated.src.dir}"/>
- <mkdir dir="${schema.generated.classes.dir}"/>
- <!-- Run schema compiler with designated schemas -->
- <ant:echo>Compiling simple_maxOccurs2.xsd</ant:echo>
- <!-- simple max occurs 2 xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs2.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <ant:echo>Compiling anonymous_complexType.xsd</ant:echo>
- <!-- anon complex type xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/anonymous_complexType.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- anon choice xsd -->
- <ant:echo>Compiling simple_choice.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- anon particle all xsd -->
- <ant:echo>Compiling simple_particle_all.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_particle_all.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- simple max occurs xsd -->
- <ant:echo>Compiling simple_maxOccurs.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- simple any type xsd -->
- <ant:echo>Compiling simple_anytype.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_anytype.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
-
- <!-- min occurs 0 xsd -->
- <ant:echo>Compiling simple-minoccurs0.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple-minoccurs0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- complex min occurs 0 xsd -->
- <ant:echo>Compiling complex-minoccurs0.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/complex-minoccurs0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <ant:echo>Compiling simple-recursive-datatypes.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple-recursive-datatypes.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <ant:echo>Compiling mixed_minoccus0.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/mixed_minoccus0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple primitive types xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple/simpleType-All.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- All simple derived types xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/derived/derivedType-All.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling complete.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/complete.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- Compile the generated classes -->
- <javac destdir="${schema.generated.classes.dir}" srcdir="${schema.generated.src.dir}">
- <classpath refid="maven.dependency.classpath"></classpath>
- <classpath location="${compiled.classes.dir}"></classpath>
- </javac>
-
- <ant:path id="schema.generated.classes.dir" location="${schema.generated.classes.dir}"/>
- <maven:addPath id="maven.dependency.classpath" refid="schema.generated.classes.dir"/>
- <!--</j:if>-->
- </preGoal>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+
+<!-- run the schema compiler -->
+ <preGoal name="test:compile">
+ <!--<j:if test="context.getVariable('maven.test.skip') != 'true'}">-->
+
+ <j:set var="compiled.classes.dir" value="target/classes"/>
+ <!-- Theres got to be a better way to do this -->
+ <j:set var="schema.source.dir" value="test-resources/xsd"/>
+ <j:set var="testsuite.source.dir" value="test-resources/testsuite"/>
+ <j:set var="schema.output.base.dir" value="target/schema"/>
+ <j:set var="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
+ <j:set var="schema.generated.classes.dir" value="${schema.output.base.dir}/classes"/>
+ <!-- make the dirs -->
+ <mkdir dir="${schema.output.base.dir}"/>
+ <mkdir dir="${schema.generated.src.dir}"/>
+ <mkdir dir="${schema.generated.classes.dir}"/>
+ <!-- Run schema compiler with designated schemas -->
+ <ant:echo>Compiling simple_maxOccurs2.xsd</ant:echo>
+ <!-- simple max occurs 2 xsd -->
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple_maxOccurs2.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <ant:echo>Compiling anonymous_complexType.xsd</ant:echo>
+ <!-- anon complex type xsd -->
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/anonymous_complexType.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <!-- anon choice xsd -->
+ <ant:echo>Compiling simple_choice.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple_choice.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <!-- anon particle all xsd -->
+ <ant:echo>Compiling simple_particle_all.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple_particle_all.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <!-- simple max occurs xsd -->
+ <ant:echo>Compiling simple_maxOccurs.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple_maxOccurs.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+
+ <!-- simple any type xsd -->
+ <ant:echo>Compiling simple_anytype.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple_anytype.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+
+
+ <!-- min occurs 0 xsd -->
+ <ant:echo>Compiling simple-minoccurs0.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple-minoccurs0.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+
+ <!-- complex min occurs 0 xsd -->
+ <ant:echo>Compiling complex-minoccurs0.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/complex-minoccurs0.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+
+ <ant:echo>Compiling simple-recursive-datatypes.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple-recursive-datatypes.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+
+ <ant:echo>Compiling mixed_minoccus0.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/mixed_minoccus0.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <!-- ################################################################### -->
+ <!-- All simple primitive types xsd -->
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/simple/simpleType-All.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+
+ <!-- All simple derived types xsd -->
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${schema.source.dir}/derived/derivedType-All.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <!-- ################################################################### -->
+ <!-- All simple derived types xsd -->
+ <ant:echo>Compiling complete.xsd</ant:echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${testsuite.source.dir}/complete.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <!-- ################################################################### -->
+ <!-- Compile the generated classes -->
+ <javac destdir="${schema.generated.classes.dir}" srcdir="${schema.generated.src.dir}">
+ <classpath refid="maven.dependency.classpath"></classpath>
+ <classpath location="${compiled.classes.dir}"></classpath>
+ </javac>
+
+ <ant:path id="schema.generated.classes.dir" location="${schema.generated.classes.dir}"/>
+ <maven:addPath id="maven.dependency.classpath" refid="schema.generated.classes.dir"/>
+ <!--</j:if>-->
+ </preGoal>
+</project>
Modified: webservices/axis2/branches/java/new-trunk/modules/adb/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/adb/maven.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/adb/maven.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/adb/maven.xml Wed Nov 15 10:15:56 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:maven="jelly:maven"
- xmlns:util="jelly:util"
- xmlns:deploy="deploy"
- xmlns:ant="jelly:ant">
-
- <preGoal name="itest:compile">
- <u:file var="file" name="${maven.itest.src}"/>
- <j:if test="${!file.exists()}">
- <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
- </j:if>
- </preGoal>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+</project>
Modified: webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml Wed Nov 15 10:15:56 2006
@@ -1,53 +1,53 @@
-<!--
- Copyright 2004,2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsa="http://www.w3.org/2005/08/addressing">
- <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
- uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
- <wsa:From soapenv:mustUnderstand="0">
- <wsa:Address>
- http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
- </wsa:From>
- <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
- <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
- <wsa:ReplyTo>
- <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
- <wsa:ReferenceParameters>
- <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
- <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
- </wsa:ReferenceParameters>
- </wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:FaultTo>
- <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
- </wsa:FaultTo>
- </soapenv:Header>
- <soapenv:Body>
- <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:ns1="http://localhost:8081/axis/services/BankPort">
- <accountNo href="#id0"/>
- </ns1:getBalance>
- <multiRef id="id0" soapenc:root="0"
- soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
- 1001</multiRef>
- </soapenv:Body>
-</soapenv:Envelope>
+<!--
+ Copyright 2004,2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing">
+ <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
+ <wsa:MessageID soapenv:mustUnderstand="0">
+ uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
+ <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:From soapenv:mustUnderstand="0">
+ <wsa:Address>
+ http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
+ </wsa:From>
+ <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
+ <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
+ <wsa:ReplyTo>
+ <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
+ <wsa:ReferenceParameters>
+ <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
+ <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
+ </wsa:ReferenceParameters>
+ </wsa:ReplyTo>
+ <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:FaultTo>
+ <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
+ </wsa:FaultTo>
+ </soapenv:Header>
+ <soapenv:Body>
+ <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:ns1="http://localhost:8081/axis/services/BankPort">
+ <accountNo href="#id0"/>
+ </ns1:getBalance>
+ <multiRef id="id0" soapenc:root="0"
+ soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ 1001</multiRef>
+ </soapenv:Body>
+</soapenv:Envelope>
Modified: webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml Wed Nov 15 10:15:56 2006
@@ -1,55 +1,55 @@
-<!--
- Copyright 2004,2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsa="http://www.w3.org/2005/08/addressing">
- <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
- uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
- <wsa:From soapenv:mustUnderstand="0">
- <wsa:Address>
- http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
- </wsa:From>
- <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
- <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
- <wsa:ReplyTo>
- <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
- <wsa:ReferenceParameters>
- <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
- <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
- </wsa:ReferenceParameters>
- </wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:FaultTo>
- <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
- </wsa:FaultTo>
- <wsa:FaultTo>
- <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
- </wsa:FaultTo>
- </soapenv:Header>
- <soapenv:Body>
- <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:ns1="http://localhost:8081/axis/services/BankPort">
- <accountNo href="#id0"/>
- </ns1:getBalance>
- <multiRef id="id0" soapenc:root="0"
- soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
- 1001</multiRef>
- </soapenv:Body>
-</soapenv:Envelope>
+<!--
+ Copyright 2004,2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing">
+ <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
+ <wsa:MessageID soapenv:mustUnderstand="0">
+ uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
+ <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:From soapenv:mustUnderstand="0">
+ <wsa:Address>
+ http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
+ </wsa:From>
+ <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
+ <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
+ <wsa:ReplyTo>
+ <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
+ <wsa:ReferenceParameters>
+ <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
+ <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
+ </wsa:ReferenceParameters>
+ </wsa:ReplyTo>
+ <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:FaultTo>
+ <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
+ </wsa:FaultTo>
+ <wsa:FaultTo>
+ <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
+ </wsa:FaultTo>
+ </soapenv:Header>
+ <soapenv:Body>
+ <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:ns1="http://localhost:8081/axis/services/BankPort">
+ <accountNo href="#id0"/>
+ </ns1:getBalance>
+ <multiRef id="id0" soapenc:root="0"
+ soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ 1001</multiRef>
+ </soapenv:Body>
+</soapenv:Envelope>
Modified: webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml Wed Nov 15 10:15:56 2006
@@ -1,56 +1,56 @@
-<!--
- Copyright 2004,2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsa="http://www.w3.org/2005/08/addressing">
- <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
- uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
- <wsa:From soapenv:mustUnderstand="0">
- <wsa:Address>
- http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
- </wsa:From>
- <wsa:From soapenv:mustUnderstand="0">
- <wsa:Address>
- http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
- </wsa:From>
- <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
- <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
- <wsa:ReplyTo>
- <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
- <wsa:ReferenceParameters>
- <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
- <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
- </wsa:ReferenceParameters>
- </wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:FaultTo>
- <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
- </wsa:FaultTo>
- </soapenv:Header>
- <soapenv:Body>
- <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:ns1="http://localhost:8081/axis/services/BankPort">
- <accountNo href="#id0"/>
- </ns1:getBalance>
- <multiRef id="id0" soapenc:root="0"
- soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
- 1001</multiRef>
- </soapenv:Body>
-</soapenv:Envelope>
+<!--
+ Copyright 2004,2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing">
+ <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
+ <wsa:MessageID soapenv:mustUnderstand="0">
+ uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
+ <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:From soapenv:mustUnderstand="0">
+ <wsa:Address>
+ http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
+ </wsa:From>
+ <wsa:From soapenv:mustUnderstand="0">
+ <wsa:Address>
+ http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
+ </wsa:From>
+ <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
+ <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
+ <wsa:ReplyTo>
+ <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
+ <wsa:ReferenceParameters>
+ <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
+ <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
+ </wsa:ReferenceParameters>
+ </wsa:ReplyTo>
+ <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:FaultTo>
+ <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
+ </wsa:FaultTo>
+ </soapenv:Header>
+ <soapenv:Body>
+ <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:ns1="http://localhost:8081/axis/services/BankPort">
+ <accountNo href="#id0"/>
+ </ns1:getBalance>
+ <multiRef id="id0" soapenc:root="0"
+ soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ 1001</multiRef>
+ </soapenv:Body>
+</soapenv:Envelope>
Modified: webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml Wed Nov 15 10:15:56 2006
@@ -1,54 +1,54 @@
-<!--
- Copyright 2004,2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsa="http://www.w3.org/2005/08/addressing">
- <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
- uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:MessageID soapenv:mustUnderstand="0">
- uuid:820C5190-0B8F-11D9-8DDD-F67EDEEBF7Z6</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
- <wsa:From soapenv:mustUnderstand="0">
- <wsa:Address>
- http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
- </wsa:From>
- <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
- <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
- <wsa:ReplyTo>
- <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
- <wsa:ReferenceParameters>
- <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
- <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
- </wsa:ReferenceParameters>
- </wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:FaultTo>
- <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
- </wsa:FaultTo>
- </soapenv:Header>
- <soapenv:Body>
- <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:ns1="http://localhost:8081/axis/services/BankPort">
- <accountNo href="#id0"/>
- </ns1:getBalance>
- <multiRef id="id0" soapenc:root="0"
- soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
- 1001</multiRef>
- </soapenv:Body>
-</soapenv:Envelope>
+<!--
+ Copyright 2004,2005 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing">
+ <soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
+ <wsa:MessageID soapenv:mustUnderstand="0">
+ uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
+ <wsa:MessageID soapenv:mustUnderstand="0">
+ uuid:820C5190-0B8F-11D9-8DDD-F67EDEEBF7Z6</wsa:MessageID>
+ <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:From soapenv:mustUnderstand="0">
+ <wsa:Address>
+ http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
+ </wsa:From>
+ <axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
+ <axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
+ <wsa:ReplyTo>
+ <wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
+ <wsa:ReferenceParameters>
+ <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>
+ <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
+ </wsa:ReferenceParameters>
+ </wsa:ReplyTo>
+ <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:FaultTo>
+ <wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
+ </wsa:FaultTo>
+ </soapenv:Header>
+ <soapenv:Body>
+ <ns1:getBalance soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:ns1="http://localhost:8081/axis/services/BankPort">
+ <accountNo href="#id0"/>
+ </ns1:getBalance>
+ <multiRef id="id0" soapenc:root="0"
+ soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xsi:type="xsd:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+ 1001</multiRef>
+ </soapenv:Body>
+</soapenv:Envelope>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org