You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/09 00:33:47 UTC
svn commit: r516227 [1/4] - in
/webservices/axis2/trunk/java/modules/addressing: ./ src/META-INF/
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/i18n/
src/org/apache/axis2/handlers/addressing/ test-resources/
test-resources/fault-mess...
Author: gdaniels
Date: Thu Mar 8 15:33:43 2007
New Revision: 516227
URL: http://svn.apache.org/viewvc?view=rev&rev=516227
Log:
Code cleanup/reformat.
Modified:
webservices/axis2/trunk/java/modules/addressing/maven.xml
webservices/axis2/trunk/java/modules/addressing/pom.xml
webservices/axis2/trunk/java/modules/addressing/project.xml
webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/i18n/AddressingMessages.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/fault-messages/soap11/InvalidAddressingHeader.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/fault-messages/soap11/MessageAddressingHeaderRequired.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/fault-messages/soap12/InvalidAddressingHeader.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/fault-messages/soap12/MessageAddressingHeaderRequired.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/final/noActionMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/final/noFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/final/noFromMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/final/noMessageIDMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/final/noReplyToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/final/noToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noActionMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noFromMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noMessageIDMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noMessageIDNoReplyToNoFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noReplyToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/omitted-header-messages/submission/noToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/addressing/AddressingFaultsTest.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingFinalInHandlerTest.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandlerTest.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/util/TestUtil.java
Modified: webservices/axis2/trunk/java/modules/addressing/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/maven.xml?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/maven.xml Thu Mar 8 15:33:43 2007
@@ -3,29 +3,29 @@
<!-- $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">
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
<postGoal name="java:compile">
<mkdir dir="target/classes/META-INF"/>
<copy file="src/META-INF/module.xml"
- tofile="target/classes/META-INF/module.xml"/>
+ tofile="target/classes/META-INF/module.xml"/>
<copy file="../../LICENSE.txt"
- tofile="target/classes/META-INF/LICENSE.txt" overwrite="true"/>
+ tofile="target/classes/META-INF/LICENSE.txt" overwrite="true"/>
<copy file="../../NOTICE.txt"
- tofile="target/classes/META-INF/NOTICE.txt" overwrite="true"/>
+ tofile="target/classes/META-INF/NOTICE.txt" overwrite="true"/>
<copy file="./test-resources/axis2.xml"
- tofile="target/axis2.xml"/>
+ tofile="target/axis2.xml"/>
<mkdir dir="target/modules"/>
<jar jarfile="target/addressing-${addressing_version}.mar" basedir="target/classes">
<include name="**"/>
</jar>
<copy file="target/addressing-${addressing_version}.mar"
- tofile="target/modules/addressing-${addressing_version}.mar"/>
- <copy file="target/addressing-${addressing_version}.mar"
- tofile="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing_version}.mar"/>
+ tofile="target/modules/addressing-${addressing_version}.mar"/>
+ <copy file="target/addressing-${addressing_version}.mar"
+ tofile="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing_version}.mar"/>
</postGoal>
<preGoal name="itest:compile">
<u:file var="file" name="${maven.itest.src}"/>
Modified: webservices/axis2/trunk/java/modules/addressing/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/pom.xml?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/pom.xml Thu Mar 8 15:33:43 2007
@@ -16,77 +16,77 @@
! limitations under the License.
!-->
<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
- <artifactId>addressing</artifactId>
- <packaging>mar</packaging>
- <name>Apache Axis 2.0 - Addressing</name>
- <description>WS-Addressing implementation</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/addressing</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/addressing</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>conf</directory>
- <excludes>
- <exclude>**/*.properties</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <targetPath>../test-resources</targetPath>
- <directory>test-resources</directory>
- <includes>
- <include>**/**</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.axis2.maven2</groupId>
- <artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${version}</version>
- <extensions>true</extensions>
- <configuration>
- <includeDependencies>false</includeDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>addressing</artifactId>
+ <packaging>mar</packaging>
+ <name>Apache Axis 2.0 - Addressing</name>
+ <description>WS-Addressing implementation</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/addressing</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/addressing</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2.maven2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: webservices/axis2/trunk/java/modules/addressing/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/project.xml?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/project.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/project.xml Thu Mar 8 15:33:43 2007
@@ -107,7 +107,7 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
@@ -130,7 +130,7 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${neethi.version}</version>
Modified: webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml Thu Mar 8 15:33:43 2007
@@ -1,5 +1,5 @@
<module name="addressing" class="org.apache.axis2.addressing.AddressingModule">
- <Description>This is WS-Addressing implementation on Axis2. Currently we have implemented Submission version (2004/08) and Proposed Recommendation. </Description>
+ <Description>This is WS-Addressing implementation on Axis2. Currently we have implemented Submission version (2004/08) and Proposed Recommendation.</Description>
<InFlow>
<handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
<order phase="PreDispatch"/>
@@ -8,7 +8,7 @@
<order phase="PreDispatch"/>
</handler>
<handler name="AddressingValidationHandler" class="org.apache.axis2.handlers.addressing.AddressingValidationHandler">
- <order phase="Dispatch" after="AddressingBasedDispatcher" />
+ <order phase="Dispatch" after="AddressingBasedDispatcher"/>
</handler>
</InFlow>
@@ -24,7 +24,7 @@
<order phase="MessageOut"/>
</handler>
</OutFaultFlow>
-
+
<InFaultFlow>
<handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
<order phase="PreDispatch"/>
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java Thu Mar 8 15:33:43 2007
@@ -15,11 +15,6 @@
*/
package org.apache.axis2.addressing;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
@@ -38,177 +33,269 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class AddressingFaultsHelper{
-
+import javax.xml.namespace.QName;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AddressingFaultsHelper {
+
private static final Log log = LogFactory.getLog(AddressingFaultsHelper.class);
/**
* Build an understanndable fault string for the given faultCode and wsa:FaultDetail info.
* Should really use a message bundle.
+ *
* @param faultCodeLocalName
* @param faultDetail
* @return
*/
- public static String getMessageForAxisFault(String faultCodeLocalName, String faultDetail){
+ public static String getMessageForAxisFault(String faultCodeLocalName, String faultDetail) {
String result = null;
-
- if(Submission.FAULT_INVALID_HEADER.equals(faultCodeLocalName)){
- if(faultDetail!=null){
- result = AddressingMessages.getMessage("specificInvalidAddressingHeader", faultDetail);
- }else{
+
+ if (Submission.FAULT_INVALID_HEADER.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
+ result = AddressingMessages
+ .getMessage("specificInvalidAddressingHeader", faultDetail);
+ } else {
result = AddressingMessages.getMessage("invalidAddressingHeader");
}
- }else if(Final.FAULT_INVALID_HEADER.equals(faultCodeLocalName)){
- if(faultDetail!=null){
- result = AddressingMessages.getMessage("specificInvalidAddressingHeader", faultDetail);
- }else{
+ } else if (Final.FAULT_INVALID_HEADER.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
+ result = AddressingMessages
+ .getMessage("specificInvalidAddressingHeader", faultDetail);
+ } else {
result = AddressingMessages.getMessage("invalidAddressingHeader");
}
- }else if("InvalidCardinality".equals(faultCodeLocalName)){
- if(faultDetail!=null){
+ } else if ("InvalidCardinality".equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
result = AddressingMessages.getMessage("specificInvalidCardinality", faultDetail);
- }else{
+ } else {
result = AddressingMessages.getMessage("invalidCardinality");
}
- }else if("MissingAddressInEPR".equals(faultCodeLocalName)){
- if(faultDetail!=null){
+ } else if ("MissingAddressInEPR".equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
result = AddressingMessages.getMessage("specificMissingAddressInEPR", faultDetail);
- }else{
+ } else {
result = AddressingMessages.getMessage("missingAddressInEPR");
}
- }else if("DuplicateMessageID".equals(faultCodeLocalName)){
- result = AddressingMessages.getMessage("duplicateMessageID");
- }else if("ActionMismatch".equals(faultCodeLocalName)){
+ } else if ("DuplicateMessageID".equals(faultCodeLocalName)) {
+ result = AddressingMessages.getMessage("duplicateMessageID");
+ } else if ("ActionMismatch".equals(faultCodeLocalName)) {
result = AddressingMessages.getMessage("actionMismatch");
- }else if(Final.FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED.equals(faultCodeLocalName)){
- if(faultDetail!=null){
- result = AddressingMessages.getMessage("specificOnlyAnonymousSupported", faultDetail);
- }else{
+ } else if (Final.FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
+ result = AddressingMessages
+ .getMessage("specificOnlyAnonymousSupported", faultDetail);
+ } else {
result = AddressingMessages.getMessage("onlyAnonymousSupported");
}
- }else if(Final.FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED.equals(faultCodeLocalName)){
- if(faultDetail!=null){
+ } else if (Final.FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
result = AddressingMessages.getMessage("specificOnlyNonAnonSupported", faultDetail);
- }else{
+ } else {
result = AddressingMessages.getMessage("onlyNonAnonSupported");
}
- }else if(Submission.FAULT_ADDRESSING_HEADER_REQUIRED.equals(faultCodeLocalName)){
- if(faultDetail!=null){
- result = AddressingMessages.getMessage("specificAddressingHeaderRequired", faultDetail);
- }else{
+ } else if (Submission.FAULT_ADDRESSING_HEADER_REQUIRED.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
+ result = AddressingMessages
+ .getMessage("specificAddressingHeaderRequired", faultDetail);
+ } else {
result = AddressingMessages.getMessage("addressingHeaderRequired");
}
- }else if(Final.FAULT_ADDRESSING_HEADER_REQUIRED.equals(faultCodeLocalName)){
- if(faultDetail!=null){
- result = AddressingMessages.getMessage("specificAddressingHeaderRequired", faultDetail);
- }else{
+ } else if (Final.FAULT_ADDRESSING_HEADER_REQUIRED.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
+ result = AddressingMessages
+ .getMessage("specificAddressingHeaderRequired", faultDetail);
+ } else {
result = AddressingMessages.getMessage("addressingHeaderRequired");
}
- }else if(AddressingConstants.FAULT_ACTION_NOT_SUPPORTED.equals(faultCodeLocalName)){
- if(faultDetail!=null){
+ } else if (AddressingConstants.FAULT_ACTION_NOT_SUPPORTED.equals(faultCodeLocalName)) {
+ if (faultDetail != null) {
result = AddressingMessages.getMessage("specificActionNotRecognised", faultDetail);
- }else{
+ } else {
result = AddressingMessages.getMessage("actionNotRecognised");
}
}
-
+
return result;
}
-
+
// wsa:InvalidAddressingHeader [Reason] the string: "A header representing a Message Addressing Property is not valid and the message cannot be processed"
// wsa:InvalidAddress
// wsa:InvalidEPR
// wsa:InvalidCardinality
- public static void triggerInvalidCardinalityFault(MessageContext messageContext, String incorrectHeaderName) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerInvalidCardinalityFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
- }
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace)){
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, AddressingMessages.getMessage("spec.submission.FAULT_INVALID_HEADER_REASON"));
- }else{
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, "InvalidCardinality", AddressingMessages.getMessage("spec.final.FAULT_INVALID_HEADER_REASON"));
+ public static void triggerInvalidCardinalityFault(MessageContext messageContext,
+ String incorrectHeaderName) throws AxisFault {
+ if (log.isDebugEnabled()) {
+ log.debug("triggerInvalidCardinalityFault: messageContext: " + messageContext +
+ " incorrectHeaderName: " + incorrectHeaderName);
+ }
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ if (Submission.WSA_NAMESPACE.equals(namespace)) {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Submission.FAULT_INVALID_HEADER,
+ null, AddressingMessages.getMessage(
+ "spec.submission.FAULT_INVALID_HEADER_REASON"));
+ } else {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Final.FAULT_INVALID_HEADER,
+ "InvalidCardinality",
+ AddressingMessages.getMessage(
+ "spec.final.FAULT_INVALID_HEADER_REASON"));
}
}
// wsa:MissingAddressInEPR
- public static void triggerMissingAddressInEPRFault(MessageContext messageContext, String incorrectHeaderName) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerMissingAddressInEPRFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
- }
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace)){
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, AddressingMessages.getMessage("spec.submission.FAULT_INVALID_HEADER_REASON"));
- }else{
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, "MissingAddressInEPR", AddressingMessages.getMessage("spec.final.FAULT_INVALID_HEADER_REASON"));
+ public static void triggerMissingAddressInEPRFault(MessageContext messageContext,
+ String incorrectHeaderName)
+ throws AxisFault {
+ if (log.isDebugEnabled()) {
+ log.debug("triggerMissingAddressInEPRFault: messageContext: " + messageContext +
+ " incorrectHeaderName: " + incorrectHeaderName);
+ }
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ if (Submission.WSA_NAMESPACE.equals(namespace)) {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Submission.FAULT_INVALID_HEADER,
+ null, AddressingMessages.getMessage(
+ "spec.submission.FAULT_INVALID_HEADER_REASON"));
+ } else {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Final.FAULT_INVALID_HEADER,
+ "MissingAddressInEPR",
+ AddressingMessages.getMessage(
+ "spec.final.FAULT_INVALID_HEADER_REASON"));
}
}
// wsa:DuplicateMessageID
// wsa:ActionMismatch
public static void triggerActionMismatchFault(MessageContext messageContext) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerActionMismatchFault: messageContext: "+messageContext);
+ if (log.isDebugEnabled()) {
+ log.debug("triggerActionMismatchFault: messageContext: " + messageContext);
}
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace)){
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":Action", Submission.FAULT_INVALID_HEADER, null, AddressingMessages.getMessage("spec.submission.FAULT_INVALID_HEADER_REASON"));
- }else{
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":Action", Final.FAULT_INVALID_HEADER, "ActionMismatch", AddressingMessages.getMessage("spec.final.FAULT_INVALID_HEADER_REASON"));
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ if (Submission.WSA_NAMESPACE.equals(namespace)) {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":Action",
+ Submission.FAULT_INVALID_HEADER, null,
+ AddressingMessages.getMessage(
+ "spec.submission.FAULT_INVALID_HEADER_REASON"));
+ } else {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":Action",
+ Final.FAULT_INVALID_HEADER, "ActionMismatch",
+ AddressingMessages.getMessage(
+ "spec.final.FAULT_INVALID_HEADER_REASON"));
}
}
// wsa:OnlyAnonymousAddressSupported
- public static void triggerOnlyAnonymousAddressSupportedFault(MessageContext messageContext, String incorrectHeaderName) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerOnlyAnonymousAddressSupportedFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
- }
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace)){
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, AddressingMessages.getMessage("spec.submission.FAULT_INVALID_HEADER_REASON"));
- }else{
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, Final.FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED, AddressingMessages.getMessage("spec.final.FAULT_INVALID_HEADER_REASON"));
+ public static void triggerOnlyAnonymousAddressSupportedFault(MessageContext messageContext,
+ String incorrectHeaderName)
+ throws AxisFault {
+ if (log.isDebugEnabled()) {
+ log.debug("triggerOnlyAnonymousAddressSupportedFault: messageContext: " +
+ messageContext + " incorrectHeaderName: " + incorrectHeaderName);
+ }
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ if (Submission.WSA_NAMESPACE.equals(namespace)) {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Submission.FAULT_INVALID_HEADER,
+ null, AddressingMessages.getMessage(
+ "spec.submission.FAULT_INVALID_HEADER_REASON"));
+ } else {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Final.FAULT_INVALID_HEADER,
+ Final.FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED,
+ AddressingMessages.getMessage(
+ "spec.final.FAULT_INVALID_HEADER_REASON"));
}
}
// wsa:OnlyNonAnonymousAddressSupported
- public static void triggerOnlyNonAnonymousAddressSupportedFault(MessageContext messageContext, String incorrectHeaderName) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerOnlyNonAnonymousAddressSupportedFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
- }
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace)){
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, AddressingMessages.getMessage("spec.submission.FAULT_INVALID_HEADER_REASON"));
- }else{
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, Final.FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED, AddressingMessages.getMessage("spec.final.FAULT_INVALID_HEADER_REASON"));
+ public static void triggerOnlyNonAnonymousAddressSupportedFault(MessageContext messageContext,
+ String incorrectHeaderName)
+ throws AxisFault {
+ if (log.isDebugEnabled()) {
+ log.debug("triggerOnlyNonAnonymousAddressSupportedFault: messageContext: " +
+ messageContext + " incorrectHeaderName: " + incorrectHeaderName);
+ }
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ if (Submission.WSA_NAMESPACE.equals(namespace)) {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Submission.FAULT_INVALID_HEADER,
+ null, AddressingMessages.getMessage(
+ "spec.submission.FAULT_INVALID_HEADER_REASON"));
+ } else {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" +
+ incorrectHeaderName, Final.FAULT_INVALID_HEADER,
+ Final.FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED,
+ AddressingMessages.getMessage(
+ "spec.final.FAULT_INVALID_HEADER_REASON"));
}
}
// wsa:MessageAddressingHeaderRequired [Reason] the string: "A required header representing a Message Addressing Property is not present"
- public static void triggerMessageAddressingRequiredFault(MessageContext messageContext, String missingHeaderName) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerMessageAddressingRequiredFault: messageContext: "+messageContext+" missingHeaderName: "+missingHeaderName);
- }
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace)){
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + missingHeaderName, Submission.FAULT_ADDRESSING_HEADER_REQUIRED, null, AddressingMessages.getMessage("spec.submission.FAULT_ADDRESSING_HEADER_REQUIRED_REASON"));
- }else{
- triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + missingHeaderName, Final.FAULT_ADDRESSING_HEADER_REQUIRED, null, AddressingMessages.getMessage("spec.final.FAULT_ADDRESSING_HEADER_REQUIRED_REASON"));
+ public static void triggerMessageAddressingRequiredFault(MessageContext messageContext,
+ String missingHeaderName)
+ throws AxisFault {
+ if (log.isDebugEnabled()) {
+ log.debug("triggerMessageAddressingRequiredFault: messageContext: " + messageContext +
+ " missingHeaderName: " + missingHeaderName);
+ }
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ if (Submission.WSA_NAMESPACE.equals(namespace)) {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" + missingHeaderName,
+ Submission.FAULT_ADDRESSING_HEADER_REQUIRED, null,
+ AddressingMessages.getMessage(
+ "spec.submission.FAULT_ADDRESSING_HEADER_REQUIRED_REASON"));
+ } else {
+ triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME,
+ AddressingConstants.WSA_DEFAULT_PREFIX + ":" + missingHeaderName,
+ Final.FAULT_ADDRESSING_HEADER_REQUIRED, null,
+ AddressingMessages.getMessage(
+ "spec.final.FAULT_ADDRESSING_HEADER_REQUIRED_REASON"));
}
}
// wsa:ActionNotSupported [Reason] the string: "The [action] cannot be processed at the receiver"
- public static void triggerActionNotSupportedFault(MessageContext messageContext, String problemAction) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("triggerActionNotSupportedFault: messageContext: "+messageContext+" problemAction: "+problemAction);
- }
- triggerAddressingFault(messageContext, Final.FAULT_PROBLEM_ACTION_NAME, problemAction, AddressingConstants.FAULT_ACTION_NOT_SUPPORTED, null, AddressingMessages.getMessage("spec.FAULT_ACTION_NOT_SUPPORTED_REASON"));
+ public static void triggerActionNotSupportedFault(MessageContext messageContext,
+ String problemAction) throws AxisFault {
+ if (log.isDebugEnabled()) {
+ log.debug("triggerActionNotSupportedFault: messageContext: " + messageContext +
+ " problemAction: " + problemAction);
+ }
+ triggerAddressingFault(messageContext, Final.FAULT_PROBLEM_ACTION_NAME, problemAction,
+ AddressingConstants.FAULT_ACTION_NOT_SUPPORTED, null,
+ AddressingMessages.getMessage(
+ "spec.FAULT_ACTION_NOT_SUPPORTED_REASON"));
}
// wsa:EndpointUnavailable [Reason] the string "The endpoint is unable to process the message at this time"
- private static void triggerAddressingFault(MessageContext messageContext, String faultInformationKey, Object faultInformationValue, String faultcode, String faultSubcode, String faultReason) throws AxisFault{
- Map faultInformation = (Map) messageContext.getProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
+ private static void triggerAddressingFault(MessageContext messageContext,
+ String faultInformationKey,
+ Object faultInformationValue, String faultcode,
+ String faultSubcode, String faultReason)
+ throws AxisFault {
+ Map faultInformation =
+ (Map) messageContext.getProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
if (faultInformation == null) {
faultInformation = new HashMap();
messageContext.setProperty(Constants.FAULT_INFORMATION_FOR_HEADERS, faultInformation);
@@ -219,50 +306,62 @@
if (!messageContext.isSOAP11()) {
setFaultCode(messageContext, faultcode, faultSubcode);
}
-
+
OperationContext oc = messageContext.getOperationContext();
- if(oc!=null){
- oc.setProperty(Constants.Configuration.SEND_STACKTRACE_DETAILS_WITH_FAULTS, "false");
+ if (oc != null) {
+ oc.setProperty(Constants.Configuration.SEND_STACKTRACE_DETAILS_WITH_FAULTS, "false");
}
- messageContext.setProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
- String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- throw new AxisFault(faultReason, new QName(namespace, faultcode, AddressingConstants.WSA_DEFAULT_PREFIX));
+ messageContext.setProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
+ Boolean.FALSE);
+ String namespace =
+ (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+ throw new AxisFault(faultReason, new QName(namespace, faultcode,
+ AddressingConstants.WSA_DEFAULT_PREFIX));
}
- private static void setFaultCode(MessageContext messageContext, String faultCode, String faultSubCode) {
+ private static void setFaultCode(MessageContext messageContext, String faultCode,
+ String faultSubCode) {
SOAPFactory soapFac = OMAbstractFactory.getSOAP12Factory();
SOAPFaultCode soapFaultCode = soapFac.createSOAPFaultCode();
- if(messageContext.isSOAP11()) {
+ if (messageContext.isSOAP11()) {
soapFaultCode.setText(faultCode);
} else {
SOAPFaultValue soapFaultValue = soapFac.createSOAPFaultValue(soapFaultCode);
- soapFaultValue.setText(SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":" + SOAP12Constants.FAULT_CODE_SENDER);
+ soapFaultValue.setText(SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":" +
+ SOAP12Constants.FAULT_CODE_SENDER);
SOAPFaultSubCode soapFaultSubCode = soapFac.createSOAPFaultSubCode(soapFaultCode);
SOAPFaultValue soapFaultSubcodeValue = soapFac.createSOAPFaultValue(soapFaultSubCode);
soapFaultSubcodeValue.setText(AddressingConstants.WSA_DEFAULT_PREFIX + ":" + faultCode);
if (faultSubCode != null) {
- SOAPFaultSubCode soapFaultSubCode2 = soapFac.createSOAPFaultSubCode(soapFaultSubCode);
- SOAPFaultValue soapFaultSubcodeValue2 = soapFac.createSOAPFaultValue(soapFaultSubCode2);
- soapFaultSubcodeValue2.setText(AddressingConstants.WSA_DEFAULT_PREFIX + ":" + faultSubCode);
+ SOAPFaultSubCode soapFaultSubCode2 =
+ soapFac.createSOAPFaultSubCode(soapFaultSubCode);
+ SOAPFaultValue soapFaultSubcodeValue2 =
+ soapFac.createSOAPFaultValue(soapFaultSubCode2);
+ soapFaultSubcodeValue2
+ .setText(AddressingConstants.WSA_DEFAULT_PREFIX + ":" + faultSubCode);
}
}
messageContext.setProperty(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, soapFaultCode);
}
-
- public static OMElement getDetailElementForAddressingFault(MessageContext messageContext, OMNamespace addressingNamespaceObject){
+
+ public static OMElement getDetailElementForAddressingFault(MessageContext messageContext,
+ OMNamespace addressingNamespaceObject) {
Map faultInfo = (Map) messageContext.getProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
OMElement problemDetail = null;
if (faultInfo != null) {
String faultyHeaderQName = (String) faultInfo.get(Final.FAULT_HEADER_PROB_HEADER_QNAME);
String faultyAction = (String) faultInfo.get(Final.FAULT_PROBLEM_ACTION_NAME);
- if(faultyAction!=null && !"".equals(faultyAction)){
- problemDetail = messageContext.getEnvelope().getOMFactory().createOMElement(Final.FAULT_PROBLEM_ACTION_NAME, addressingNamespaceObject);
- OMElement probH2 = messageContext.getEnvelope().getOMFactory().createOMElement(AddressingConstants.WSA_ACTION, addressingNamespaceObject,problemDetail);
+ if (faultyAction != null && !"".equals(faultyAction)) {
+ problemDetail = messageContext.getEnvelope().getOMFactory().createOMElement(
+ Final.FAULT_PROBLEM_ACTION_NAME, addressingNamespaceObject);
+ OMElement probH2 = messageContext.getEnvelope().getOMFactory().createOMElement(
+ AddressingConstants.WSA_ACTION, addressingNamespaceObject, problemDetail);
probH2.setText(faultyAction);
}
if (faultyHeaderQName != null && !"".equals(faultyHeaderQName)) {
- problemDetail = messageContext.getEnvelope().getOMFactory().createOMElement(Final.FAULT_HEADER_PROB_HEADER_QNAME, addressingNamespaceObject);
+ problemDetail = messageContext.getEnvelope().getOMFactory().createOMElement(
+ Final.FAULT_HEADER_PROB_HEADER_QNAME, addressingNamespaceObject);
problemDetail.setText(faultyHeaderQName);
}
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java Thu Mar 8 15:33:43 2007
@@ -16,10 +16,6 @@
package org.apache.axis2.addressing;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
@@ -37,8 +33,11 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+import javax.xml.namespace.QName;
+import java.util.List;
+
public class AddressingModule implements Module {
-
+
private static final Log log = LogFactory.getLog(AddressingModule.class);
private static final QName ADDRESSING = new QName(Constants.MODULE_ADDRESSING);
@@ -46,18 +45,18 @@
throws AxisFault {
AxisConfiguration axisConfig = arg0.getAxisConfiguration();
ModuleConfiguration moduleConfig = axisConfig.getModuleConfig(ADDRESSING);
-
+
if (moduleConfig != null) {
List list = moduleConfig.getParameters();
for (int i = 0, size = list.size(); i < size; i++) {
Parameter param = (Parameter) list.get(i);
arg1.addParameter(param);
- if(log.isTraceEnabled()){
+ if (log.isTraceEnabled()) {
log.trace("init: Addressing config -" + param);
}
}
-
+
initHandlers(arg1);
}
}
@@ -81,14 +80,14 @@
// TODO Auto-generated method stub
}
-
+
//This method calls the init method of the handlers that we want to initialize.
//Currently only the handlers in the OutFlow and FaultOutFlow are initialized
//by this code. If handlers in other flows need to be initialized then code will
//need to be added to do so.
private void initHandlers(AxisModule axisModule) {
Flow flow = axisModule.getOutFlow();
- if(log.isTraceEnabled()){
+ if (log.isTraceEnabled()) {
log.trace("initHandlers: Initializing handlers in out flow.");
}
for (int i = 0, size = flow.getHandlerCount(); i < size; i++) {
@@ -96,15 +95,15 @@
Handler handler = description.getHandler();
handler.init(description);
}
-
+
flow = axisModule.getFaultOutFlow();
- if(log.isTraceEnabled()){
+ if (log.isTraceEnabled()) {
log.trace("initHandlers: Initializing handlers in fault out flow.");
}
for (int i = 0, size = flow.getHandlerCount(); i < size; i++) {
HandlerDescription description = flow.getHandler(i);
Handler handler = description.getHandler();
handler.init(description);
- }
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/i18n/AddressingMessages.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/i18n/AddressingMessages.java?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/i18n/AddressingMessages.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/i18n/AddressingMessages.java Thu Mar 8 15:33:43 2007
@@ -22,9 +22,8 @@
import java.util.ResourceBundle;
/**
- * @see org.apache.axis2.i18n.Messages
- * The implementation is the same but just
- * thisClass static reference has AddressingMessages.class
+ * @see org.apache.axis2.i18n.Messages The implementation is the same but just thisClass static
+ * reference has AddressingMessages.class
*/
public class AddressingMessages {
@@ -45,13 +44,11 @@
: MessagesConstants.rootBundle;
- /**
- * ** NO NEED TO CHANGE ANYTHING BELOW ****
- */
+ /** ** NO NEED TO CHANGE ANYTHING BELOW **** */
private static final MessageBundle messageBundle =
new MessageBundle(projectName, packageName, resourceName,
- locale, classLoader, parent);
+ locale, classLoader, parent);
/**
* Gets a message from resource.properties from the package of the given object.
@@ -129,7 +126,8 @@
* @param arg4 The argument to place in variable {4}
* @return Returns the formatted message.
*/
- public static String getMessage(String key, String arg0, String arg1, String arg2, String arg3, String arg4)
+ public static String getMessage(String key, String arg0, String arg1, String arg2, String arg3,
+ String arg4)
throws MissingResourceException {
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3, arg4);
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java Thu Mar 8 15:33:43 2007
@@ -1,10 +1,5 @@
package org.apache.axis2.handlers.addressing;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPHeader;
@@ -16,6 +11,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Iterator;
+
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -36,60 +35,66 @@
public class AddressingFinalInHandler extends AddressingInHandler {
private static final Log log = LogFactory.getLog(AddressingFinalInHandler.class);
-
+
public AddressingFinalInHandler() {
addressingNamespace = Final.WSA_NAMESPACE;
addressingVersion = "WS-Addressing Final";
}
- protected void extractToEprReferenceParameters(EndpointReference toEPR, SOAPHeader header, String namespace) {
+ protected void extractToEprReferenceParameters(EndpointReference toEPR, SOAPHeader header,
+ String namespace) {
Iterator headerBlocks = header.getChildElements();
while (headerBlocks.hasNext()) {
OMElement headerElement = (OMElement) headerBlocks.next();
- OMAttribute isRefParamAttr = headerElement.getAttribute(new QName(namespace, "IsReferenceParameter"));
- if (log.isTraceEnabled()){
- log.trace("extractToEprReferenceParameters: Checking header: "+headerElement.getQName());
+ OMAttribute isRefParamAttr =
+ headerElement.getAttribute(new QName(namespace, "IsReferenceParameter"));
+ if (log.isTraceEnabled()) {
+ log.trace("extractToEprReferenceParameters: Checking header: " +
+ headerElement.getQName());
}
if (isRefParamAttr != null && "true".equals(isRefParamAttr.getAttributeValue())) {
toEPR.addReferenceParameter(headerElement);
- if (log.isTraceEnabled()){
- log.trace("extractToEprReferenceParameters: Header: "+headerElement.getQName()+" has IsReferenceParameter attribute. Adding to toEPR.");
+ if (log.isTraceEnabled()) {
+ log.trace("extractToEprReferenceParameters: Header: " +
+ headerElement.getQName() +
+ " has IsReferenceParameter attribute. Adding to toEPR.");
}
}
}
}
- /**
- * @see AddressingValidationHandler#checkMessageIDHeader
- */
- protected void checkForMandatoryHeaders(ArrayList alreadyFoundAddrHeader, MessageContext messageContext) throws AxisFault {
+ /** @see AddressingValidationHandler#checkMessageIDHeader */
+ protected void checkForMandatoryHeaders(ArrayList alreadyFoundAddrHeader,
+ MessageContext messageContext) throws AxisFault {
//Unable to validate the wsa:MessageID header here as we do not yet know which MEP
//is in effect.
-
+
if (!alreadyFoundAddrHeader.contains(WSA_ACTION)) {
- AddressingFaultsHelper.triggerMessageAddressingRequiredFault(messageContext, WSA_ACTION);
- }
+ AddressingFaultsHelper
+ .triggerMessageAddressingRequiredFault(messageContext, WSA_ACTION);
+ }
}
-
+
protected void setDefaults(ArrayList alreadyFoundAddrHeader, MessageContext messageContext) {
//According to the WS-Addressing spec, we should default the wsa:To header to the
//anonymous URL. Doing that, however, might prevent a different value from being
//used instead, such as the transport URL.
-
+
if (!alreadyFoundAddrHeader.contains(WSA_REPLY_TO)) {
Options messageContextOptions = messageContext.getOptions();
EndpointReference epr = messageContextOptions.getReplyTo();
-
+
if (epr == null) {
epr = new EndpointReference("");
messageContextOptions.setReplyTo(epr);
}
-
- if (log.isTraceEnabled()){
- log.trace(messageContext.getLogIDString()+" setDefaults: Setting WS-Addressing default value for the ReplyTo property.");
+
+ if (log.isTraceEnabled()) {
+ log.trace(messageContext.getLogIDString() +
+ " setDefaults: Setting WS-Addressing default value for the ReplyTo property.");
}
-
+
epr.setAddress(Final.WSA_ANONYMOUS_URL);
- }
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java?view=diff&rev=516227&r1=516226&r2=516227
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java Thu Mar 8 15:33:43 2007
@@ -14,8 +14,6 @@
package org.apache.axis2.handlers.addressing;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -33,9 +31,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+
/**
- * This class is used to extract WS-Addressing Spec defined Faults and FaultDetail and convert
- * them into understandable AxisFault objects.
+ * This class is used to extract WS-Addressing Spec defined Faults and FaultDetail and convert them
+ * into understandable AxisFault objects.
*/
public class AddressingInFaultHandler extends AbstractHandler implements AddressingConstants {
@@ -43,24 +43,25 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
String action = msgContext.getWSAAction();
-
- if(Final.WSA_FAULT_ACTION.equals(action)
- || Final.WSA_SOAP_FAULT_ACTION.equals(action)
- || Submission.WSA_FAULT_ACTION.equals(action))
- {
+
+ if (Final.WSA_FAULT_ACTION.equals(action)
+ || Final.WSA_SOAP_FAULT_ACTION.equals(action)
+ || Submission.WSA_FAULT_ACTION.equals(action)) {
String faultLocalName = getFaultLocalName(msgContext);
String faultDetailString = getWSAFaultDetailString(msgContext);
-
- if(faultLocalName != null){
- String newReason = AddressingFaultsHelper.getMessageForAxisFault(faultLocalName, faultDetailString);
-
- if(newReason != null){
+
+ if (faultLocalName != null) {
+ String newReason = AddressingFaultsHelper
+ .getMessageForAxisFault(faultLocalName, faultDetailString);
+
+ if (newReason != null) {
SOAPEnvelope envelope = msgContext.getEnvelope();
SOAPFault fault = envelope.getBody().getFault();
-
- SOAPFactory sf = ((SOAPFactory)envelope.getOMFactory());
+
+ SOAPFactory sf = ((SOAPFactory) envelope.getOMFactory());
SOAPFaultReason sfr = sf.createSOAPFaultReason();
- if(envelope.getNamespace().getNamespaceURI().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ if (envelope.getNamespace().getNamespaceURI()
+ .equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
sfr.setText(newReason);
} else {
SOAPFaultText sft = sf.createSOAPFaultText();
@@ -70,63 +71,67 @@
if (fault != null) {
// else call the on error method with the fault
AxisFault axisFault = new AxisFault(fault.getCode(), sfr,
- fault.getNode(), fault.getRole(),
- fault.getDetail());
+ fault.getNode(), fault.getRole(),
+ fault.getDetail());
msgContext.setProperty(Constants.INBOUND_FAULT_OVERRIDE, axisFault);
}
}
}
}
-
+
return InvocationResponse.CONTINUE;
}
-
- private String getFaultLocalName(MessageContext msgContext){
+
+ private String getFaultLocalName(MessageContext msgContext) {
SOAPEnvelope envelope = msgContext.getEnvelope();
SOAPFault fault = envelope.getBody().getFault();
QName faultCodeQName = null;
String result = null;
- if(fault != null){
- if(envelope.getNamespace().getNamespaceURI().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+ if (fault != null) {
+ if (envelope.getNamespace().getNamespaceURI()
+ .equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
faultCodeQName = fault.getCode().getTextAsQName();
} else {
faultCodeQName = fault.getCode().getValue().getTextAsQName();
}
- if(fault.getCode().getSubCode() != null){
+ if (fault.getCode().getSubCode() != null) {
faultCodeQName = fault.getCode().getSubCode().getValue().getTextAsQName();
- if(fault.getCode().getSubCode().getSubCode() != null){
- faultCodeQName = fault.getCode().getSubCode().getSubCode().getValue().getTextAsQName();
+ if (fault.getCode().getSubCode().getSubCode() != null) {
+ faultCodeQName =
+ fault.getCode().getSubCode().getSubCode().getValue().getTextAsQName();
}
}
}
- if(faultCodeQName != null){
+ if (faultCodeQName != null) {
result = faultCodeQName.getLocalPart();
}
return result;
}
-
- private String getWSAFaultDetailString(MessageContext msgContext){
+
+ private String getWSAFaultDetailString(MessageContext msgContext) {
SOAPEnvelope envelope = msgContext.getEnvelope();
OMElement faultDetailElement = null;
String result = null;
-
- if(msgContext.isSOAP11()){
+
+ if (msgContext.isSOAP11()) {
SOAPHeader header = envelope.getHeader();
faultDetailElement = header.getFirstChildWithName(new QName(Final.FAULT_HEADER_DETAIL));
- if(faultDetailElement != null){
+ if (faultDetailElement != null) {
result = faultDetailElement.getFirstElement().getText();
}
- }else{
+ } else {
SOAPFault fault = envelope.getBody().getFault();
- if(fault != null){
- if(fault.getDetail() != null){
- faultDetailElement = fault.getDetail().getFirstChildWithName(new QName(Final.FAULT_PROBLEM_ACTION_NAME));
- if(faultDetailElement == null){
- faultDetailElement = fault.getDetail().getFirstChildWithName(new QName(Final.FAULT_HEADER_PROB_HEADER_QNAME));
+ if (fault != null) {
+ if (fault.getDetail() != null) {
+ faultDetailElement = fault.getDetail()
+ .getFirstChildWithName(new QName(Final.FAULT_PROBLEM_ACTION_NAME));
+ if (faultDetailElement == null) {
+ faultDetailElement = fault.getDetail().getFirstChildWithName(
+ new QName(Final.FAULT_HEADER_PROB_HEADER_QNAME));
}
}
}
- if(faultDetailElement != null){
+ if (faultDetailElement != null) {
result = faultDetailElement.getText();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org