You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/04/18 05:13:53 UTC

[camel] branch master updated: CAMEL-13421: Remove BeanInvocation from camel-bean.

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 7485fef  CAMEL-13421: Remove BeanInvocation from camel-bean.
7485fef is described below

commit 7485fef6fd31f13eaaaa22ca7e141f8ce8463989
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 18 07:13:40 2019 +0200

    CAMEL-13421: Remove BeanInvocation from camel-bean.
---
 .../jms/remoting/RemotingTest-context.xml          | 50 ----------------------
 .../apache/camel/component/jms/remoting/spring.xml |  6 +--
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/RemotingTest-context.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/RemotingTest-context.xml
deleted file mode 100644
index 65936e2..0000000
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/RemotingTest-context.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-
-    <bean id="sayService" class="org.apache.camel.spring.remoting.SayService" scope="singleton"/>
-
-    <camelContext xmlns="http://camel.apache.org/schema/spring">
-        <jmxAgent id="agent" disabled="true"/>
-        <!-- create the client proxy -->
-        <proxy id="sayProxy" serviceUrl="jms:test.serviceQueue"
-               serviceInterface="org.apache.camel.spring.remoting.ISay"/>
-
-        <!-- export the service -->
-        <export id="say" uri="jms:test.serviceQueue" serviceRef="sayService"
-                serviceInterface="org.apache.camel.spring.remoting.ISay"/>
-
-    </camelContext>
-
-    <!-- configure the JMS component -->
-    <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
-        <property name="connectionFactory">
-            <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory">
-                <property name="brokerURL" value="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
-            </bean>
-        </property>
-    </bean>
-</beans>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml
index a7a9ffe..940617a 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml
@@ -25,16 +25,16 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="sayService" class="org.apache.camel.component.jms.remoting.SayService" scope="singleton"/>
+  <bean id="sayService" class="org.apache.camel.component.jms.remoting.SayService"/>
 
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
       <jmxAgent id="agent" disabled="true"/>
     <!-- create the client proxy -->
-    <proxy id="sayProxy" binding="false" serviceUrl="activemq:test.serviceQueue"
+    <proxy id="sayProxy" serviceUrl="activemq:test.serviceQueue"
            serviceInterface="org.apache.camel.component.jms.remoting.ISay"/>
 
     <!-- export the service -->
-    <export id="say" uri="activemq:test.serviceQueue" serviceRef="sayService"
+    <export id="say" uri="activemq:test.serviceQueue" serviceRef="sayService" method="say"
             serviceInterface="org.apache.camel.component.jms.remoting.ISay"/>
   </camelContext>