You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/01/04 16:12:36 UTC
svn commit: r365926 - in /webservices/axis2/trunk/java: ./ modules/adb/
modules/codegen/ modules/common/ modules/integration/
modules/integration/src/test/interop/sun/round4/complex/
modules/integration/src/test/interop/whitemesa/round2/util/ modules/i...
Author: dims
Date: Wed Jan 4 07:12:20 2006
New Revision: 365926
URL: http://svn.apache.org/viewcvs?rev=365926&view=rev
Log:
fix line endings and tabs
Modified:
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/adb/maven.xml
webservices/axis2/trunk/java/modules/adb/project.xml
webservices/axis2/trunk/java/modules/codegen/project.xml
webservices/axis2/trunk/java/modules/common/project.xml
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/SunGroupHClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAP12TestClient.java
webservices/axis2/trunk/java/modules/jaxws/maven.xml
webservices/axis2/trunk/java/modules/jaxws/project.xml
webservices/axis2/trunk/java/modules/samples/maven.xml
webservices/axis2/trunk/java/modules/security/maven.xml
webservices/axis2/trunk/java/modules/wsdl/project.xml
webservices/axis2/trunk/java/modules/xml/project.xml
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Wed Jan 4 07:12:20 2006
@@ -36,10 +36,10 @@
| build the war with the default samples
|
| dist-src
- | Source Distribution
+ | Source Distribution
|
| dist-bin
- | Binary Distribution
+ | Binary Distribution
|
-->
@@ -308,6 +308,10 @@
<goal name="all-tests">
<modules:reactor goals="jar:install,test,itest"/>
+ </goal>
+
+ <goal name="cleanse-sources">
+ <modules:reactor goals="cleanse-sources"/>
</goal>
<goal name="clover">
Modified: webservices/axis2/trunk/java/modules/adb/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/maven.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/maven.xml Wed Jan 4 07:12:20 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/trunk/java/modules/adb/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/project.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/project.xml Wed Jan 4 07:12:20 2006
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2001-2004 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.
- */
- -->
-<project>
- <pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
-
- <id>axis2-adb</id>
- <name>Apache Axis 2.0 - Data Binding</name>
- <groupId>axis2</groupId>
- <description>Axis2 Data Binding module</description>
-
- <dependencies>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-xml</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo.spec.activation.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xbean.version}</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- <version>${stax.impl.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>${xmlunit.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- </dependencies>
-
- <reports/>
- <!-- add the build properties-->
- <build>
- <resources>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- <include>**/*.xsd</include>
- </includes>
- </resource>
- </resources>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 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.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <id>axis2-adb</id>
+ <name>Apache Axis 2.0 - Data Binding</name>
+ <groupId>axis2</groupId>
+ <description>Axis2 Data Binding module</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-xml</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-wsdl</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>${geronimo.spec.activation.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xbean.version}</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>${stax.impl.groupid}</groupId>
+ <artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>${xmlunit.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+
+ <reports/>
+ <!-- add the build properties-->
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.xsd</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/codegen/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/project.xml Wed Jan 4 07:12:20 2006
@@ -160,7 +160,7 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
+ <dependency>
<groupId>ws-commons</groupId>
<artifactId>ws-policy</artifactId>
<version>${ws_policy.version}</version>
Modified: webservices/axis2/trunk/java/modules/common/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/project.xml (original)
+++ webservices/axis2/trunk/java/modules/common/project.xml Wed Jan 4 07:12:20 2006
@@ -55,14 +55,14 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
<dependency>
<groupId>maven-itest-plugin</groupId>
<artifactId>maven-itest-plugin</artifactId>
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Jan 4 07:12:20 2006
@@ -81,9 +81,9 @@
<copy file="../addressing/target/addressing.mar"
tofile="target/groovyRepo/modules/addressing.mar"/>
- <!--Axis2 repositories for WS-Security interop tests -->
+ <!--Axis2 repositories for WS-Security interop tests -->
- <!-- A default repository with security and addressing modules -->
+ <!-- A default repository with security and addressing modules -->
<mkdir dir="target/test-resources/default_security_client_repo"/>
<mkdir dir="target/test-resources/default_security_client_repo/modules"/>
<copy file="../security/target/security.mar"
@@ -91,7 +91,7 @@
<copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/default_security_client_repo/modules/addressing.mar"/>
- <!-- Scenario 1 -->
+ <!-- Scenario 1 -->
<mkdir dir="target/test-resources/scenario1_client_repo"/>
<mkdir dir="target/test-resources/scenario1_client_repo/modules"/>
<mkdir dir="target/test-resources/scenario1_client_repo/services"/>
@@ -100,33 +100,33 @@
<mkdir dir="target/test-resources/scenario1_service_repo/services"/>
<mkdir dir="target/test-resources/scenario1_service_repo/modules"/>
- <!-- setup scenario 1 client repository-->
+ <!-- setup scenario 1 client repository-->
<copy file="test-resources/security/s1.client.axis2.xml"
tofile="target/test-resources/scenario1_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario1_client_repo/modules/security.mar"/>
- <!-- This is to add the PWCallback in to the classpath for the client to pick
- the password callback class.
- -->
- <ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
+ <!-- This is to add the PWCallback in to the classpath for the client to pick
+ the password callback class.
+ -->
+ <ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
<maven:addPath id="maven.dependency.classpath" refid="sec.interop.service.jar"/>
- <!-- setup scenario 1 service repository-->
+ <!-- setup scenario 1 service repository-->
<copy file="test-resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s1.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s1.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 2 -->
+ <!-- Scenario 2 -->
<mkdir dir="target/test-resources/scenario2_client_repo"/>
<mkdir dir="target/test-resources/scenario2_client_repo/modules"/>
@@ -134,27 +134,27 @@
<mkdir dir="target/test-resources/scenario2_service_repo/services"/>
<mkdir dir="target/test-resources/scenario2_service_repo/modules"/>
- <!-- setup scenario 2 client repository-->
+ <!-- setup scenario 2 client repository-->
<copy file="test-resources/security/s2.client.axis2.xml"
tofile="target/test-resources/scenario2_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2_client_repo/modules/security.mar"/>
- <!-- setup scenario 2 service repository-->
+ <!-- setup scenario 2 service repository-->
<copy file="test-resources/security/s2.service.axis2.xml"
tofile="target/test-resources/scenario2_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s2.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s2.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 2a -->
+ <!-- Scenario 2a -->
<mkdir dir="target/test-resources/scenario2a_client_repo"/>
<mkdir dir="target/test-resources/scenario2a_client_repo/modules"/>
@@ -162,27 +162,27 @@
<mkdir dir="target/test-resources/scenario2a_service_repo/services"/>
<mkdir dir="target/test-resources/scenario2a_service_repo/modules"/>
- <!-- setup scenario 2a client repository-->
+ <!-- setup scenario 2a client repository-->
<copy file="test-resources/security/s2a.client.axis2.xml"
tofile="target/test-resources/scenario2a_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2a_client_repo/modules/security.mar"/>
- <!-- setup scenario 2a service repository-->
+ <!-- setup scenario 2a service repository-->
<copy file="test-resources/security/s2a.service.axis2.xml"
tofile="target/test-resources/scenario2a_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s2a.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s2a.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 3 -->
+ <!-- Scenario 3 -->
<mkdir dir="target/test-resources/scenario3_client_repo"/>
<mkdir dir="target/test-resources/scenario3_client_repo/modules"/>
@@ -190,28 +190,28 @@
<mkdir dir="target/test-resources/scenario3_service_repo/services"/>
<mkdir dir="target/test-resources/scenario3_service_repo/modules"/>
- <!-- setup scenario 3 client repository-->
+ <!-- setup scenario 3 client repository-->
<copy file="test-resources/security/s3.client.axis2.xml"
tofile="target/test-resources/scenario3_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario3_client_repo/modules/security.mar"/>
- <!-- setup scenario 3 service repository-->
+ <!-- setup scenario 3 service repository-->
<copy file="test-resources/security/s3.service.axis2.xml"
tofile="target/test-resources/scenario3_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s3.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s3.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 4 -->
+ <!-- Scenario 4 -->
<mkdir dir="target/test-resources/scenario4_client_repo"/>
<mkdir dir="target/test-resources/scenario4_client_repo/modules"/>
@@ -219,28 +219,28 @@
<mkdir dir="target/test-resources/scenario4_service_repo/services"/>
<mkdir dir="target/test-resources/scenario4_service_repo/modules"/>
- <!-- setup scenario 4 client repository-->
+ <!-- setup scenario 4 client repository-->
<copy file="test-resources/security/s4.client.axis2.xml"
tofile="target/test-resources/scenario4_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario4_client_repo/modules/security.mar"/>
- <!-- setup scenario 4 service repository-->
+ <!-- setup scenario 4 service repository-->
<copy file="test-resources/security/s4.service.axis2.xml"
tofile="target/test-resources/scenario4_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario4_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s4.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s4.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 5 -->
+ <!-- Scenario 5 -->
<mkdir dir="target/test-resources/scenario5_client_repo"/>
<mkdir dir="target/test-resources/scenario5_client_repo/modules"/>
@@ -248,28 +248,28 @@
<mkdir dir="target/test-resources/scenario5_service_repo/services"/>
<mkdir dir="target/test-resources/scenario5_service_repo/modules"/>
- <!-- setup scenario 5 client repository-->
+ <!-- setup scenario 5 client repository-->
<copy file="test-resources/security/s5.client.axis2.xml"
tofile="target/test-resources/scenario5_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario5_client_repo/modules/security.mar"/>
- <!-- setup scenario 5 service repository-->
+ <!-- setup scenario 5 service repository-->
<copy file="test-resources/security/s5.service.axis2.xml"
tofile="target/test-resources/scenario5_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s5.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s5.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 6 -->
+ <!-- Scenario 6 -->
<mkdir dir="target/test-resources/scenario6_client_repo"/>
<mkdir dir="target/test-resources/scenario6_client_repo/modules"/>
@@ -277,28 +277,28 @@
<mkdir dir="target/test-resources/scenario6_service_repo/services"/>
<mkdir dir="target/test-resources/scenario6_service_repo/modules"/>
- <!-- setup scenario 6 client repository-->
+ <!-- setup scenario 6 client repository-->
<copy file="test-resources/security/s6.client.axis2.xml"
tofile="target/test-resources/scenario6_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario6_client_repo/modules/security.mar"/>
- <!-- setup scenario 6 service repository-->
+ <!-- setup scenario 6 service repository-->
<copy file="test-resources/security/s6.service.axis2.xml"
tofile="target/test-resources/scenario6_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s6.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s6.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Scenario 7 -->
+ <!-- Scenario 7 -->
<mkdir dir="target/test-resources/scenario7_client_repo"/>
<mkdir dir="target/test-resources/scenario7_client_repo/modules"/>
@@ -306,34 +306,34 @@
<mkdir dir="target/test-resources/scenario7_service_repo/services"/>
<mkdir dir="target/test-resources/scenario7_service_repo/modules"/>
- <!-- setup scenario 7 client repository-->
+ <!-- setup scenario 7 client repository-->
<copy file="test-resources/security/s7.client.axis2.xml"
tofile="target/test-resources/scenario7_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario7_client_repo/modules/security.mar"/>
- <!-- setup scenario 7 service repository-->
+ <!-- setup scenario 7 service repository-->
<copy file="test-resources/security/s7.service.axis2.xml"
tofile="target/test-resources/scenario7_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s7.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s7.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Copying the DOM3 stuff to the endorsed dir -->
+ <!-- Copying the DOM3 stuff to the endorsed dir -->
<mkdir dir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/test-resources/endorsed"/>
+ <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/test-resources/endorsed"/>
+ <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/test-resources/endorsed"/>
- <!-- Scenario ST1 -->
+ <!-- Scenario ST1 -->
<mkdir dir="target/test-resources/scenarioST1_client_repo"/>
<mkdir dir="target/test-resources/scenarioST1_client_repo/modules"/>
@@ -341,28 +341,28 @@
<mkdir dir="target/test-resources/scenarioST1_service_repo/services"/>
<mkdir dir="target/test-resources/scenarioST1_service_repo/modules"/>
- <!-- setup scenario ST1 client repository-->
+ <!-- setup scenario ST1 client repository-->
<copy file="test-resources/security/sST1.client.axis2.xml"
tofile="target/test-resources/scenarioST1_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenarioST1_client_repo/modules/security.mar"/>
- <!-- setup scenario ST1 service repository-->
+ <!-- setup scenario ST1 service repository-->
<copy file="test-resources/security/sST1.service.axis2.xml"
tofile="target/test-resources/scenarioST1_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenarioST1_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/sST1.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/sST1.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- MTOM Optimized Security Test -->
+ <!-- MTOM Optimized Security Test -->
<mkdir dir="target/test-resources/mtom_sec_client_repo"/>
<mkdir dir="target/test-resources/mtom_sec_client_repo/modules"/>
@@ -370,29 +370,29 @@
<mkdir dir="target/test-resources/mtom_sec_service_repo/services"/>
<mkdir dir="target/test-resources/mtom_sec_service_repo/modules"/>
- <!-- MTOM Optimized Security Test client repository-->
+ <!-- MTOM Optimized Security Test client repository-->
<copy file="test-resources/security/secMtom.client.axis2.xml"
tofile="target/test-resources/mtom_sec_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/mtom_sec_client_repo/modules/security.mar"/>
- <!-- MTOM Optimized Security Test service repository-->
+ <!-- MTOM Optimized Security Test service repository-->
<copy file="test-resources/security/secMtom.service.axis2.xml"
tofile="target/test-resources/mtom_sec_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/mtom_sec_service_repo/modules/security.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/secMtom.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/secMtom.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
- <!-- Test with addressing and MTOM -->
+ <!-- Test with addressing and MTOM -->
<mkdir dir="target/test-resources/complete_client_repo"/>
<mkdir dir="target/test-resources/complete_client_repo/modules"/>
@@ -400,7 +400,7 @@
<mkdir dir="target/test-resources/complete_service_repo/services"/>
<mkdir dir="target/test-resources/complete_service_repo/modules"/>
- <!-- Test with addressing and MTOM client repository-->
+ <!-- Test with addressing and MTOM client repository-->
<copy file="test-resources/security/complete.client.axis2.xml"
tofile="target/test-resources/complete_client_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
@@ -408,7 +408,7 @@
<copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/complete_client_repo/modules/addressing.mar"/>
- <!-- Test with addressing and MTOMservice repository-->
+ <!-- Test with addressing and MTOMservice repository-->
<copy file="test-resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/axis2.xml"/>
<copy file="../security/target/security.mar"
@@ -416,13 +416,13 @@
<copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing.mar"/>
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/complete.service.xml"
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/complete.service.xml"
tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes" />
@@ -447,7 +447,7 @@
</postGoal>
<goal name="mail-tests">
- <!-- TODO call the Mail tests if the mail jar is presents
+ <!-- TODO call the Mail tests if the mail jar is presents
<j:if test="${maven.repo.local}/j2ee/jars/mail.jar">
<ant:ant antfile="script/mail-test.xml" inheritall="true" inheritrefs="true" dir="."/>
</j:if>
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Wed Jan 4 07:12:20 2006
@@ -358,7 +358,7 @@
<include>**/*.jpg</include>
</includes>
</resource>
- <resource>
+ <resource>
<directory>test</directory>
<includes>
<include>**/*.bin</include>
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/SunGroupHClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/SunGroupHClientUtil.java?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/SunGroupHClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/SunGroupHClientUtil.java Wed Jan 4 07:12:20 2006
@@ -21,4 +21,4 @@
public interface SunGroupHClientUtil {
OMElement getEchoOMElement();
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java Wed Jan 4 07:12:20 2006
@@ -73,12 +73,12 @@
}
/**
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:m0="http://schemas.xmlsoap.org/soap/encoding/">
- <SOAP-ENV:Body>
- <m:echo2DStringArray xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <input2DStringArray xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="m0:string[1]">
- <m0:item0 xsi:type="m0:string" id="" href=""/>
- </input2DStringArray>
- </m:echo2DStringArray>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Body>
+ <m:echo2DStringArray xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <input2DStringArray xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="m0:string[1]">
+ <m0:item0 xsi:type="m0:string" id="" href=""/>
+ </input2DStringArray>
+ </m:echo2DStringArray>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java Wed Jan 4 07:12:20 2006
@@ -82,19 +82,19 @@
}
/**
* <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:m0="http://soapinterop.org/echoheader/" xmlns:m1="http://soapinterop.org/xsd">
- <SOAP-ENV:Header>
- <echoMeStringRequest xsi:type="xsd:string">String</echoMeStringRequest>
- <m0:echoMeStructRequest xsi:type="m1:SOAPStruct">
- <varString xsi:type="xsd:string">String</varString>
- <varInt xsi:type="xsd:int">0</varInt>
- <varFloat xsi:type="xsd:float">3.14159E0</varFloat>
- </m0:echoMeStructRequest>
- </SOAP-ENV:Header>
- <SOAP-ENV:Body>
- <m:echoString xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <inputString xsi:type="xsd:string">String</inputString>
- </m:echoString>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Header>
+ <echoMeStringRequest xsi:type="xsd:string">String</echoMeStringRequest>
+ <m0:echoMeStructRequest xsi:type="m1:SOAPStruct">
+ <varString xsi:type="xsd:string">String</varString>
+ <varInt xsi:type="xsd:int">0</varInt>
+ <varFloat xsi:type="xsd:float">3.14159E0</varFloat>
+ </m0:echoMeStructRequest>
+ </SOAP-ENV:Header>
+ <SOAP-ENV:Body>
+ <m:echoString xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <inputString xsi:type="xsd:string">String</inputString>
+ </m:echoString>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java Wed Jan 4 07:12:20 2006
@@ -80,10 +80,10 @@
/**
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <SOAP-ENV:Body>
- <m:echoHexBinary xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <inputHexBinary xsi:type="xsd:hexBinary">41394644363445313243</inputHexBinary>
- </m:echoHexBinary>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Body>
+ <m:echoHexBinary xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <inputHexBinary xsi:type="xsd:hexBinary">41394644363445313243</inputHexBinary>
+ </m:echoHexBinary>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java Wed Jan 4 07:12:20 2006
@@ -54,9 +54,9 @@
}
/**
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <SOAP-ENV:Body>
- <m:echoBase64 xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <inputBase64 xsi:type="xsd:base64Binary">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</inputBase64>
- </m:echoBase64>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Body>
+ <m:echoBase64 xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <inputBase64 xsi:type="xsd:base64Binary">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</inputBase64>
+ </m:echoBase64>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAP12TestClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAP12TestClient.java?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAP12TestClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAP12TestClient.java Wed Jan 4 07:12:20 2006
@@ -85,4 +85,4 @@
return null;
}
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/java/modules/jaxws/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/jaxws/maven.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/maven.xml Wed Jan 4 07:12:20 2006
@@ -1,17 +1,17 @@
-<?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: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"?>
+
+<!-- $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: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/trunk/java/modules/jaxws/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/jaxws/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/project.xml Wed Jan 4 07:12:20 2006
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2001-2004 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.
- */
- -->
-<project>
- <pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
-
- <name>Apache Axis 2.0 - JAXWS</name>
- <id>axis2-jaxws</id>
- <groupId>axis2</groupId>
- <description>Axis2 JAXWS implementation</description>
-
- <build>
- <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
-
- <resources>
- <resource>
- <directory>${basedir}/test-resources</directory>
- </resource>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-xml</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <!-- external JARs -->
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- <version>${stax.impl.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo.spec.activation.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
- </dependencies>
-
- <reports/>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 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.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <name>Apache Axis 2.0 - JAXWS</name>
+ <id>axis2-jaxws</id>
+ <groupId>axis2</groupId>
+ <description>Axis2 JAXWS implementation</description>
+
+ <build>
+ <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/test-resources</directory>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-xml</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>${stax.impl.groupid}</groupId>
+ <artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>${geronimo.spec.activation.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ </dependencies>
+
+ <reports/>
+</project>
Modified: webservices/axis2/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/maven.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/maven.xml Wed Jan 4 07:12:20 2006
@@ -17,7 +17,7 @@
</postGoal>
<goal name="mail-tests">
- <!-- TODO call the Mail tests if the mail jar is presents
+ <!-- TODO call the Mail tests if the mail jar is presents
<j:if test="${maven.repo.local}/j2ee/jars/mail.jar">
<ant:ant antfile="script/mail-test.xml" inheritall="true" inheritrefs="true" dir="."/>
</j:if>
@@ -40,7 +40,7 @@
<attainGoal name="mtomSample"/>
<attainGoal name="groovy"/>
<attainGoal name="securitySample"/>
- <attainGoal name="sgccalculator"/>
+ <attainGoal name="sgccalculator"/>
</goal>
<!-- ================================================================ -->
@@ -118,7 +118,7 @@
<include name="userguide/loggingmodule/**/*.class"/>
</fileset>
</jar>
- <ant:copy file="script/userguide/build.xml" tofile="target/samples/userguide/build.xml"/>
+ <ant:copy file="script/userguide/build.xml" tofile="target/samples/userguide/build.xml"/>
</goal>
<!-- ================================================================ -->
@@ -262,53 +262,53 @@
<!-- ================================================================ -->
<goal name="securitySample">
- <mkdir dir="target/security"/>
- <mkdir dir="target/security/META-INF"/>
-
+ <mkdir dir="target/security"/>
+ <mkdir dir="target/security/META-INF"/>
+
<!-- Create the service archive -->
- <ant:move todir="target/security">
- <ant:fileset dir="target/classes">
+ <ant:move todir="target/security">
+ <ant:fileset dir="target/classes">
<ant:include name="sample/security/*.class"/>
</ant:fileset>
- </ant:move>
- <ant:copy file="src/sample/security/META-INF/services.xml" tofile="target/security/META-INF/services.xml"/>
- <ant:copy file="resources/security/sec.jks" tofile="target/security/sec.jks"/>
- <ant:copy file="resources/security/sec.properties" tofile="target/security/sec.properties"/>
+ </ant:move>
+ <ant:copy file="src/sample/security/META-INF/services.xml" tofile="target/security/META-INF/services.xml"/>
+ <ant:copy file="resources/security/sec.jks" tofile="target/security/sec.jks"/>
+ <ant:copy file="resources/security/sec.properties" tofile="target/security/sec.properties"/>
<jar destfile="target/security/SecureService.aar">
<fileset dir="target/security"></fileset>
</jar>
- <!-- Create a jar to hold the password callback class-->
- <mkdir dir="target/security/secUtil/sample/security/" />
- <ant:copy file="target/security/sample/security/PWCallback.class" toFile="target/security/secUtil/sample/security/PWCallback.class" />
- <ant:copy file="target/security/sample/security/Client.class" toFile="target/security/secUtil/sample/security/Client.class" />
- <ant:copy file="resources/security/sec.jks" tofile="target/security/secUtil/sec.jks"/>
- <ant:copy file="resources/security/sec.properties" tofile="target/security/secUtil/sec.properties"/>
+ <!-- Create a jar to hold the password callback class-->
+ <mkdir dir="target/security/secUtil/sample/security/" />
+ <ant:copy file="target/security/sample/security/PWCallback.class" toFile="target/security/secUtil/sample/security/PWCallback.class" />
+ <ant:copy file="target/security/sample/security/Client.class" toFile="target/security/secUtil/sample/security/Client.class" />
+ <ant:copy file="resources/security/sec.jks" tofile="target/security/secUtil/sec.jks"/>
+ <ant:copy file="resources/security/sec.properties" tofile="target/security/secUtil/sec.properties"/>
<jar destfile="target/security/secUtil.jar">
<fileset dir="target/security/secUtil"></fileset>
</jar>
- <mkdir dir="target/security/client_repo"/>
- <mkdir dir="target/security/client_repo/modules"/>
+ <mkdir dir="target/security/client_repo"/>
+ <mkdir dir="target/security/client_repo/modules"/>
- <ant:copy file="../security/target/modules/security.mar" tofile="target/toWar/modules/security.mar"/>
- <ant:copy file="../addressing/target/modules/addressing.mar" tofile="target/toWar/modules/addressing.mar"/>
+ <ant:copy file="../security/target/modules/security.mar" tofile="target/toWar/modules/security.mar"/>
+ <ant:copy file="../addressing/target/modules/addressing.mar" tofile="target/toWar/modules/addressing.mar"/>
- <!-- Copy the sources and others orver to the target/samples/security-->
- <mkdir dir="target/samples/security/src/sample/security/"/>
- <ant:copy todir="target/samples/security/src/sample/security/">
- <ant:fileset dir="src/sample/security" />
- </ant:copy>
- <mkdir dir="target/security/client_repo/modules"/>
- <ant:copy file="../security/target/modules/security.mar" tofile="target/samples/security/client_repo/modules/security.mar"/>
- <ant:copy file="../addressing/target/modules/addressing.mar" tofile="target/samples/security/client_repo/modules/addressing.mar"/>
- <ant:copy file="resources/security/client.axis2.xml" tofile="target/samples/security/client_repo/axis2.xml"/>
- <ant:copy file="target/security/SecureService.aar" tofile="target/samples/security/SecureService.aar"/>
- <ant:copy file="target/security/secUtil.jar" tofile="target/samples/security/secUtil.jar"/>
- <ant:copy file="resources/security/README.txt" tofile="target/samples/security/README.txt"/>
- <ant:copy file="resources/security/build.xml" tofile="target/samples/security/build.xml"/>
+ <!-- Copy the sources and others orver to the target/samples/security-->
+ <mkdir dir="target/samples/security/src/sample/security/"/>
+ <ant:copy todir="target/samples/security/src/sample/security/">
+ <ant:fileset dir="src/sample/security" />
+ </ant:copy>
+ <mkdir dir="target/security/client_repo/modules"/>
+ <ant:copy file="../security/target/modules/security.mar" tofile="target/samples/security/client_repo/modules/security.mar"/>
+ <ant:copy file="../addressing/target/modules/addressing.mar" tofile="target/samples/security/client_repo/modules/addressing.mar"/>
+ <ant:copy file="resources/security/client.axis2.xml" tofile="target/samples/security/client_repo/axis2.xml"/>
+ <ant:copy file="target/security/SecureService.aar" tofile="target/samples/security/SecureService.aar"/>
+ <ant:copy file="target/security/secUtil.jar" tofile="target/samples/security/secUtil.jar"/>
+ <ant:copy file="resources/security/README.txt" tofile="target/samples/security/README.txt"/>
+ <ant:copy file="resources/security/build.xml" tofile="target/samples/security/build.xml"/>
- <delete dir="target/security/"/>
+ <delete dir="target/security/"/>
</goal>
@@ -332,7 +332,7 @@
<include name="META-INF/**"/>
</fileset>
</jar>
- <copy toDir="${samples.dir}/SGCCalculator"
+ <copy toDir="${samples.dir}/SGCCalculator"
file="script/SGCCalculator/run.bat"/>
<copy toDir="${samples.dir}/SGCCalculator"
file="script/SGCCalculator/run.sh"/>
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Wed Jan 4 07:12:20 2006
@@ -25,13 +25,13 @@
<mkdir dir="target/modules"/>
<mkdir dir="target/modules/lib"/>
- <copy file="${maven.repo.local}/xml-security/jars/xmlsec-1.2.1.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-jdk13-128.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/opensaml/jars/opensaml-1.0.1.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/wss4j/jars/wss4j-SNAPSHOT.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/jaxen/jars/jaxen-1.1-beta-7.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/xml-security/jars/xmlsec-1.2.1.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-jdk13-128.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/opensaml/jars/opensaml-1.0.1.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/wss4j/jars/wss4j-SNAPSHOT.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/jaxen/jars/jaxen-1.1-beta-7.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/classes/lib"/>
<jar jarfile="target/security.mar" basedir="target/classes">
@@ -43,7 +43,7 @@
<preGoal name="java:compile">
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
- <j:set var="interop.dir" value="target/interop"/>
+ <j:set var="interop.dir" value="target/interop"/>
<j:set var="work.dir" value="${interop.dir}/work"/>
<j:set var="class.dir" value="${interop.dir}/classes"/>
@@ -51,55 +51,55 @@
<mkdir dir="${work.dir}"/>
<mkdir dir="${class.dir}"/>
- <!-- Run WSDL2Java -->
+ <!-- Run WSDL2Java -->
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg value="-uri"/>
- <arg file="interop/ping.wsdl"/>
- <arg value="-ss"/>
- <arg value="-o"/>
- <arg file="${work.dir}"/>
- <arg value="-p"/>
- <arg value="org.apache.axis2.oasis.ping"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <arg value="-uri"/>
+ <arg file="interop/ping.wsdl"/>
+ <arg value="-ss"/>
+ <arg value="-o"/>
+ <arg file="${work.dir}"/>
+ <arg value="-p"/>
+ <arg value="org.apache.axis2.oasis.ping"/>
<arg value="-d"/>
- <arg value="xmlbeans"/>
+ <arg value="xmlbeans"/>
<arg value="-g"/>
</java>
- <!-- move/copy schema stuff into class.dir -->
- <ant:move todir="${class.dir}">
+ <!-- move/copy schema stuff into class.dir -->
+ <ant:move todir="${class.dir}">
<ant:fileset dir="${work.dir}/resources">
<ant:include name="**/schema*/**/*.xsb"/>
<ant:include name="**/schema*/**/*.class"/>
</ant:fileset>
- </ant:move>
-
- <!-- copy the service impl -->
- <copy file="interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
- tofile="${work.dir}/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java" overwrite="yes"/>
-
- <!-- Password callback class for the interop service -->
- <copy file="test-resources/PWCallback.java"
- tofile="${work.dir}/src/org/apache/axis2/security/PWCallback.java" overwrite="yes"/>
-
- <!-- Interop client -->
- <copy file="interop/org/apache/axis2/security/InteropScenarioClient.java"
- tofile="${work.dir}/src/org/apache/axis2/security/InteropScenarioClient.java" overwrite="yes"/>
+ </ant:move>
+
+ <!-- copy the service impl -->
+ <copy file="interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
+ tofile="${work.dir}/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java" overwrite="yes"/>
+
+ <!-- Password callback class for the interop service -->
+ <copy file="test-resources/PWCallback.java"
+ tofile="${work.dir}/src/org/apache/axis2/security/PWCallback.java" overwrite="yes"/>
+
+ <!-- Interop client -->
+ <copy file="interop/org/apache/axis2/security/InteropScenarioClient.java"
+ tofile="${work.dir}/src/org/apache/axis2/security/InteropScenarioClient.java" overwrite="yes"/>
- <ant:path id="classes.dir" location="${class.dir}"/>
+ <ant:path id="classes.dir" location="${class.dir}"/>
<maven:addPath id="maven.dependency.classpath" refid="classes.dir"/>
- <ant:path id="src.dir" location="${work.dir}/src"/>
- <maven:addPath id="maven.compile.src.set" refid="src.dir"/>
+ <ant:path id="src.dir" location="${work.dir}/src"/>
+ <maven:addPath id="maven.compile.src.set" refid="src.dir"/>
</j:if>
</preGoal>
- <!--Create the service.aar" -->
+ <!--Create the service.aar" -->
<postGoal name="java:compile">
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
- <!-- move/copy interop classes into class.dir -->
- <ant:move todir="${class.dir}">
+ <!-- move/copy interop classes into class.dir -->
+ <ant:move todir="${class.dir}">
<ant:fileset dir="${basedir}/target/classes">
<ant:include name="**/ping/**/*.class"/>
<ant:include name="**/oasisOpen/**/*.class"/>
@@ -107,7 +107,7 @@
<ant:include name="**/PWCallback.class"/>
</ant:fileset>
- </ant:move>
+ </ant:move>
<delete includeEmptyDirs="true">
<fileset dir="${basedir}/target/classes/org/apache/axis2/oasis/"/>
@@ -115,41 +115,41 @@
<!--<fileset dir="${basedir}/target/classes/org/oasisOpen/"/>-->
</delete>
- <j:set var="interop.dir" value="target/interop"/>
+ <j:set var="interop.dir" value="target/interop"/>
<j:set var="work.dir" value="${interop.dir}/work"/>
<j:set var="class.dir" value="${interop.dir}/classes"/>
- <!-- Create the META-INF directory -->
- <mkdir dir="${class.dir}/META-INF"/>
-
- <!-- copy the services.xml-->
- <copy file="interop/services.xml"
- tofile="${class.dir}/META-INF/services.xml" overwrite="yes"/>
-
-
- <!-- copy axis2.crypto.properties -->
- <copy file="interop/axis2.crypto.properties"
- tofile="${class.dir}/axis2.crypto.properties" overwrite="yes"/>
- <!-- copy axis2.saml.properties -->
- <copy file="interop/axis2.saml.properties"
- tofile="${class.dir}/axis2.saml.properties" overwrite="yes"/>
- <!-- copy axis2.saml3.properties -->
- <copy file="interop/axis2.saml3.properties"
- tofile="${class.dir}/axis2.saml3.properties" overwrite="yes"/>
- <!-- copy axis2.saml4.properties -->
- <copy file="interop/axis2.saml4.properties"
- tofile="${class.dir}/axis2.saml4.properties" overwrite="yes"/>
- <!-- copy x509.PFX.MSFT -->
- <copy file="interop/x509.PFX.MSFT"
- tofile="${class.dir}/x509.PFX.MSFT" overwrite="yes"/>
- <!-- Copy interop.properties-->
- <copy file="interop/interop.properties"
- tofile="${class.dir}/interop.properties" overwrite="yes"/>
- <!-- Copy interop.jks -->
- <copy file="interop/interop2.jks"
- tofile="${class.dir}/interop2.jks" overwrite="yes"/>
-
- <jar jarfile="target/PingPort.aar" basedir="target/interop/classes">
+ <!-- Create the META-INF directory -->
+ <mkdir dir="${class.dir}/META-INF"/>
+
+ <!-- copy the services.xml-->
+ <copy file="interop/services.xml"
+ tofile="${class.dir}/META-INF/services.xml" overwrite="yes"/>
+
+
+ <!-- copy axis2.crypto.properties -->
+ <copy file="interop/axis2.crypto.properties"
+ tofile="${class.dir}/axis2.crypto.properties" overwrite="yes"/>
+ <!-- copy axis2.saml.properties -->
+ <copy file="interop/axis2.saml.properties"
+ tofile="${class.dir}/axis2.saml.properties" overwrite="yes"/>
+ <!-- copy axis2.saml3.properties -->
+ <copy file="interop/axis2.saml3.properties"
+ tofile="${class.dir}/axis2.saml3.properties" overwrite="yes"/>
+ <!-- copy axis2.saml4.properties -->
+ <copy file="interop/axis2.saml4.properties"
+ tofile="${class.dir}/axis2.saml4.properties" overwrite="yes"/>
+ <!-- copy x509.PFX.MSFT -->
+ <copy file="interop/x509.PFX.MSFT"
+ tofile="${class.dir}/x509.PFX.MSFT" overwrite="yes"/>
+ <!-- Copy interop.properties-->
+ <copy file="interop/interop.properties"
+ tofile="${class.dir}/interop.properties" overwrite="yes"/>
+ <!-- Copy interop.jks -->
+ <copy file="interop/interop2.jks"
+ tofile="${class.dir}/interop2.jks" overwrite="yes"/>
+
+ <jar jarfile="target/PingPort.aar" basedir="target/interop/classes">
<include name="**/*"/>
</jar>
</j:if>
Modified: webservices/axis2/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/project.xml (original)
+++ webservices/axis2/trunk/java/modules/wsdl/project.xml Wed Jan 4 07:12:20 2006
@@ -17,88 +17,88 @@
*/
-->
<project>
- <pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
- <name>Apache Axis 2.0 - WSDL</name>
- <id>axis2-wsdl</id>
- <groupId>axis2</groupId>
- <description>WSDL support for Axis 2.0. This includes WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</description>
- <dependencies>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-xml</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <!-- external JARs -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
- <dependency>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+ <name>Apache Axis 2.0 - WSDL</name>
+ <id>axis2-wsdl</id>
+ <groupId>axis2</groupId>
+ <description>WSDL support for Axis 2.0. This includes WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</description>
+ <dependencies>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-xml</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.version}</version>
+ </dependency>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifactid}</artifactId>
<version>${stax.impl.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xbean.version}</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xbean.version}</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
@@ -128,8 +128,8 @@
</properties>
</dependency>
</dependencies>
- <!-- add the build properties-->
- <build>
+ <!-- add the build properties-->
+ <build>
<unitTest>
<excludes>
@@ -141,16 +141,16 @@
</unitTest>
<resources>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- <include>**/*.xsd</include>
- </includes>
- </resource>
- </resources>
- </build>
- <reports/>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.xsd</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <reports/>
</project>
Modified: webservices/axis2/trunk/java/modules/xml/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/project.xml?rev=365926&r1=365925&r2=365926&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/project.xml (original)
+++ webservices/axis2/trunk/java/modules/xml/project.xml Wed Jan 4 07:12:20 2006
@@ -75,7 +75,7 @@
</resource>
</resources>
</build>
-
+
<reports>
<report>maven-junit-report-plugin</report>
</reports>