You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2006/08/25 15:17:37 UTC
svn commit: r436785 [2/18] - in /incubator/cxf/trunk: ./ api/
api/src/main/java/org/apache/cxf/buslifecycle/
api/src/main/java/org/apache/cxf/databinding/
api/src/main/java/org/apache/cxf/endpoint/
api/src/main/java/org/apache/cxf/interceptor/ api/src/...
Modified: incubator/cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Fri Aug 25 06:16:36 2006
@@ -1,114 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <packaging>jar</packaging>
- <name>CXF API</name>
- <version>1.1-SNAPSHOT</version>
-
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf</artifactId>
- <version>1.1-SNAPSHOT</version>
- </parent>
-
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-testutils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <!-- REVISIT: generate schemas and configuration beans in projects where needed first -->
- <!-- may need to modify bean generator so it can pick up schemas from jars -->
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/wsdl.xsd</xsd>
- <dependencies>
- <dependency>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</dependency>
- <dependency>${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd</dependency>
- </dependencies>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
- <packagename>org.apache.cxf.ws.addressing</packagename>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
- <packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-conf.xsd</xsd>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-context.xsd</xsd>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
- </xsdOption>
- </xsdOptions>
- <beanfiles>
- <beanfile>${basedir}/src/main/resources/config-metadata/bus-config.xml</beanfile>
- <beanfile>${basedir}/src/main/resources/config-metadata/http-client-config.xml</beanfile>
- <beanfile>${basedir}/src/main/resources/config-metadata/http-listener-config.xml</beanfile>
- <beanfile>${basedir}/src/main/resources/config-metadata/http-server-config.xml</beanfile>
- <beanfile>${basedir}/src/main/resources/config-metadata/jms-client-config.xml</beanfile>
- <beanfile>${basedir}/src/main/resources/config-metadata/jms-server-config.xml</beanfile>
- </beanfiles>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- <goal>beangen</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <packaging>jar</packaging>
+ <name>CXF API</name>
+ <version>1.1-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+ <!-- REVISIT: generate schemas and configuration beans in projects where needed first -->
+ <!-- may need to modify bean generator so it can pick up schemas from jars -->
+ <xsdOptions>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/wsdl/wsdl.xsd</xsd>
+ <dependencies>
+ <dependency>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</dependency>
+ <dependency>${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd</dependency>
+ </dependencies>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
+ <packagename>org.apache.cxf.ws.addressing</packagename>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
+ <packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-conf.xsd</xsd>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-context.xsd</xsd>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd>
+ </xsdOption>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/configuration/std-types.xsd</xsd>
+ </xsdOption>
+ </xsdOptions>
+ <beanfiles>
+ <beanfile>${basedir}/src/main/resources/config-metadata/bus-config.xml</beanfile>
+ <beanfile>${basedir}/src/main/resources/config-metadata/http-client-config.xml</beanfile>
+ <beanfile>${basedir}/src/main/resources/config-metadata/http-listener-config.xml</beanfile>
+ <beanfile>${basedir}/src/main/resources/config-metadata/http-server-config.xml</beanfile>
+ <beanfile>${basedir}/src/main/resources/config-metadata/jms-client-config.xml</beanfile>
+ <beanfile>${basedir}/src/main/resources/config-metadata/jms-server-config.xml</beanfile>
+ </beanfiles>
+ </configuration>
+ <goals>
+ <goal>xsdtojava</goal>
+ <goal>beangen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: incubator/cxf/trunk/api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataReader.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataWriter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ContextInspector.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ContextInspector.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ContextInspector.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ContextInspector.java Fri Aug 25 06:16:36 2006
@@ -1,5 +1,5 @@
-package org.apache.cxf.endpoint;
-
-public interface ContextInspector {
- String getAddress(Object object);
-}
+package org.apache.cxf.endpoint;
+
+public interface ContextInspector {
+ String getAddress(Object object);
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ContextInspector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ContextInspector.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java Fri Aug 25 06:16:36 2006
@@ -1,22 +1,22 @@
-package org.apache.cxf.interceptor;
-
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.i18n.UncheckedException;
-
-/**
- * A Fault that occurs during invocation processing.
- */
-public class Fault extends UncheckedException {
-
- public Fault(Message message, Throwable throwable) {
- super(message, throwable);
- }
-
- public Fault(Message message) {
- super(message);
- }
-
- public Fault(Throwable t) {
- super(t);
- }
-}
+package org.apache.cxf.interceptor;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.i18n.UncheckedException;
+
+/**
+ * A Fault that occurs during invocation processing.
+ */
+public class Fault extends UncheckedException {
+
+ public Fault(Message message, Throwable throwable) {
+ super(message, throwable);
+ }
+
+ public Fault(Message message) {
+ super(message);
+ }
+
+ public Fault(Throwable t) {
+ super(t);
+ }
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Interceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Interceptor.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Interceptor.java Fri Aug 25 06:16:36 2006
@@ -1,25 +1,25 @@
-package org.apache.cxf.interceptor;
-
-import org.apache.cxf.message.Message;
-
-public interface Interceptor<T extends Message> {
- /**
- * Intercepts a message.
- * Interceptors need NOT invoke handleMessage or handleFault
- * on the next interceptor - the interceptor chain will
- * take care of this.
- *
- * @param message
- */
- void handleMessage(T message) throws Fault;
-
- /**
- * Called for all interceptors (in reverse order) on which handleMessage
- * had been successfully invoked, when normal execution of the chain was
- * aborted for some reason.
- *
- * @param message
- */
- void handleFault(T message);
-
-}
+package org.apache.cxf.interceptor;
+
+import org.apache.cxf.message.Message;
+
+public interface Interceptor<T extends Message> {
+ /**
+ * Intercepts a message.
+ * Interceptors need NOT invoke handleMessage or handleFault
+ * on the next interceptor - the interceptor chain will
+ * take care of this.
+ *
+ * @param message
+ */
+ void handleMessage(T message) throws Fault;
+
+ /**
+ * Called for all interceptors (in reverse order) on which handleMessage
+ * had been successfully invoked, when normal execution of the chain was
+ * aborted for some reason.
+ *
+ * @param message
+ */
+ void handleFault(T message);
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Interceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Interceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java Fri Aug 25 06:16:36 2006
@@ -1,28 +1,28 @@
-package org.apache.cxf.interceptor;
-
-import java.util.ListIterator;
-
-import org.apache.cxf.message.Message;
-
-public interface InterceptorChain extends Iterable<Interceptor<? extends Message>> {
-
- enum State {
- PAUSED,
- EXECUTING,
- COMPLETE,
- ABORTED
- };
-
- void add(Interceptor i);
-
- void remove(Interceptor i);
-
- boolean doIntercept(Message message);
-
- void pause();
-
- void resume();
-
- ListIterator<Interceptor<? extends Message>> getIterator();
-
-}
+package org.apache.cxf.interceptor;
+
+import java.util.ListIterator;
+
+import org.apache.cxf.message.Message;
+
+public interface InterceptorChain extends Iterable<Interceptor<? extends Message>> {
+
+ enum State {
+ PAUSED,
+ EXECUTING,
+ COMPLETE,
+ ABORTED
+ };
+
+ void add(Interceptor i);
+
+ void remove(Interceptor i);
+
+ boolean doIntercept(Message message);
+
+ void pause();
+
+ void resume();
+
+ ListIterator<Interceptor<? extends Message>> getIterator();
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java Fri Aug 25 06:16:36 2006
@@ -1,134 +1,134 @@
-package org.apache.cxf.message;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.Destination;
-
-/**
- * A base class to build your own message implementations on.
- *
- * @author Dan
- */
-public abstract class AbstractWrappedMessage implements Message {
-
- private Message message;
-
- protected AbstractWrappedMessage(Message msg) {
- this.message = msg;
- }
-
- public void clear() {
- message.clear();
- }
-
- public boolean containsKey(Object key) {
- return message.containsKey(key);
- }
-
- public boolean containsValue(Object value) {
- return message.containsValue(value);
- }
-
- public Set<Entry<String, Object>> entrySet() {
- return message.entrySet();
- }
-
- public boolean equals(Object o) {
- return message.equals(o);
- }
-
- public Object get(Object key) {
- return message.get(key);
- }
-
- public Collection<Attachment> getAttachments() {
- return message.getAttachments();
- }
-
- public String getAttachmentMimeType() {
- return message.getAttachmentMimeType();
- }
-
- public Conduit getConduit() {
- return message.getConduit();
- }
-
- public Destination getDestination() {
- return message.getDestination();
- }
-
- public Exchange getExchange() {
- return message.getExchange();
- }
-
- public void setExchange(Exchange exchange) {
- message.setExchange(exchange);
- }
-
- public String getId() {
- return message.getId();
- }
-
- public InterceptorChain getInterceptorChain() {
- return message.getInterceptorChain();
- }
- public void setInterceptorChain(InterceptorChain chain) {
- message.setInterceptorChain(chain);
- }
-
- public <T> T getContent(Class<T> format) {
- return message.getContent(format);
- }
-
- public Set<Class<?>> getContentFormats() {
- return message.getContentFormats();
- }
-
- public int hashCode() {
- return message.hashCode();
- }
-
- public boolean isEmpty() {
- return message.isEmpty();
- }
-
- public Set<String> keySet() {
- return message.keySet();
- }
-
- public Object put(String key, Object value) {
- return message.put(key, value);
- }
-
- public void putAll(Map<? extends String, ? extends Object> t) {
- message.putAll(t);
- }
-
- public Object remove(Object key) {
- return message.remove(key);
- }
-
- public <T> void setContent(Class<T> format, Object content) {
- message.setContent(format, content);
- }
-
- public int size() {
- return message.size();
- }
-
- public Collection<Object> values() {
- return message.values();
- }
-
- public <T> T get(Class<T> key) {
- return message.get(key);
- }
- public <T> void put(Class<T> key, T value) {
- message.put(key, value);
- }
-
-}
+package org.apache.cxf.message;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cxf.interceptor.InterceptorChain;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.Destination;
+
+/**
+ * A base class to build your own message implementations on.
+ *
+ * @author Dan
+ */
+public abstract class AbstractWrappedMessage implements Message {
+
+ private Message message;
+
+ protected AbstractWrappedMessage(Message msg) {
+ this.message = msg;
+ }
+
+ public void clear() {
+ message.clear();
+ }
+
+ public boolean containsKey(Object key) {
+ return message.containsKey(key);
+ }
+
+ public boolean containsValue(Object value) {
+ return message.containsValue(value);
+ }
+
+ public Set<Entry<String, Object>> entrySet() {
+ return message.entrySet();
+ }
+
+ public boolean equals(Object o) {
+ return message.equals(o);
+ }
+
+ public Object get(Object key) {
+ return message.get(key);
+ }
+
+ public Collection<Attachment> getAttachments() {
+ return message.getAttachments();
+ }
+
+ public String getAttachmentMimeType() {
+ return message.getAttachmentMimeType();
+ }
+
+ public Conduit getConduit() {
+ return message.getConduit();
+ }
+
+ public Destination getDestination() {
+ return message.getDestination();
+ }
+
+ public Exchange getExchange() {
+ return message.getExchange();
+ }
+
+ public void setExchange(Exchange exchange) {
+ message.setExchange(exchange);
+ }
+
+ public String getId() {
+ return message.getId();
+ }
+
+ public InterceptorChain getInterceptorChain() {
+ return message.getInterceptorChain();
+ }
+ public void setInterceptorChain(InterceptorChain chain) {
+ message.setInterceptorChain(chain);
+ }
+
+ public <T> T getContent(Class<T> format) {
+ return message.getContent(format);
+ }
+
+ public Set<Class<?>> getContentFormats() {
+ return message.getContentFormats();
+ }
+
+ public int hashCode() {
+ return message.hashCode();
+ }
+
+ public boolean isEmpty() {
+ return message.isEmpty();
+ }
+
+ public Set<String> keySet() {
+ return message.keySet();
+ }
+
+ public Object put(String key, Object value) {
+ return message.put(key, value);
+ }
+
+ public void putAll(Map<? extends String, ? extends Object> t) {
+ message.putAll(t);
+ }
+
+ public Object remove(Object key) {
+ return message.remove(key);
+ }
+
+ public <T> void setContent(Class<T> format, Object content) {
+ message.setContent(format, content);
+ }
+
+ public int size() {
+ return message.size();
+ }
+
+ public Collection<Object> values() {
+ return message.values();
+ }
+
+ public <T> T get(Class<T> key) {
+ return message.get(key);
+ }
+ public <T> void put(Class<T> key, T value) {
+ message.put(key, value);
+ }
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Attachment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Attachment.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java Fri Aug 25 06:16:36 2006
@@ -1,50 +1,50 @@
-package org.apache.cxf.message;
-
-import java.util.Map;
-
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.Destination;
-
-public interface Exchange extends Map<String, Object> {
- Message getInMessage();
- void setInMessage(Message m);
-
- Message getOutMessage();
- void setOutMessage(Message m);
-
- /**
- * @return the associated incoming Destination (may be anonymous)
- */
- Destination getDestination();
-
- /**
- * @param destination the associated incoming Destination
- */
- void setDestination(Destination destination);
-
- /**
- * @return the associated outgoing Conduit (may be anonymous)
- */
- Conduit getConduit();
-
- /**
- * @param conduit the associated outgoing Conduit
- */
- void setConduit(Conduit conduit);
-
-
- /**
- * Convienience method for storing/retrieving typed objects from the map.
- * equivilent to: (T)get(key.getName());
- * @param <T> key
- * @return
- */
- <T> T get(Class<T> key);
- /**
- * Convienience method for storing/retrieving typed objects from the map.
- * equivilent to: put(key.getName(), value);
- * @param <T> key
- * @return
- */
- <T> void put(Class<T> key, T value);
-}
+package org.apache.cxf.message;
+
+import java.util.Map;
+
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.Destination;
+
+public interface Exchange extends Map<String, Object> {
+ Message getInMessage();
+ void setInMessage(Message m);
+
+ Message getOutMessage();
+ void setOutMessage(Message m);
+
+ /**
+ * @return the associated incoming Destination (may be anonymous)
+ */
+ Destination getDestination();
+
+ /**
+ * @param destination the associated incoming Destination
+ */
+ void setDestination(Destination destination);
+
+ /**
+ * @return the associated outgoing Conduit (may be anonymous)
+ */
+ Conduit getConduit();
+
+ /**
+ * @param conduit the associated outgoing Conduit
+ */
+ void setConduit(Conduit conduit);
+
+
+ /**
+ * Convienience method for storing/retrieving typed objects from the map.
+ * equivilent to: (T)get(key.getName());
+ * @param <T> key
+ * @return
+ */
+ <T> T get(Class<T> key);
+ /**
+ * Convienience method for storing/retrieving typed objects from the map.
+ * equivilent to: put(key.getName(), value);
+ * @param <T> key
+ * @return
+ */
+ <T> void put(Class<T> key, T value);
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java Fri Aug 25 06:16:36 2006
@@ -1,88 +1,88 @@
-package org.apache.cxf.message;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.Destination;
-
-public interface Message extends Map<String, Object> {
-
- String TRANSPORT = "org.apache.cxf.transport";
- String REQUESTOR_ROLE = "org.apache.cxf.client";
- String ONEWAY_MESSAGE = "org.apache.cxf.transport.isOneWayMessage";
-
- String ATTACHMENT_DESERIALIZER = "org.apache.cxf.databinding.attachments.AttachmentDeserializer";
- String ATTACHMENT_SERIALIZER = "org.apache.cxf.databinding.attachments.AttachmentSerializer";
-
- String INBOUND_MESSAGE = "org.apache.cxf.message.inbound";
- String INVOCATION_OBJECTS = "org.apache.cxf.invocation.objects";
-
- String getId();
-
- InterceptorChain getInterceptorChain();
- void setInterceptorChain(InterceptorChain chain);
-
- /**
- * @return the associated Conduit if message is outbound, null otherwise
- */
- Conduit getConduit();
-
- /**
- * @return the associated Destination if message is inbound, null otherwise
- */
- Destination getDestination();
-
- Exchange getExchange();
-
- void setExchange(Exchange exchange);
-
- Collection<Attachment> getAttachments();
-
- /**
- * @return the mime type string
- */
- String getAttachmentMimeType();
-
- /**
- * Retreive the encapsulated content as a particular type (a result type
- * if message is outbound, a source type if message is inbound)
- *
- * @param format the expected content format
- * @return the encapsulated content
- */
- <T> T getContent(Class<T> format);
-
- /**
- * Provide the encapsulated content as a particular type (a result type
- * if message is outbound, a source type if message is inbound)
- *
- * @param format the provided content format
- * @param content the content to be encapsulated
- */
- <T> void setContent(Class<T> format, Object content);
-
- /**
- * @return the set of currently encapsulated content formats
- */
- Set<Class<?>> getContentFormats();
-
-
-
- /**
- * Convienience method for storing/retrieving typed objects from the map.
- * equivilent to: (T)get(key.getName());
- * @param <T> key
- * @return
- */
- <T> T get(Class<T> key);
- /**
- * Convienience method for storing/retrieving typed objects from the map.
- * equivilent to: put(key.getName(), value);
- * @param <T> key
- * @return
- */
- <T> void put(Class<T> key, T value);
-}
+package org.apache.cxf.message;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cxf.interceptor.InterceptorChain;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.Destination;
+
+public interface Message extends Map<String, Object> {
+
+ String TRANSPORT = "org.apache.cxf.transport";
+ String REQUESTOR_ROLE = "org.apache.cxf.client";
+ String ONEWAY_MESSAGE = "org.apache.cxf.transport.isOneWayMessage";
+
+ String ATTACHMENT_DESERIALIZER = "org.apache.cxf.databinding.attachments.AttachmentDeserializer";
+ String ATTACHMENT_SERIALIZER = "org.apache.cxf.databinding.attachments.AttachmentSerializer";
+
+ String INBOUND_MESSAGE = "org.apache.cxf.message.inbound";
+ String INVOCATION_OBJECTS = "org.apache.cxf.invocation.objects";
+
+ String getId();
+
+ InterceptorChain getInterceptorChain();
+ void setInterceptorChain(InterceptorChain chain);
+
+ /**
+ * @return the associated Conduit if message is outbound, null otherwise
+ */
+ Conduit getConduit();
+
+ /**
+ * @return the associated Destination if message is inbound, null otherwise
+ */
+ Destination getDestination();
+
+ Exchange getExchange();
+
+ void setExchange(Exchange exchange);
+
+ Collection<Attachment> getAttachments();
+
+ /**
+ * @return the mime type string
+ */
+ String getAttachmentMimeType();
+
+ /**
+ * Retreive the encapsulated content as a particular type (a result type
+ * if message is outbound, a source type if message is inbound)
+ *
+ * @param format the expected content format
+ * @return the encapsulated content
+ */
+ <T> T getContent(Class<T> format);
+
+ /**
+ * Provide the encapsulated content as a particular type (a result type
+ * if message is outbound, a source type if message is inbound)
+ *
+ * @param format the provided content format
+ * @param content the content to be encapsulated
+ */
+ <T> void setContent(Class<T> format, Object content);
+
+ /**
+ * @return the set of currently encapsulated content formats
+ */
+ Set<Class<?>> getContentFormats();
+
+
+
+ /**
+ * Convienience method for storing/retrieving typed objects from the map.
+ * equivilent to: (T)get(key.getName());
+ * @param <T> key
+ * @return
+ */
+ <T> T get(Class<T> key);
+ /**
+ * Convienience method for storing/retrieving typed objects from the map.
+ * equivilent to: put(key.getName(), value);
+ * @param <T> key
+ * @return
+ */
+ <T> void put(Class<T> key, T value);
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java Fri Aug 25 06:16:36 2006
@@ -1,91 +1,91 @@
-package org.apache.cxf.message;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.Destination;
-
-public class MessageImpl extends HashMap<String, Object> implements Message {
- private List<Attachment> attachments = new ArrayList<Attachment>();
- private Conduit conduit;
- private Destination destination;
- private Exchange exchange;
- private String id;
- private InterceptorChain interceptorChain;
- private Map<Class<?>, Object> contents = new HashMap<Class<?>, Object>();
-
- public Collection<Attachment> getAttachments() {
- return attachments;
- }
-
- public String getAttachmentMimeType() {
- //for sub class overriding
- return null;
- }
-
- public Conduit getConduit() {
- return conduit;
- }
-
- public Destination getDestination() {
- return destination;
- }
-
- public Exchange getExchange() {
- return exchange;
- }
-
- public String getId() {
- return id;
- }
-
- public InterceptorChain getInterceptorChain() {
- return this.interceptorChain;
- }
-
- public <T> T getContent(Class<T> format) {
- return format.cast(contents.get(format));
- }
-
- public <T> void setContent(Class<T> format, Object content) {
- contents.put(format, content);
- }
-
- public Set<Class<?>> getContentFormats() {
- return contents.keySet();
- }
-
- public void setConduit(Conduit c) {
- this.conduit = c;
- }
-
- public void setDestination(Destination d) {
- this.destination = d;
- }
-
- public void setExchange(Exchange e) {
- this.exchange = e;
- }
-
- public void setId(String i) {
- this.id = i;
- }
-
- public void setInterceptorChain(InterceptorChain ic) {
- this.interceptorChain = ic;
- }
-
- public <T> T get(Class<T> key) {
- return key.cast(get(key.getName()));
- }
-
- public <T> void put(Class<T> key, T value) {
- put(key.getName(), value);
- }
-}
+package org.apache.cxf.message;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cxf.interceptor.InterceptorChain;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.Destination;
+
+public class MessageImpl extends HashMap<String, Object> implements Message {
+ private List<Attachment> attachments = new ArrayList<Attachment>();
+ private Conduit conduit;
+ private Destination destination;
+ private Exchange exchange;
+ private String id;
+ private InterceptorChain interceptorChain;
+ private Map<Class<?>, Object> contents = new HashMap<Class<?>, Object>();
+
+ public Collection<Attachment> getAttachments() {
+ return attachments;
+ }
+
+ public String getAttachmentMimeType() {
+ //for sub class overriding
+ return null;
+ }
+
+ public Conduit getConduit() {
+ return conduit;
+ }
+
+ public Destination getDestination() {
+ return destination;
+ }
+
+ public Exchange getExchange() {
+ return exchange;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public InterceptorChain getInterceptorChain() {
+ return this.interceptorChain;
+ }
+
+ public <T> T getContent(Class<T> format) {
+ return format.cast(contents.get(format));
+ }
+
+ public <T> void setContent(Class<T> format, Object content) {
+ contents.put(format, content);
+ }
+
+ public Set<Class<?>> getContentFormats() {
+ return contents.keySet();
+ }
+
+ public void setConduit(Conduit c) {
+ this.conduit = c;
+ }
+
+ public void setDestination(Destination d) {
+ this.destination = d;
+ }
+
+ public void setExchange(Exchange e) {
+ this.exchange = e;
+ }
+
+ public void setId(String i) {
+ this.id = i;
+ }
+
+ public void setInterceptorChain(InterceptorChain ic) {
+ this.interceptorChain = ic;
+ }
+
+ public <T> T get(Class<T> key) {
+ return key.cast(get(key.getName()));
+ }
+
+ public <T> void put(Class<T> key, T value) {
+ put(key.getName(), value);
+ }
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,67 +1,67 @@
-package org.apache.cxf.phase;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.cxf.message.Message;
-
-public abstract class AbstractPhaseInterceptor<T extends Message> implements PhaseInterceptor<T> {
- private String id;
- private String phase;
- private Set<String> before = new HashSet<String>();
- private Set<String> after = new HashSet<String>();
-
-
- public AbstractPhaseInterceptor() {
- super();
- id = getClass().getName();
- }
-
- public void addBefore(String i) {
- before.add(i);
- }
-
- public void addAfter(String i) {
- after.add(i);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.cxf.phase.PhaseInterceptor#getAfter()
- */
- public Set<String> getAfter() {
- return after;
- }
-
- public void setAfter(Set<String> a) {
- this.after = a;
- }
-
- public Set<String> getBefore() {
- return before;
- }
-
- public void setBefore(Set<String> b) {
- this.before = b;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String i) {
- this.id = i;
- }
-
- public String getPhase() {
- return phase;
- }
-
- public void setPhase(String p) {
- this.phase = p;
- }
-
- public void handleFault(T message) {
- }
-}
+package org.apache.cxf.phase;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.cxf.message.Message;
+
+public abstract class AbstractPhaseInterceptor<T extends Message> implements PhaseInterceptor<T> {
+ private String id;
+ private String phase;
+ private Set<String> before = new HashSet<String>();
+ private Set<String> after = new HashSet<String>();
+
+
+ public AbstractPhaseInterceptor() {
+ super();
+ id = getClass().getName();
+ }
+
+ public void addBefore(String i) {
+ before.add(i);
+ }
+
+ public void addAfter(String i) {
+ after.add(i);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.cxf.phase.PhaseInterceptor#getAfter()
+ */
+ public Set<String> getAfter() {
+ return after;
+ }
+
+ public void setAfter(Set<String> a) {
+ this.after = a;
+ }
+
+ public Set<String> getBefore() {
+ return before;
+ }
+
+ public void setBefore(Set<String> b) {
+ this.before = b;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String i) {
+ this.id = i;
+ }
+
+ public String getPhase() {
+ return phase;
+ }
+
+ public void setPhase(String p) {
+ this.phase = p;
+ }
+
+ public void handleFault(T message) {
+ }
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java Fri Aug 25 06:16:36 2006
@@ -1,76 +1,76 @@
-package org.apache.cxf.phase;
-
-public class Phase implements Comparable {
-
- // can be removed from once defined as default value in configuration metadata for bus
-
- // --- out ---
-
- public static final String POST_INVOKE = "post-invoke";
- public static final String PRE_LOGICAL = "pre-logical";
- public static final String USER_LOGICAL = "user-logical";
- public static final String POST_LOGICAL = "post-logical";
- public static final String MARSHAL = "marshal";
- public static final String PRE_PROTOCOL = "pre-protocol";
- public static final String USER_PROTOCOL = "user-protocol";
- public static final String POST_PROTOCOL = "post-protocol";
- public static final String PREPARE_SEND = "prepare-send";
- public static final String PRE_STREAM = "pre-stream";
- public static final String USER_STREAM = "user-stream";
- public static final String POST_STREAM = "port-stream";
- public static final String WRITE = "write";
- public static final String SEND = "send";
-
- // --- in ---
-
- public static final String RECEIVE = "receive";
- public static final String READ = "read";
- public static final String PROTOCOL = "protocol";
- public static final String UNMARSHAL = "unmarshal";
- public static final String PRE_INVOKE = "pre-invoke";
- public static final String INVOKE = "invoke";
-
-
- private String name;
- private int priority;
-
- public Phase() {
- }
-
- public Phase(String n, int p) {
- this.name = n;
- this.priority = p;
- }
-
- public String getName() {
- return name;
- }
- public void setName(String n) {
- this.name = n;
- }
- public int getPriority() {
- return priority;
- }
- public void setPriority(int p) {
- this.priority = p;
- }
-
- public int hashCode() {
- return priority;
- }
- public boolean equals(Object o) {
- Phase p = (Phase)o;
-
- return p.priority == priority
- && p.name.equals(name);
- }
-
- public int compareTo(Object o) {
- Phase p = (Phase)o;
-
- if (priority == p.priority) {
- return name.compareTo(p.name);
- }
- return priority - p.priority;
- }
-}
+package org.apache.cxf.phase;
+
+public class Phase implements Comparable {
+
+ // can be removed from once defined as default value in configuration metadata for bus
+
+ // --- out ---
+
+ public static final String POST_INVOKE = "post-invoke";
+ public static final String PRE_LOGICAL = "pre-logical";
+ public static final String USER_LOGICAL = "user-logical";
+ public static final String POST_LOGICAL = "post-logical";
+ public static final String MARSHAL = "marshal";
+ public static final String PRE_PROTOCOL = "pre-protocol";
+ public static final String USER_PROTOCOL = "user-protocol";
+ public static final String POST_PROTOCOL = "post-protocol";
+ public static final String PREPARE_SEND = "prepare-send";
+ public static final String PRE_STREAM = "pre-stream";
+ public static final String USER_STREAM = "user-stream";
+ public static final String POST_STREAM = "port-stream";
+ public static final String WRITE = "write";
+ public static final String SEND = "send";
+
+ // --- in ---
+
+ public static final String RECEIVE = "receive";
+ public static final String READ = "read";
+ public static final String PROTOCOL = "protocol";
+ public static final String UNMARSHAL = "unmarshal";
+ public static final String PRE_INVOKE = "pre-invoke";
+ public static final String INVOKE = "invoke";
+
+
+ private String name;
+ private int priority;
+
+ public Phase() {
+ }
+
+ public Phase(String n, int p) {
+ this.name = n;
+ this.priority = p;
+ }
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String n) {
+ this.name = n;
+ }
+ public int getPriority() {
+ return priority;
+ }
+ public void setPriority(int p) {
+ this.priority = p;
+ }
+
+ public int hashCode() {
+ return priority;
+ }
+ public boolean equals(Object o) {
+ Phase p = (Phase)o;
+
+ return p.priority == priority
+ && p.name.equals(name);
+ }
+
+ public int compareTo(Object o) {
+ Phase p = (Phase)o;
+
+ if (priority == p.priority) {
+ return name.compareTo(p.name);
+ }
+ return priority - p.priority;
+ }
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseComparator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseComparator.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseComparator.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseComparator.java Fri Aug 25 06:16:36 2006
@@ -1,11 +1,11 @@
-package org.apache.cxf.phase;
-
-import java.util.Comparator;
-
-class PhaseComparator implements Comparator<Phase> {
-
- public int compare(Phase o1, Phase o2) {
- return o1.getPriority() - o2.getPriority();
- }
-
-}
+package org.apache.cxf.phase;
+
+import java.util.Comparator;
+
+class PhaseComparator implements Comparator<Phase> {
+
+ public int compare(Phase o1, Phase o2) {
+ return o1.getPriority() - o2.getPriority();
+ }
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseComparator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseComparator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java Fri Aug 25 06:16:36 2006
@@ -1,39 +1,39 @@
-package org.apache.cxf.phase;
-
-import java.util.Set;
-
-import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.message.Message;
-
-/**
- * A phase interceptor participates in a PhaseInterceptorChain.
- * <pre>
- * The before and after properties contain a list of Ids that the
- * particular interceptor runs before or after.
- * </pre>
- * @see org.apache.cxf.phase.PhaseInterceptorChain
- * @author Dan Diephouse
- */
-public interface PhaseInterceptor<T extends Message> extends Interceptor<T> {
-
- /**
- * A Set of IDs that this interceptor needs to run after.
- * @return
- */
- Set<String> getAfter();
-
- /**
- * A Set of IDs that this interceptor needs to run before.
- * @return
- */
- Set<String> getBefore();
-
- /**
- * The ID of the interceptor.
- * @return
- */
- String getId();
-
- String getPhase();
-
-}
+package org.apache.cxf.phase;
+
+import java.util.Set;
+
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
+
+/**
+ * A phase interceptor participates in a PhaseInterceptorChain.
+ * <pre>
+ * The before and after properties contain a list of Ids that the
+ * particular interceptor runs before or after.
+ * </pre>
+ * @see org.apache.cxf.phase.PhaseInterceptorChain
+ * @author Dan Diephouse
+ */
+public interface PhaseInterceptor<T extends Message> extends Interceptor<T> {
+
+ /**
+ * A Set of IDs that this interceptor needs to run after.
+ * @return
+ */
+ Set<String> getAfter();
+
+ /**
+ * A Set of IDs that this interceptor needs to run before.
+ * @return
+ */
+ Set<String> getBefore();
+
+ /**
+ * The ID of the interceptor.
+ * @return
+ */
+ String getId();
+
+ String getPhase();
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Fri Aug 25 06:16:36 2006
@@ -1,292 +1,292 @@
-package org.apache.cxf.phase;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.ConcurrentModificationException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.message.Message;
-
-/**
- * A PhaseInterceptorChain orders Interceptors according to the phase the
- * particpate in and also according to the before & after properties on an
- * Interceptor.
- * <p>
- * A List of phases is supplied to the PhaseInterceptorChain in the constructor.
- * Interceptors that are added to the chain are ordered by phase. Within that
- * phases interceptors can order themselves. Each PhaseInterceptor has an ID.
- * PhaseInterceptors can supply a Collection of IDs which they should run before
- * or after, supplying fine grained ordering.
- * <p>
- *
- * @author Dan Diephouse
- */
-public class PhaseInterceptorChain implements InterceptorChain {
-
- private static final Logger LOG = Logger.getLogger(PhaseInterceptorChain.class.getName());
-
- private final Map<Phase, List<Interceptor>> interceptors = new TreeMap<Phase, List<Interceptor>>();
- private final Map<String, List<Interceptor>> nameMap = new HashMap<String, List<Interceptor>>();
-
- private State state;
- private ListIterator<Interceptor<? extends Message>> iterator;
- private Message pausedMessage;
-
-
- public PhaseInterceptorChain(List<Phase> ps) {
- state = State.EXECUTING;
-
- for (Phase phase : ps) {
- List<Interceptor> ints = new ArrayList<Interceptor>();
- interceptors.put(phase, ints);
- nameMap.put(phase.getName(), ints);
- }
- iterator = new PhaseInterceptorIterator();
- }
-
- public void add(List<Interceptor> newhandlers) {
- if (newhandlers == null) {
- return;
- }
-
- for (Interceptor handler : newhandlers) {
- add(handler);
- }
- }
-
- @SuppressWarnings("unchecked")
- public void add(Interceptor i) {
- AbstractPhaseInterceptor pi = (AbstractPhaseInterceptor)i;
-
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Adding interceptor " + i + " to phase " + pi.getPhase());
- }
-
- String phaseName = pi.getPhase();
-
- List<Interceptor> phase = nameMap.get(phaseName);
- if (phase == null) {
- LOG.fine("Phase " + phaseName + " does not exist. Skipping handler "
- + i.getClass().getName());
- } else {
- insertInterceptor(phase, pi);
- }
- }
-
- public void pause() {
- state = State.PAUSED;
- }
-
- public void resume() {
- if (state == State.PAUSED) {
- state = State.EXECUTING;
- doIntercept(pausedMessage);
- }
- }
-
-
- /**
- * Invokes each phase's handler in turn.
- *
- * @param context
- * @throws Exception
- */
- @SuppressWarnings("unchecked")
- public boolean doIntercept(Message message) {
- while (state == State.EXECUTING && iterator.hasNext()) {
- try {
- Interceptor currentInterceptor = iterator.next();
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Invoking handleMessage on interceptor " + currentInterceptor);
- }
- currentInterceptor.handleMessage(message);
- } catch (Exception ex) {
- if (LOG.isLoggable(Level.INFO)) {
- LogUtils.log(LOG, Level.INFO, "Interceptor has thrown exception, unwinding now", ex);
- }
- message.setContent(Exception.class, ex);
- unwind(message);
- state = State.ABORTED;
- }
- }
- if (state == State.EXECUTING) {
- state = State.COMPLETE;
- } else if (state == State.PAUSED) {
- pausedMessage = message;
- }
- return state == State.COMPLETE;
- }
-
- @SuppressWarnings("unchecked")
- private void unwind(Message message) {
- while (iterator.hasPrevious()) {
- Interceptor currentInterceptor = iterator.previous();
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Invoking handleFault on interceptor " + currentInterceptor);
- }
- currentInterceptor.handleFault(message);
- }
- }
-
-
- public void remove(Interceptor i) {
- // TODO
- }
-
- public Iterator<Interceptor<? extends Message>> iterator() {
- return getIterator();
- }
- public ListIterator<Interceptor<? extends Message>> getIterator() {
- return new PhaseInterceptorIterator();
- }
-
-
- protected void insertInterceptor(List<Interceptor> intercs, AbstractPhaseInterceptor interc) {
- if (intercs.size() == 0) {
- intercs.add(interc);
- return;
- }
-
- int begin = -1;
- int end = intercs.size();
-
- Collection before = interc.getBefore();
- Collection after = interc.getAfter();
-
- for (int i = 0; i < intercs.size(); i++) {
- PhaseInterceptor cmp = (PhaseInterceptor)intercs.get(i);
-
- if (cmp.getId() == null) {
- continue;
- }
-
- if (before.contains(cmp.getId()) && i < end) {
- end = i;
- }
-
- if (cmp.getBefore().contains(interc.getId()) && i > begin) {
- begin = i;
- }
-
- if (after.contains(cmp.getId()) && i > begin) {
- begin = i;
- }
-
- if (cmp.getAfter().contains(interc.getId()) && i < end) {
- end = i;
- }
- }
-
- if (end < begin + 1) {
- throw new IllegalStateException("Invalid ordering for handler " + interc.getClass().getName());
- }
-
- intercs.add(begin + 1, interc);
- }
-
-
- class PhaseInterceptorIterator implements ListIterator<Interceptor<? extends Message>> {
- List<Interceptor<? extends Message>> called
- = new ArrayList<Interceptor<? extends Message>>();
-
- Iterator<List<Interceptor>> phases;
- List<Interceptor> currentPhase;
- Iterator<Interceptor> currentPhaseIterator;
- Interceptor<? extends Message> last;
-
- PhaseInterceptorIterator() {
- phases = interceptors.values().iterator();
- if (phases.hasNext()) {
- currentPhase = phases.next();
- currentPhaseIterator = currentPhase.iterator();
- last = null;
- }
- }
- public boolean hasNext() {
- if (currentPhaseIterator != null) {
- try {
- if (currentPhaseIterator.hasNext()) {
- return true;
- }
- nextPhase();
- } catch (ConcurrentModificationException cme) {
- refreshIterator();
- }
- return hasNext();
- }
- return false;
- }
- private void refreshIterator() {
- currentPhaseIterator = currentPhase.iterator();
- if (last != null) {
- while (currentPhaseIterator.hasNext()
- && last != currentPhaseIterator.next()) {
- //nothing
- }
- }
- }
- private void nextPhase() {
- if (phases.hasNext()) {
- currentPhase = phases.next();
- currentPhaseIterator = currentPhase.iterator();
- last = null;
- } else {
- currentPhase = null;
- currentPhaseIterator = null;
- last = null;
- }
- }
-
- @SuppressWarnings("unchecked")
- public Interceptor<? extends Message> next() {
- if (currentPhaseIterator != null) {
- try {
- last = currentPhaseIterator.next();
- called.add(last);
- return last;
- } catch (ConcurrentModificationException cme) {
- refreshIterator();
- return next();
- }
- }
- return null;
- }
-
- public boolean hasPrevious() {
- return !called.isEmpty();
- }
- public Interceptor<? extends Message> previous() {
- return called.remove(called.size() - 1);
- }
-
- public int nextIndex() {
- throw new UnsupportedOperationException();
- }
- public int previousIndex() {
- throw new UnsupportedOperationException();
- }
- public void add(Interceptor o) {
- throw new UnsupportedOperationException();
- }
- public void remove() {
- throw new UnsupportedOperationException();
- }
- public void set(Interceptor o) {
- throw new UnsupportedOperationException();
- }
-
- }
-
-
-
-}
+package org.apache.cxf.phase;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.InterceptorChain;
+import org.apache.cxf.message.Message;
+
+/**
+ * A PhaseInterceptorChain orders Interceptors according to the phase the
+ * particpate in and also according to the before & after properties on an
+ * Interceptor.
+ * <p>
+ * A List of phases is supplied to the PhaseInterceptorChain in the constructor.
+ * Interceptors that are added to the chain are ordered by phase. Within that
+ * phases interceptors can order themselves. Each PhaseInterceptor has an ID.
+ * PhaseInterceptors can supply a Collection of IDs which they should run before
+ * or after, supplying fine grained ordering.
+ * <p>
+ *
+ * @author Dan Diephouse
+ */
+public class PhaseInterceptorChain implements InterceptorChain {
+
+ private static final Logger LOG = Logger.getLogger(PhaseInterceptorChain.class.getName());
+
+ private final Map<Phase, List<Interceptor>> interceptors = new TreeMap<Phase, List<Interceptor>>();
+ private final Map<String, List<Interceptor>> nameMap = new HashMap<String, List<Interceptor>>();
+
+ private State state;
+ private ListIterator<Interceptor<? extends Message>> iterator;
+ private Message pausedMessage;
+
+
+ public PhaseInterceptorChain(List<Phase> ps) {
+ state = State.EXECUTING;
+
+ for (Phase phase : ps) {
+ List<Interceptor> ints = new ArrayList<Interceptor>();
+ interceptors.put(phase, ints);
+ nameMap.put(phase.getName(), ints);
+ }
+ iterator = new PhaseInterceptorIterator();
+ }
+
+ public void add(List<Interceptor> newhandlers) {
+ if (newhandlers == null) {
+ return;
+ }
+
+ for (Interceptor handler : newhandlers) {
+ add(handler);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public void add(Interceptor i) {
+ AbstractPhaseInterceptor pi = (AbstractPhaseInterceptor)i;
+
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Adding interceptor " + i + " to phase " + pi.getPhase());
+ }
+
+ String phaseName = pi.getPhase();
+
+ List<Interceptor> phase = nameMap.get(phaseName);
+ if (phase == null) {
+ LOG.fine("Phase " + phaseName + " does not exist. Skipping handler "
+ + i.getClass().getName());
+ } else {
+ insertInterceptor(phase, pi);
+ }
+ }
+
+ public void pause() {
+ state = State.PAUSED;
+ }
+
+ public void resume() {
+ if (state == State.PAUSED) {
+ state = State.EXECUTING;
+ doIntercept(pausedMessage);
+ }
+ }
+
+
+ /**
+ * Invokes each phase's handler in turn.
+ *
+ * @param context
+ * @throws Exception
+ */
+ @SuppressWarnings("unchecked")
+ public boolean doIntercept(Message message) {
+ while (state == State.EXECUTING && iterator.hasNext()) {
+ try {
+ Interceptor currentInterceptor = iterator.next();
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Invoking handleMessage on interceptor " + currentInterceptor);
+ }
+ currentInterceptor.handleMessage(message);
+ } catch (Exception ex) {
+ if (LOG.isLoggable(Level.INFO)) {
+ LogUtils.log(LOG, Level.INFO, "Interceptor has thrown exception, unwinding now", ex);
+ }
+ message.setContent(Exception.class, ex);
+ unwind(message);
+ state = State.ABORTED;
+ }
+ }
+ if (state == State.EXECUTING) {
+ state = State.COMPLETE;
+ } else if (state == State.PAUSED) {
+ pausedMessage = message;
+ }
+ return state == State.COMPLETE;
+ }
+
+ @SuppressWarnings("unchecked")
+ private void unwind(Message message) {
+ while (iterator.hasPrevious()) {
+ Interceptor currentInterceptor = iterator.previous();
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Invoking handleFault on interceptor " + currentInterceptor);
+ }
+ currentInterceptor.handleFault(message);
+ }
+ }
+
+
+ public void remove(Interceptor i) {
+ // TODO
+ }
+
+ public Iterator<Interceptor<? extends Message>> iterator() {
+ return getIterator();
+ }
+ public ListIterator<Interceptor<? extends Message>> getIterator() {
+ return new PhaseInterceptorIterator();
+ }
+
+
+ protected void insertInterceptor(List<Interceptor> intercs, AbstractPhaseInterceptor interc) {
+ if (intercs.size() == 0) {
+ intercs.add(interc);
+ return;
+ }
+
+ int begin = -1;
+ int end = intercs.size();
+
+ Collection before = interc.getBefore();
+ Collection after = interc.getAfter();
+
+ for (int i = 0; i < intercs.size(); i++) {
+ PhaseInterceptor cmp = (PhaseInterceptor)intercs.get(i);
+
+ if (cmp.getId() == null) {
+ continue;
+ }
+
+ if (before.contains(cmp.getId()) && i < end) {
+ end = i;
+ }
+
+ if (cmp.getBefore().contains(interc.getId()) && i > begin) {
+ begin = i;
+ }
+
+ if (after.contains(cmp.getId()) && i > begin) {
+ begin = i;
+ }
+
+ if (cmp.getAfter().contains(interc.getId()) && i < end) {
+ end = i;
+ }
+ }
+
+ if (end < begin + 1) {
+ throw new IllegalStateException("Invalid ordering for handler " + interc.getClass().getName());
+ }
+
+ intercs.add(begin + 1, interc);
+ }
+
+
+ class PhaseInterceptorIterator implements ListIterator<Interceptor<? extends Message>> {
+ List<Interceptor<? extends Message>> called
+ = new ArrayList<Interceptor<? extends Message>>();
+
+ Iterator<List<Interceptor>> phases;
+ List<Interceptor> currentPhase;
+ Iterator<Interceptor> currentPhaseIterator;
+ Interceptor<? extends Message> last;
+
+ PhaseInterceptorIterator() {
+ phases = interceptors.values().iterator();
+ if (phases.hasNext()) {
+ currentPhase = phases.next();
+ currentPhaseIterator = currentPhase.iterator();
+ last = null;
+ }
+ }
+ public boolean hasNext() {
+ if (currentPhaseIterator != null) {
+ try {
+ if (currentPhaseIterator.hasNext()) {
+ return true;
+ }
+ nextPhase();
+ } catch (ConcurrentModificationException cme) {
+ refreshIterator();
+ }
+ return hasNext();
+ }
+ return false;
+ }
+ private void refreshIterator() {
+ currentPhaseIterator = currentPhase.iterator();
+ if (last != null) {
+ while (currentPhaseIterator.hasNext()
+ && last != currentPhaseIterator.next()) {
+ //nothing
+ }
+ }
+ }
+ private void nextPhase() {
+ if (phases.hasNext()) {
+ currentPhase = phases.next();
+ currentPhaseIterator = currentPhase.iterator();
+ last = null;
+ } else {
+ currentPhase = null;
+ currentPhaseIterator = null;
+ last = null;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public Interceptor<? extends Message> next() {
+ if (currentPhaseIterator != null) {
+ try {
+ last = currentPhaseIterator.next();
+ called.add(last);
+ return last;
+ } catch (ConcurrentModificationException cme) {
+ refreshIterator();
+ return next();
+ }
+ }
+ return null;
+ }
+
+ public boolean hasPrevious() {
+ return !called.isEmpty();
+ }
+ public Interceptor<? extends Message> previous() {
+ return called.remove(called.size() - 1);
+ }
+
+ public int nextIndex() {
+ throw new UnsupportedOperationException();
+ }
+ public int previousIndex() {
+ throw new UnsupportedOperationException();
+ }
+ public void add(Interceptor o) {
+ throw new UnsupportedOperationException();
+ }
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ public void set(Interceptor o) {
+ throw new UnsupportedOperationException();
+ }
+
+ }
+
+
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseManager.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseManager.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseManager.java Fri Aug 25 06:16:36 2006
@@ -1,9 +1,9 @@
-package org.apache.cxf.phase;
-
-import java.util.List;
-
-public interface PhaseManager {
- List<Phase> getInPhases();
-
- List<Phase> getOutPhases();
-}
+package org.apache.cxf.phase;
+
+import java.util.List;
+
+public interface PhaseManager {
+ List<Phase> getInPhases();
+
+ List<Phase> getOutPhases();
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceManager.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceManager.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceManager.java Fri Aug 25 06:16:36 2006
@@ -1,13 +1,13 @@
-package org.apache.cxf.service;
-
-import javax.xml.namespace.QName;
-
-public interface ServiceManager {
-
- void register(Service service);
-
- void unregister(Service service);
-
- Service getService(QName name);
-
-}
+package org.apache.cxf.service;
+
+import javax.xml.namespace.QName;
+
+public interface ServiceManager {
+
+ void register(Service service);
+
+ void unregister(Service service);
+
+ Service getService(QName name);
+
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java?rev=436785&r1=436784&r2=436785&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java Fri Aug 25 06:16:36 2006
@@ -1,60 +1,60 @@
-package org.apache.cxf.service.model;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.service.Service;
-
-public final class ServiceModelUtil {
-
- private ServiceModelUtil() {
- }
-
- public static Service getService(Exchange exchange) {
- return exchange.get(Service.class);
- }
-
- public static String getTargetNamespace(Exchange exchange) {
- return getService(exchange).getServiceInfo().getTargetNamespace();
- }
-
- public static BindingOperationInfo getOperation(Exchange exchange, String opName) {
- return getOperation(exchange, new QName(getTargetNamespace(exchange), opName));
- }
-
- public static BindingOperationInfo getOperation(Exchange exchange, QName opName) {
- Endpoint ep = exchange.get(Endpoint.class);
- BindingInfo service = ep.getEndpointInfo().getBinding();
- return service.getOperation(opName);
- }
-
- public static SchemaInfo getSchema(ServiceInfo serviceInfo, MessagePartInfo messagePartInfo) {
- SchemaInfo schemaInfo = null;
- String tns = null;
- if (messagePartInfo.isElement()) {
- tns = messagePartInfo.getElementQName().getNamespaceURI();
- } else {
- tns = messagePartInfo.getTypeQName().getNamespaceURI();
- }
- for (SchemaInfo schema : serviceInfo.getTypeInfo().getSchemas()) {
- if (tns.equals(schema.getNamespaceURI())) {
- schemaInfo = schema;
- }
- }
- return schemaInfo;
- }
-
- public static QName getPartName(MessagePartInfo part) {
- QName name = part.getElementQName();
- if (name == null) {
- name = part.getTypeQName();
- }
- return name;
- }
-
- public static QName getRPCPartName(MessagePartInfo part) {
- QName name = getPartName(part);
- return new QName(name.getNamespaceURI(), part.getName().getLocalPart());
- }
-}
+package org.apache.cxf.service.model;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.service.Service;
+
+public final class ServiceModelUtil {
+
+ private ServiceModelUtil() {
+ }
+
+ public static Service getService(Exchange exchange) {
+ return exchange.get(Service.class);
+ }
+
+ public static String getTargetNamespace(Exchange exchange) {
+ return getService(exchange).getServiceInfo().getTargetNamespace();
+ }
+
+ public static BindingOperationInfo getOperation(Exchange exchange, String opName) {
+ return getOperation(exchange, new QName(getTargetNamespace(exchange), opName));
+ }
+
+ public static BindingOperationInfo getOperation(Exchange exchange, QName opName) {
+ Endpoint ep = exchange.get(Endpoint.class);
+ BindingInfo service = ep.getEndpointInfo().getBinding();
+ return service.getOperation(opName);
+ }
+
+ public static SchemaInfo getSchema(ServiceInfo serviceInfo, MessagePartInfo messagePartInfo) {
+ SchemaInfo schemaInfo = null;
+ String tns = null;
+ if (messagePartInfo.isElement()) {
+ tns = messagePartInfo.getElementQName().getNamespaceURI();
+ } else {
+ tns = messagePartInfo.getTypeQName().getNamespaceURI();
+ }
+ for (SchemaInfo schema : serviceInfo.getTypeInfo().getSchemas()) {
+ if (tns.equals(schema.getNamespaceURI())) {
+ schemaInfo = schema;
+ }
+ }
+ return schemaInfo;
+ }
+
+ public static QName getPartName(MessagePartInfo part) {
+ QName name = part.getElementQName();
+ if (name == null) {
+ name = part.getTypeQName();
+ }
+ return name;
+ }
+
+ public static QName getRPCPartName(MessagePartInfo part) {
+ QName name = getPartName(part);
+ return new QName(name.getNamespaceURI(), part.getName().getLocalPart());
+ }
+}
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/Conduit.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/Destination.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/MessageObserver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/Observable.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/resources/config-metadata/bus-config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/resources/config-metadata/http-client-config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/resources/config-metadata/http-listener-config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/resources/config-metadata/http-server-config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/api/src/main/resources/config-metadata/jms-client-config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date