camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r713760 - in /activemq/camel/trunk/components: camel-cxf/src/main/java/org/apache/camel/component/cxf/ camel-http/src/main/java/org/apache/camel/component/http/ camel-jms/src/main/java/org/apache/camel/component/jms/ camel-ognl/src/main/jav...
Date Thu, 13 Nov 2008 17:49:35 GMT
Author: janstey
Date: Thu Nov 13 09:49:35 2008
New Revision: 713760

URL: http://svn.apache.org/viewvc?rev=713760&view=rev
Log:
CAMEL-1061 - More removals

Removed:
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java
Modified:
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
    activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
    activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
    activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java
Thu Nov 13 09:49:35 2008
@@ -112,7 +112,7 @@
             }
             // Copy the outMessage back if we set the out's body
             org.apache.camel.Message camelMessage = result.getOut();
-            CxfBinding.copyMessage(camelMessage, outMessage);
+            CxfBinding.copyMessage(new CxfHeaderFilterStrategy(), camelMessage, outMessage);
         }
         // set the CXF outMessage back to the exchange
         exchange.setOutMessage(outMessage);

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
Thu Nov 13 09:49:35 2008
@@ -61,13 +61,6 @@
         return null;
     }
 
-    /**
-     * @deprecated please use {@link #createCxfMessage(HeaderFilterStrategy, CxfExchange)}
instead
-     */
-    public static Message createCxfMessage(CxfExchange exchange) {
-        return CxfBinding.createCxfMessage(new CxfHeaderFilterStrategy(), exchange);
-    }
-
     public static Message createCxfMessage(HeaderFilterStrategy strategy, CxfExchange exchange)
{
 
         Message answer = exchange.getInMessage();
@@ -111,13 +104,6 @@
         return answer;
     }
 
-    /**
-     * @deprecated please use {@link #storeCxfResponse(HeaderFilterStrategy, CxfExchange,
Message)} instead.
-     */
-    public static void storeCxfResponse(CxfExchange exchange, Message response) {
-        CxfBinding.storeCxfResponse(new CxfHeaderFilterStrategy(), exchange, response);
-    }
-
     public static void storeCxfResponse(HeaderFilterStrategy strategy, CxfExchange exchange,
             Message response) {
         CxfMessage out = exchange.getOut();
@@ -132,14 +118,7 @@
                 out.setBody(response);
             }
         }
-    }
-
-    /**
-     * @deprecated Please use {@link #copyMessage(HeaderFilterStrategy, org.apache.camel.Message,
Message)} instead.
-     */
-    public static void copyMessage(org.apache.camel.Message camelMessage, org.apache.cxf.message.Message
cxfMessage) {
-        CxfBinding.copyMessage(new CxfHeaderFilterStrategy(), camelMessage, cxfMessage);
-    }
+    }  
 
     // Copy the Camel message to CXF message
     public static void copyMessage(HeaderFilterStrategy strategy,

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
Thu Nov 13 09:49:35 2008
@@ -38,13 +38,6 @@
 
     }
     
-    /**
-     * @deprecated  Please use {@link #getCxfInMessage(HeaderFilterStrategy, org.apache.camel.Exchange,
boolean)}
-     */
-    public static org.apache.cxf.message.Message getCxfInMessage(org.apache.camel.Exchange
exchange, boolean isClient) {
-        return CxfSoapBinding.getCxfInMessage(new DefaultHeaderFilterStrategy(), exchange,
isClient);
-    }
-    
     public static org.apache.cxf.message.Message getCxfInMessage(HeaderFilterStrategy headerFilterStrategy,
             org.apache.camel.Exchange exchange, boolean isClient) {
         MessageImpl answer = new MessageImpl();
@@ -75,14 +68,7 @@
         answer.setExchange(cxfExchange);
         cxfExchange.setInMessage(answer);
         return answer;
-    }
-
-    /**
-     * @deprecated Please use {@link #getCxfOutMessage(HeaderFilterStrategy, org.apache.camel.Exchange,
boolean)}
-     */
-    public static org.apache.cxf.message.Message getCxfOutMessage(org.apache.camel.Exchange
exchange, boolean isClient) {
-        return CxfSoapBinding.getCxfOutMessage(new DefaultHeaderFilterStrategy(), exchange,
isClient);
-    }
+    }    
     
     public static org.apache.cxf.message.Message getCxfOutMessage(HeaderFilterStrategy headerFilterStrategy,
             org.apache.camel.Exchange exchange, boolean isClient) {
@@ -111,28 +97,4 @@
         outMessage.putAll(message.getHeaders());
         return outMessage;
     }
-
-    /**
-     * @deprecated Please use {@link CxfHeaderHelper#propagateCxfToCamel(HeaderFilterStrategy,
org.apache.cxf.message.Message, Map)}
-     */
-    public static void setProtocolHeader(Map<String, Object> headers, Map<String,
List<String>> protocolHeader) {
-        if (protocolHeader != null) {
-            StringBuilder value = new StringBuilder(256);
-            for (Map.Entry<String, List<String>> entry : protocolHeader.entrySet())
{
-                value.setLength(0);
-                boolean first = true;
-                for (String s : entry.getValue()) {
-                    if (!first) {
-                        value.append("; ");
-                    }
-                    value.append(s);
-                    first = false;
-                }
-                headers.put(entry.getKey(), value.toString());
-            }
-        }
-
-    }
-
-
 }

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapEndpoint.java
Thu Nov 13 09:49:35 2008
@@ -164,16 +164,6 @@
     public void setCamelContext(CamelContext context) {
         endpoint.setCamelContext(context);
     }
-    
-    @Deprecated
-    public CamelContext getContext() {
-        return getCamelContext();
-    }
-    
-    @Deprecated
-    public void setContext(CamelContext context) {
-        setCamelContext(context);
-    }
 
     public HeaderFilterStrategy getHeaderFilterStrategy() {
         return headerFilterStrategy;

Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
(original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
Thu Nov 13 09:49:35 2008
@@ -104,21 +104,6 @@
         }
     }
 
-    /*
-     * Exclude a set of headers from responses and new requests as all headers
-     * get propagated between exchanges by default
-     *
-     * @deprecated please use {@link HeaderPropagationStrategy} instead
-     */
-    public boolean shouldHeaderBePropagated(String headerName, String headerValue) {
-        if (headerValue == null) {
-            return false;
-        }
-
-        return headerFilterStrategy != null
-            && !headerFilterStrategy.applyFilterToCamelHeaders(headerName, headerValue);
-    }
-
     public boolean isUseReaderForPayload() {
         return useReaderForPayload;
     }

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Thu Nov 13 09:49:35 2008
@@ -42,6 +42,7 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.impl.DefaultHeaderFilterStrategy;
 import org.apache.camel.spi.HeaderFilterStrategy;
@@ -261,7 +262,7 @@
      * This default implementation will allow:
      * <ul>
      *   <li>any primitives and their counter Objects (Integer, Double etc.)</li>
-     *   <li>String and any other litterals, Character, CharSequence</li>
+     *   <li>String and any other literals, Character, CharSequence</li>
      *   <li>Boolean</li>
      *   <li>Number</li>
      *   <li>java.util.Date</li>
@@ -361,33 +362,6 @@
     }
 
     /**
-     * @deprecated Please use {@link DefaultHeaderFilterStrategy#getOutFilter()}
-     */
-    public Set<String> getIgnoreJmsHeaders() {
-        if (headerFilterStrategy instanceof DefaultHeaderFilterStrategy) {
-            return ((DefaultHeaderFilterStrategy)headerFilterStrategy)
-                .getOutFilter();
-        } else {
-            // Shouldn't get here unless a strategy that isn't an extension of
-            // DefaultHeaderPropagationStrategy has been injected.
-            return null;
-        }
-    }
-
-    /**
-     * @deprecated Please use {@link DefaultHeaderFilterStrategy#setOutFilter()}
-     */
-    public void setIgnoreJmsHeaders(Set<String> ignoreJmsHeaders) {
-        if (headerFilterStrategy instanceof DefaultHeaderFilterStrategy) {
-            ((DefaultHeaderFilterStrategy)headerFilterStrategy)
-                .setOutFilter(ignoreJmsHeaders);
-        } else {
-            // Shouldn't get here unless a strategy that isn't an extension of
-            // DefaultHeaderPropagationStrategy has been injected.
-        }
-    }
-
-    /**
      * Strategy to allow filtering of headers which are put on the JMS message
      * <p/>
      * <b>Note</b>: Currently only supports sending java identifiers as keys

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Thu Nov 13 09:49:35 2008
@@ -134,7 +134,7 @@
      * Factory method for creating a new template for InOut message exchanges
      */
     public JmsOperations createInOutTemplate() {
-        return configuration.createInOutTemplate(this, pubSubDomain, destination, getRequestTimeout());
+        return configuration.createInOutTemplate(this, pubSubDomain, destination, configuration.getRequestTimeout());
     }
 
     // Properties
@@ -191,22 +191,6 @@
         this.requestor = requestor;
     }
 
-    /**
-     * @deprecated use configuration.requestTimeout. Will be removed in Camel 2.0
-     */
-    public long getRequestTimeout() {
-        return configuration.getRequestTimeout();
-    }
-
-    /**
-     * Sets the timeout in milliseconds which requests should timeout after
-     *
-     * @deprecated use configuration.requestTimeout. Will be removed in Camel 2.0
-     */
-    public void setRequestTimeout(long requestTimeout) {
-        configuration.setRequestTimeout(requestTimeout);
-    }
-
     public boolean isPubSubDomain() {
         return pubSubDomain;
     }

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Thu Nov 13 09:49:35 2008
@@ -254,16 +254,6 @@
         }
     }
 
-    /**
-     * Preserved for backwards compatibility.
-     *
-     * @deprecated will be removed in Camel 2.0
-     * @see #getInOnlyTemplate()
-     */
-    public JmsOperations getTemplate() {
-        return getInOnlyTemplate();
-    }
-
     public JmsOperations getInOnlyTemplate() {
         if (inOnlyTemplate == null) {
             inOnlyTemplate = endpoint.createInOnlyTemplate();

Modified: activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
(original)
+++ activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/RootObject.java
Thu Nov 13 09:49:35 2008
@@ -54,21 +54,7 @@
 
     public Message getRequest() {
         return exchange.getIn();
-    }
-    
-    /**
-     * @deprecated doesnt work in OGNL use request instead
-     */
-    public Message getIn() {
-        return exchange.getIn();
-    }
-
-    /**
-     * @deprecated doesnt work in OGNL use response instead
-     */
-    public Message getOut() {
-        return exchange.getOut();
-    }
+    }   
 
     public Message getResponse() {
         return exchange.getOut();

Modified: activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java?rev=713760&r1=713759&r2=713760&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
(original)
+++ activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
Thu Nov 13 09:49:35 2008
@@ -25,10 +25,10 @@
     public void testOgnlExpressions() throws Exception {
         assertExpression("exchange", exchange);
         assertExpression("exchange.getIn().body", "<hello id='m123'>world!</hello>");
-        assertExpression("getIn().body", "<hello id='m123'>world!</hello>");
+        assertExpression("getRequest().body", "<hello id='m123'>world!</hello>");
         assertExpression("request.body", "<hello id='m123'>world!</hello>");
-        assertExpression("getIn().headers['foo']", "abc");
-        assertExpression("getIn().headers.foo", "abc");
+        assertExpression("getRequest().headers['foo']", "abc");
+        assertExpression("getRequest().headers.foo", "abc");
         assertExpression("request.headers.foo", "abc");
     }
 



Mime
View raw message