svn commit: r1136044 - in /camel/trunk/components: camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/ camel-cxf/src/main/java/org/apache/camel/component/cxf/ camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/ c...

[cs...@apache.org]

Author: cschneider
Date: Wed Jun 15 13:52:22 2011
New Revision: 1136044

URL: http://svn.apache.org/viewvc?rev=1136044&view=rev
Log:
Moving header related classes to common.header. Seems they were there already so we had duplicates.

Added:
    camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
      - copied, changed from r1136012, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
    camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java
      - copied, changed from r1136012, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java
    camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java
      - copied, changed from r1136012, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java
Removed:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java
Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java

Copied: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java (from r1136012, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java?p2=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java&r1=1136012&r2=1136044&rev=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java Wed Jun 15 13:52:22 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cxf;
+package org.apache.camel.component.cxf.common.header;
 
 import java.util.HashMap;
 import java.util.List;

Copied: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java (from r1136012, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java?p2=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java&r1=1136012&r2=1136044&rev=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java Wed Jun 15 13:52:22 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cxf;
+package org.apache.camel.component.cxf.common.header;
 
 import java.util.List;
 

Copied: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java (from r1136012, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java?p2=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java&r1=1136012&r2=1136044&rev=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java Wed Jun 15 13:52:22 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.cxf;
+package org.apache.camel.component.cxf.common.header;
 
 import java.util.Arrays;
 import java.util.Iterator;

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1136044&r1=1136043&r2=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Wed Jun 15 13:52:22 2011
@@ -30,6 +30,7 @@ import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.Service;
+import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.component.cxf.feature.MessageDataFormatFeature;
 import org.apache.camel.component.cxf.feature.PayLoadDataFormatFeature;

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java?rev=1136044&r1=1136043&r2=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java Wed Jun 15 13:52:22 2011
@@ -21,7 +21,7 @@ import java.util.List;
 
 import javax.jws.WebService;
 
-import org.apache.camel.component.cxf.CxfHeaderFilterStrategy;
+import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
 import org.apache.camel.component.cxf.common.message.CxfMessageMapper;
 import org.apache.camel.component.cxf.common.message.DefaultCxfMesssageMapper;
 import org.apache.camel.impl.ProcessorEndpoint;

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java?rev=1136044&r1=1136043&r2=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java Wed Jun 15 13:52:22 2011
@@ -20,7 +20,7 @@ package org.apache.camel.component.cxf.s
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.camel.component.cxf.MessageHeaderFilter;
+import org.apache.camel.component.cxf.common.header.MessageHeaderFilter;
 import org.apache.camel.spi.HeaderFilterStrategy.Direction;
 import org.apache.cxf.headers.Header;
 

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=1136044&r1=1136043&r2=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Wed Jun 15 13:52:22 2011
@@ -43,9 +43,9 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.cxf.CxfEndpoint;
-import org.apache.camel.component.cxf.CxfHeaderFilterStrategy;
 import org.apache.camel.component.cxf.CxfPayload;
-import org.apache.camel.component.cxf.MessageHeaderFilter;
+import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
+import org.apache.camel.component.cxf.common.header.MessageHeaderFilter;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.cxf.binding.soap.SoapHeader;

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java?rev=1136044&r1=1136043&r2=1136044&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java Wed Jun 15 13:52:22 2011
@@ -27,7 +27,7 @@ import java.util.Map;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.camel.component.cxf.CxfHeaderFilterStrategy;
+import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
 import org.apache.camel.component.cxf.common.message.CxfMessageHelper;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;