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/11/15 19:16:07 UTC
svn commit: r475341 [7/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...
Modified: webservices/axis2/branches/java/new-trunk/modules/jibx/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/jibx/maven.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/jibx/maven.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/jibx/maven.xml Wed Nov 15 10:15:56 2006
@@ -1,29 +1,29 @@
-<?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>
-
- <!-- run the JiBX binding compiler after the Java compiler -->
- <preGoal name="test:test">
- <java classname="org.jibx.binding.Compile" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="target/test-classes"/>
- <arg value="test-resources/binding/customer-binding.xml"/>
- <arg value="test-resources/binding/library-binding.xml"/>
- </java>
- </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>
+
+ <!-- run the JiBX binding compiler after the Java compiler -->
+ <preGoal name="test:test">
+ <java classname="org.jibx.binding.Compile" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="target/test-classes"/>
+ <arg value="test-resources/binding/customer-binding.xml"/>
+ <arg value="test-resources/binding/library-binding.xml"/>
+ </java>
+ </preGoal>
+
+</project>
Modified: webservices/axis2/branches/java/new-trunk/modules/jibx/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/jibx/project.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/jibx/project.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/jibx/project.xml Wed Nov 15 10:15:56 2006
@@ -147,14 +147,14 @@
<properties>
<module>true</module>
</properties>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javamail.version}</version>
- <properties>
- <module>true</module>
- </properties>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javamail.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
</dependency>
<dependency>
<groupId>jibx</groupId>
Modified: webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/customer-binding.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/customer-binding.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/customer-binding.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/customer-binding.xml Wed Nov 15 10:15:56 2006
@@ -1,15 +1,15 @@
-<binding>
- <namespace uri="http://ws.apache.org/axis2/jibx/customer/data" default="elements"/>
- <mapping name="customer" class="org.apache.axis2.jibx.Customer">
- <structure name="person" field="person">
- <value name="cust-num" field="customerNumber"/>
- <value name="first-name" field="firstName"/>
- <value name="last-name" field="lastName"/>
- </structure>
- <value name="street" field="street"/>
- <value name="city" field="city"/>
- <value name="state" field="state"/>
- <value name="zip" field="zip"/>
- <value name="phone" field="phone"/>
- </mapping>
-</binding>
+<binding>
+ <namespace uri="http://ws.apache.org/axis2/jibx/customer/data" default="elements"/>
+ <mapping name="customer" class="org.apache.axis2.jibx.Customer">
+ <structure name="person" field="person">
+ <value name="cust-num" field="customerNumber"/>
+ <value name="first-name" field="firstName"/>
+ <value name="last-name" field="lastName"/>
+ </structure>
+ <value name="street" field="street"/>
+ <value name="city" field="city"/>
+ <value name="state" field="state"/>
+ <value name="zip" field="zip"/>
+ <value name="phone" field="phone"/>
+ </mapping>
+</binding>
Modified: webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/library-binding.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/library-binding.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/library-binding.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/binding/library-binding.xml Wed Nov 15 10:15:56 2006
@@ -1,82 +1,82 @@
-<binding add-constructors="true" force-classes="true"
- xmlns:tns="http://ws.sosnoski.com/library/types">
-
- <namespace uri="http://ws.sosnoski.com/library/types" default="elements"/>
-
- <mapping name="getBook"
- class="org.apache.axis2.jibx.wrappers.GetBookRequest">
- <value name="isbn" field="m_isbn"/>
- </mapping>
-
- <mapping name="getBookResponse"
- class="org.apache.axis2.jibx.wrappers.GetBookResponse">
- <structure name="getBookReturn" field="m_book" usage="optional"
- map-as="tns:BookInformation"/>
- </mapping>
-
- <mapping name="getBooksByType"
- class="org.apache.axis2.jibx.wrappers.GetBooksByTypeRequest">
- <value name="type" field="m_type"/>
- </mapping>
-
- <mapping name="getBooksByTypeResponse"
- class="org.apache.axis2.jibx.wrappers.GetBooksByTypeResponse">
- <collection field="m_books" usage="optional">
- <structure name="getBooksByTypeReturn" map-as="tns:BookInformation"/>
- </collection>
- </mapping>
-
- <mapping name="getTypes"
- class="org.apache.axis2.jibx.wrappers.GetTypesRequest"/>
-
- <mapping name="getTypesResponse"
- class="org.apache.axis2.jibx.wrappers.GetTypesResponse">
- <collection field="m_types" usage="optional">
- <structure name="getTypesReturn" map-as="tns:TypeInformation"/>
- </collection>
- </mapping>
-
- <mapping name="addBook"
- class="org.apache.axis2.jibx.wrappers.AddBookRequest">
- <structure field="m_book">
- <value name="type" field="m_type"/>
- <value name="isbn" field="m_isbn"/>
- <collection field="m_authors">
- <value name="author" type="java.lang.String"/>
- </collection>
- <value name="title" field="m_title"/>
- </structure>
- </mapping>
-
- <mapping name="addBookResponse"
- class="org.apache.axis2.jibx.wrappers.AddBookResponse">
- <value name="addBookReturn" field="m_success"/>
- </mapping>
-
- <mapping name="addBookInstance"
- class="org.apache.axis2.jibx.wrappers.AddBookInstanceRequest">
- <structure name="book" field="m_book" map-as="tns:BookInformation"/>
- </mapping>
-
- <mapping name="addBookInstanceResponse"
- class="org.apache.axis2.jibx.wrappers.AddBookInstanceResponse"/>
-
- <mapping abstract="true" class="org.apache.axis2.jibx.beans.Book"
- type-name="tns:BookInformation">
- <namespace prefix="types" uri="http://ws.sosnoski.com/library/types"/>
- <value name="type" style="attribute" field="m_type"/>
- <value name="isbn" style="attribute" field="m_isbn"/>
- <collection field="m_authors">
- <value name="author" type="java.lang.String"/>
- </collection>
- <value name="title" field="m_title"/>
- </mapping>
-
- <mapping abstract="true" class="org.apache.axis2.jibx.beans.Type"
- type-name="tns:TypeInformation">
- <value name="name" style="attribute" field="m_name"/>
- <value name="count" style="attribute" field="m_count"/>
- <value style="text" field="m_description"/>
- </mapping>
-
-</binding>
+<binding add-constructors="true" force-classes="true"
+ xmlns:tns="http://ws.sosnoski.com/library/types">
+
+ <namespace uri="http://ws.sosnoski.com/library/types" default="elements"/>
+
+ <mapping name="getBook"
+ class="org.apache.axis2.jibx.wrappers.GetBookRequest">
+ <value name="isbn" field="m_isbn"/>
+ </mapping>
+
+ <mapping name="getBookResponse"
+ class="org.apache.axis2.jibx.wrappers.GetBookResponse">
+ <structure name="getBookReturn" field="m_book" usage="optional"
+ map-as="tns:BookInformation"/>
+ </mapping>
+
+ <mapping name="getBooksByType"
+ class="org.apache.axis2.jibx.wrappers.GetBooksByTypeRequest">
+ <value name="type" field="m_type"/>
+ </mapping>
+
+ <mapping name="getBooksByTypeResponse"
+ class="org.apache.axis2.jibx.wrappers.GetBooksByTypeResponse">
+ <collection field="m_books" usage="optional">
+ <structure name="getBooksByTypeReturn" map-as="tns:BookInformation"/>
+ </collection>
+ </mapping>
+
+ <mapping name="getTypes"
+ class="org.apache.axis2.jibx.wrappers.GetTypesRequest"/>
+
+ <mapping name="getTypesResponse"
+ class="org.apache.axis2.jibx.wrappers.GetTypesResponse">
+ <collection field="m_types" usage="optional">
+ <structure name="getTypesReturn" map-as="tns:TypeInformation"/>
+ </collection>
+ </mapping>
+
+ <mapping name="addBook"
+ class="org.apache.axis2.jibx.wrappers.AddBookRequest">
+ <structure field="m_book">
+ <value name="type" field="m_type"/>
+ <value name="isbn" field="m_isbn"/>
+ <collection field="m_authors">
+ <value name="author" type="java.lang.String"/>
+ </collection>
+ <value name="title" field="m_title"/>
+ </structure>
+ </mapping>
+
+ <mapping name="addBookResponse"
+ class="org.apache.axis2.jibx.wrappers.AddBookResponse">
+ <value name="addBookReturn" field="m_success"/>
+ </mapping>
+
+ <mapping name="addBookInstance"
+ class="org.apache.axis2.jibx.wrappers.AddBookInstanceRequest">
+ <structure name="book" field="m_book" map-as="tns:BookInformation"/>
+ </mapping>
+
+ <mapping name="addBookInstanceResponse"
+ class="org.apache.axis2.jibx.wrappers.AddBookInstanceResponse"/>
+
+ <mapping abstract="true" class="org.apache.axis2.jibx.beans.Book"
+ type-name="tns:BookInformation">
+ <namespace prefix="types" uri="http://ws.sosnoski.com/library/types"/>
+ <value name="type" style="attribute" field="m_type"/>
+ <value name="isbn" style="attribute" field="m_isbn"/>
+ <collection field="m_authors">
+ <value name="author" type="java.lang.String"/>
+ </collection>
+ <value name="title" field="m_title"/>
+ </mapping>
+
+ <mapping abstract="true" class="org.apache.axis2.jibx.beans.Type"
+ type-name="tns:TypeInformation">
+ <value name="name" style="attribute" field="m_name"/>
+ <value name="count" style="attribute" field="m_count"/>
+ <value style="text" field="m_description"/>
+ </mapping>
+
+</binding>
Modified: webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/xml/customer-data.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/xml/customer-data.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/xml/customer-data.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/jibx/test-resources/xml/customer-data.xml Wed Nov 15 10:15:56 2006
@@ -1,12 +1,12 @@
-<customer>
- <person>
- <cust-num>123456789</cust-num>
- <first-name>John</first-name>
- <last-name>Smith</last-name>
- </person>
- <street>12345 Happy Lane</street>
- <city>Plunk</city>
- <state>WA</state>
- <zip>98059</zip>
- <phone>888.555.1234</phone>
-</customer>
+<customer>
+ <person>
+ <cust-num>123456789</cust-num>
+ <first-name>John</first-name>
+ <last-name>Smith</last-name>
+ </person>
+ <street>12345 Happy Lane</street>
+ <city>Plunk</city>
+ <state>WA</state>
+ <zip>98059</zip>
+ <phone>888.555.1234</phone>
+</customer>
Modified: webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml Wed Nov 15 10:15:56 2006
@@ -1,21 +1,21 @@
-<!--
-/*
- * 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.
- */
- -->
-
+<!--
+/*
+ * 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.
+ */
+ -->
+
<axisconfig name="AxisJava2.0">
<!-- ================================================= -->
<!-- Parameters -->
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/project.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/project.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/project.xml Wed Nov 15 10:15:56 2006
@@ -1,211 +1,211 @@
-<?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 - Rahas</name>
- <id>axis2-rahas</id>
- <groupId>org.apache.axis2</groupId>
- <description>Axis2 : WS-Trust implementation</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- <version>${axiom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-secpolicy</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>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${activation.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>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
- <version>${bcprov.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>${opensaml.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml_apis.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.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>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <!-- For WS-Policy support -->
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>${neethi.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>incubator-woden</groupId>
- <artifactId>woden</artifactId>
- <version>${woden.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- </dependencies>
- <!-- build information for the project -->
- <build>
- <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
- </build>
- <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 - Rahas</name>
+ <id>axis2-rahas</id>
+ <groupId>org.apache.axis2</groupId>
+ <description>Axis2 : WS-Trust implementation</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-secpolicy</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>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.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>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${wss4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${xmlsec.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov</artifactId>
+ <version>${bcprov.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>${opensaml.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>${jaxen.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>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.version}</version>
+ </dependency>
+ <!-- For WS-Policy support -->
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>incubator-woden</groupId>
+ <artifactId>woden</artifactId>
+ <version>${woden.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+ <!-- build information for the project -->
+ <build>
+ <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+ </build>
+ <reports/>
+</project>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/src/META-INF/module.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/src/META-INF/module.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/src/META-INF/module.xml Wed Nov 15 10:15:56 2006
@@ -1,41 +1,41 @@
-<module name="rahas">
- <Description>This module is used to STS enable a service where it adds
- the RequestSecurityToken operation to a service that the module is engaged to</Description>
-
- <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
-
- <operation name="RequestSecurityToken" mep="http://www.w3.org/2004/08/wsdl/in-out">
- <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
-
- <!-- Action mapping to accept SCT requests -->
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
-
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
-
- <parameter name="token-dispatcher-configuration">
- <token-dispatcher-configuration>
- <!-- Issuers. You may have many issuers. -->
- <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
- <configuration type="parameter">sct-issuer-config</configuration>
- <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
- </issuer>
- <issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
- <configuration type="parameter">saml-issuer-config</configuration>
- <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
- </issuer>
-
- <!-- Only a single canceler is allowed -->
- <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
- <configuration type="parameter">token-canceler-config</configuration>
- </canceler>
-
- </token-dispatcher-configuration>
- </parameter>
-
- </operation>
-
-</module>
+<module name="rahas">
+ <Description>This module is used to STS enable a service where it adds
+ the RequestSecurityToken operation to a service that the module is engaged to</Description>
+
+ <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
+
+ <operation name="RequestSecurityToken" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
+
+ <!-- Action mapping to accept SCT requests -->
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
+
+ <parameter name="token-dispatcher-configuration">
+ <token-dispatcher-configuration>
+ <!-- Issuers. You may have many issuers. -->
+ <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
+ <configuration type="parameter">sct-issuer-config</configuration>
+ <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
+ </issuer>
+ <issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
+ <configuration type="parameter">saml-issuer-config</configuration>
+ <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
+ </issuer>
+
+ <!-- Only a single canceler is allowed -->
+ <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
+ <configuration type="parameter">token-canceler-config</configuration>
+ </canceler>
+
+ </token-dispatcher-configuration>
+ </parameter>
+
+ </operation>
+
+</module>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/saml-issuer-config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/saml-issuer-config.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/saml-issuer-config.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/saml-issuer-config.xml Wed Nov 15 10:15:56 2006
@@ -1,46 +1,46 @@
-<saml-issuer-config>
- <issuerName>Test_STS</issuerName>
-
- <!-- alias of the issuer's private key -->
- <issuerKeyAlias>ip</issuerKeyAlias>
-
- <!-- password of the issuer's private key -->
- <issuerKeyPassword>password</issuerKeyPassword>
-
- <cryptoProperties>
- <crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
- <property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</property>
- <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
- </crypto>
- </cryptoProperties>
-
- <timeToLive>300000</timeToLive>
-
- <keySize>256</keySize>
-
- <addRequestedAttachedRef />
- <addRequestedUnattachedRef />
-
- <!--
- Key computation mechanism
- 1 - Use Request Entropy
- 2 - Provide Entropy
- 3 - Use Own Key
- -->
- <keyComputation>2</keyComputation>
-
- <!--
- proofKeyType element is valid only if the keyComputation is set to 3
- i.e. Use Own Key
-
- Valid values are: EncryptedKey & BinarySecret
- -->
- <proofKeyType>BinarySecret</proofKeyType>
-
- <trusted-services>
- <!-- The service name and the alias of the trusted cert to use -->
- <service alias="bob">http://localhost:8080/axis2/services/STS</service>
- </trusted-services>
-
-</saml-issuer-config>
+<saml-issuer-config>
+ <issuerName>Test_STS</issuerName>
+
+ <!-- alias of the issuer's private key -->
+ <issuerKeyAlias>ip</issuerKeyAlias>
+
+ <!-- password of the issuer's private key -->
+ <issuerKeyPassword>password</issuerKeyPassword>
+
+ <cryptoProperties>
+ <crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
+ <property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</property>
+ <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
+ </crypto>
+ </cryptoProperties>
+
+ <timeToLive>300000</timeToLive>
+
+ <keySize>256</keySize>
+
+ <addRequestedAttachedRef />
+ <addRequestedUnattachedRef />
+
+ <!--
+ Key computation mechanism
+ 1 - Use Request Entropy
+ 2 - Provide Entropy
+ 3 - Use Own Key
+ -->
+ <keyComputation>2</keyComputation>
+
+ <!--
+ proofKeyType element is valid only if the keyComputation is set to 3
+ i.e. Use Own Key
+
+ Valid values are: EncryptedKey & BinarySecret
+ -->
+ <proofKeyType>BinarySecret</proofKeyType>
+
+ <trusted-services>
+ <!-- The service name and the alias of the trusted cert to use -->
+ <service alias="bob">http://localhost:8080/axis2/services/STS</service>
+ </trusted-services>
+
+</saml-issuer-config>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/sct-issuer-config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/sct-issuer-config.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/sct-issuer-config.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/sct-issuer-config.xml Wed Nov 15 10:15:56 2006
@@ -1,29 +1,29 @@
-<sct-issuer-config>
-
- <cryptoProperties>
- <crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
- <property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</property>
- <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
- </crypto>
- </cryptoProperties>
-
- <addRequestedAttachedRef />
- <addRequestedUnattachedRef />
-
- <!--
- Key computation mechanism
- 1 - Use Request Entropy
- 2 - Provide Entropy
- 3 - Use Own Key
- -->
- <keyComputation>3</keyComputation>
-
- <!--
- proofKeyType element is valid only if the keyComputation is set to 3
- i.e. Use Own Key
-
- Valid values are: EncryptedKey & BinarySecret
- -->
- <proofKeyType>BinarySecret</proofKeyType>
-</sct-issuer-config>
+<sct-issuer-config>
+
+ <cryptoProperties>
+ <crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
+ <property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</property>
+ <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
+ </crypto>
+ </cryptoProperties>
+
+ <addRequestedAttachedRef />
+ <addRequestedUnattachedRef />
+
+ <!--
+ Key computation mechanism
+ 1 - Use Request Entropy
+ 2 - Provide Entropy
+ 3 - Use Own Key
+ -->
+ <keyComputation>3</keyComputation>
+
+ <!--
+ proofKeyType element is valid only if the keyComputation is set to 3
+ i.e. Use Own Key
+
+ Valid values are: EncryptedKey & BinarySecret
+ -->
+ <proofKeyType>BinarySecret</proofKeyType>
+</sct-issuer-config>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/services.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/services.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/services.xml Wed Nov 15 10:15:56 2006
@@ -1,89 +1,89 @@
-<!-- Security token service configuration -->
-<service name="STS">
-
- <operation name="RequestSecurityToken">
- <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
-
- <!-- Action mapping to accept SCT requests -->
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
-
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
-
- </operation>
-
- <!-- Using the config file -->
- <parameter name="token-dispatcher-configuration-file">META-INF/token-dispatcher-configuration.xml</parameter>
-
- <!-- Configure Rampart to authenticate clients -->
- <wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:ExactlyOne>
- <wsp:All>
-
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
-
- <ramp:user>ip</ramp:user>
- <ramp:encryptionUser>useReqSigCert</ramp:encryptionUser>
- <ramp:passwordCallbackClass>PWCBHandler</ramp:passwordCallbackClass>
-
- <ramp:signatureCrypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
- </ramp:crypto>
- </ramp:signatureCrypto>
-
- </ramp:RampartConfig>
-
- <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:TripleDesRsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
-</service>
+<!-- Security token service configuration -->
+<service name="STS">
+
+ <operation name="RequestSecurityToken">
+ <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
+
+ <!-- Action mapping to accept SCT requests -->
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
+
+ </operation>
+
+ <!-- Using the config file -->
+ <parameter name="token-dispatcher-configuration-file">META-INF/token-dispatcher-configuration.xml</parameter>
+
+ <!-- Configure Rampart to authenticate clients -->
+ <wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+
+ <ramp:user>ip</ramp:user>
+ <ramp:encryptionUser>useReqSigCert</ramp:encryptionUser>
+ <ramp:passwordCallbackClass>PWCBHandler</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+
+ </ramp:RampartConfig>
+
+ <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDesRsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+</service>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-canceler-config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-canceler-config.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-canceler-config.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-canceler-config.xml Wed Nov 15 10:15:56 2006
@@ -1,3 +1,3 @@
-<token-canceler-config>
-
-</token-canceler-config>
+<token-canceler-config>
+
+</token-canceler-config>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/sts-aar-resources/token-dispatcher-configuration.xml Wed Nov 15 10:15:56 2006
@@ -1,17 +1,17 @@
-<token-dispatcher-configuration>
- <!-- Issuers. You may have many issuers. -->
- <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
- <configuration type="file">sct-issuer-config.xml</configuration>
- <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
- </issuer>
- <issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
- <configuration type="file">META-INF/saml-issuer-config.xml</configuration>
- <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
- </issuer>
-
- <!-- Only a single canceler is allowed -->
- <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
- <configuration type="file">META-INF/token-canceler-config.xml</configuration>
- </canceler>
-
+<token-dispatcher-configuration>
+ <!-- Issuers. You may have many issuers. -->
+ <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
+ <configuration type="file">sct-issuer-config.xml</configuration>
+ <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
+ </issuer>
+ <issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
+ <configuration type="file">META-INF/saml-issuer-config.xml</configuration>
+ <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
+ </issuer>
+
+ <!-- Only a single canceler is allowed -->
+ <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
+ <configuration type="file">META-INF/token-canceler-config.xml</configuration>
+ </canceler>
+
</token-dispatcher-configuration>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.1.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.1.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.1.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.1.xml Wed Nov 15 10:15:56 2006
@@ -1,6 +1,6 @@
-<token-dispatcher-configuration>
- <issuer class="org.apache.rahas.TempIssuer">
- <tokenType>http://example.org/mySpecialToken1</tokenType>
- <tokenType>http://example.org/mySpecialToken2</tokenType>
- </issuer>
-</token-dispatcher-configuration>
+<token-dispatcher-configuration>
+ <issuer class="org.apache.rahas.TempIssuer">
+ <tokenType>http://example.org/mySpecialToken1</tokenType>
+ <tokenType>http://example.org/mySpecialToken2</tokenType>
+ </issuer>
+</token-dispatcher-configuration>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.2.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.2.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.invalid.2.xml Wed Nov 15 10:15:56 2006
@@ -1,6 +1,6 @@
-<token-dispatcher-configuration>
- <issuer class="org.apache.rahas.TempIssuer" default="true">
- <tokenType></tokenType>
- <tokenType>http://example.org/mySpecialToken2</tokenType>
- </issuer>
-</token-dispatcher-configuration>
+<token-dispatcher-configuration>
+ <issuer class="org.apache.rahas.TempIssuer" default="true">
+ <tokenType></tokenType>
+ <tokenType>http://example.org/mySpecialToken2</tokenType>
+ </issuer>
+</token-dispatcher-configuration>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/dispatcher.config.xml Wed Nov 15 10:15:56 2006
@@ -1,6 +1,6 @@
-<token-dispatcher-configuration>
- <issuer class="org.apache.rahas.TempIssuer" default="true">
- <tokenType>http://example.org/mySpecialToken1</tokenType>
- <tokenType>http://example.org/mySpecialToken2</tokenType>
- </issuer>
-</token-dispatcher-configuration>
+<token-dispatcher-configuration>
+ <issuer class="org.apache.rahas.TempIssuer" default="true">
+ <tokenType>http://example.org/mySpecialToken1</tokenType>
+ <tokenType>http://example.org/mySpecialToken2</tokenType>
+ </issuer>
+</token-dispatcher-configuration>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sct-issuer-config.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sct-issuer-config.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sct-issuer-config.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sct-issuer-config.xml Wed Nov 15 10:15:56 2006
@@ -1,4 +1,4 @@
-<sct-issuer-config>
- <proofToken>EncryptedKey</proofToken>
- <cryptoProperties>sctIssuer.properties</cryptoProperties>
-</sct-issuer-config>
+<sct-issuer-config>
+ <proofToken>EncryptedKey</proofToken>
+ <cryptoProperties>sctIssuer.properties</cryptoProperties>
+</sct-issuer-config>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sts-services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sts-services.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sts-services.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/sts-services.xml Wed Nov 15 10:15:56 2006
@@ -1,29 +1,29 @@
-<!-- Security token service configuration -->
-<service name="STS">
-
- <operation name="RequestSecurityToken">
- <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
- </operation>
-
- <!-- Using the config file -->
- <parameter name="token-dispatcher-configuration-file">token-dispatcher-configuration.xml</parameter>
-
- <parameter name="InflowSecurity">
- <action>
- <items>Timestamp Signature</items>
- <signaturePropFile>sctIssuer.properties</signaturePropFile>
- </action>
- </parameter>
-
- <parameter name="OutflowSecurity">
- <action>
- <items>Timestamp</items>
- </action>
- </parameter>
-
-</service>
+<!-- Security token service configuration -->
+<service name="STS">
+
+ <operation name="RequestSecurityToken">
+ <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+ </operation>
+
+ <!-- Using the config file -->
+ <parameter name="token-dispatcher-configuration-file">token-dispatcher-configuration.xml</parameter>
+
+ <parameter name="InflowSecurity">
+ <action>
+ <items>Timestamp Signature</items>
+ <signaturePropFile>sctIssuer.properties</signaturePropFile>
+ </action>
+ </parameter>
+
+ <parameter name="OutflowSecurity">
+ <action>
+ <items>Timestamp</items>
+ </action>
+ </parameter>
+
+</service>
Modified: webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/token-dispatcher-configuration.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/token-dispatcher-configuration.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/token-dispatcher-configuration.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/rahas/test-resources/trust/impl/token-dispatcher-configuration.xml Wed Nov 15 10:15:56 2006
@@ -1,6 +1,6 @@
-<token-dispatcher-configuration>
- <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
- <configuration-file>sct-issuer-config.xml</configuration-file>
- <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
- </issuer>
-</token-dispatcher-configuration>
+<token-dispatcher-configuration>
+ <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
+ <configuration-file>sct-issuer-config.xml</configuration-file>
+ <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
+ </issuer>
+</token-dispatcher-configuration>
Modified: webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/axis2.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/axis2.xml Wed Nov 15 10:15:56 2006
@@ -1,124 +1,124 @@
-<axisconfig name="AxisJava2.0">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">true</parameter>
- <parameter name="cacheAttachments" locked="false">false</parameter>
- <!-- Uncomment this to enable REST support -->
- <!-- <parameter name="eanbleREST" locked="false">true</parameter>-->
-
-
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
-
-
-
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
- <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
- <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
- <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver>
-
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
- <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
- </transportReceiver> -->
-
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver>
-
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
-
- <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- </transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
- <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
- </transportSender>
- -->
-
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
- <!-- Uncomment this to enable Addressing
- <module ref="addressing"/> -->
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
- <phaseOrder type="InFlow">
- <!-- System pre defined phases -->
- <phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
- </phase>
- <!-- System pre defined phases -->
- <!-- After Postdispatch phase module author or or service author can add any phase he want -->
- <phase name="userphase1"/>
- </phaseOrder>
- <phaseOrder type="OutFlow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder>
- <phaseOrder type="InFaultFlow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- </phaseOrder>
- <phaseOrder type="OutFaultFlow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder>
-</axisconfig>
-
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">true</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="enableMTOM" locked="false">true</parameter>
+ <parameter name="cacheAttachments" locked="false">false</parameter>
+ <!-- Uncomment this to enable REST support -->
+ <!-- <parameter name="eanbleREST" locked="false">true</parameter>-->
+
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
+ <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ </transportSender>
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Uncomment this to enable Addressing
+ <module ref="addressing"/> -->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+</axisconfig>
+
Modified: webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-body.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-body.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-body.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-body.xml Wed Nov 15 10:15:56 2006
@@ -1,9 +1,9 @@
-<shw:Address shw:t='test' xmlns:shw="http://www.jcommerce.net/soap/ns/SOAPHelloWorld">
- <shw:Number>12</shw:Number>
- <shw:City>
- <shw:z>Dehiwela</shw:z>
- </shw:City>
- <shw:Country>
- <shw:y>Sri Lanka</shw:y>
- </shw:Country>
-</shw:Address>
+<shw:Address shw:t='test' xmlns:shw="http://www.jcommerce.net/soap/ns/SOAPHelloWorld">
+ <shw:Number>12</shw:Number>
+ <shw:City>
+ <shw:z>Dehiwela</shw:z>
+ </shw:City>
+ <shw:Country>
+ <shw:y>Sri Lanka</shw:y>
+ </shw:Country>
+</shw:Address>
Modified: webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-part.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-part.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-part.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/saaj/test-resources/soap-part.xml Wed Nov 15 10:15:56 2006
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <soapenv:Header>
- <shw:Hello xmlns:shw="http://www.jcommerce.net/soap/ns/SOAPHelloWorld">
- <shw:Myname>Tony</shw:Myname>
- </shw:Hello>
- </soapenv:Header>
- <soapenv:Body>
- <shw:Address shw:t='test' xmlns:shw="http://www.jcommerce.net/soap/ns/SOAPHelloWorld">
- <shw:City>GENT</shw:City>
- </shw:Address>
- </soapenv:Body>
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <soapenv:Header>
+ <shw:Hello xmlns:shw="http://www.jcommerce.net/soap/ns/SOAPHelloWorld">
+ <shw:Myname>Tony</shw:Myname>
+ </shw:Hello>
+ </soapenv:Header>
+ <soapenv:Body>
+ <shw:Address shw:t='test' xmlns:shw="http://www.jcommerce.net/soap/ns/SOAPHelloWorld">
+ <shw:City>GENT</shw:City>
+ </shw:Address>
+ </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