servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1550051 - in /servicemix/components/trunk: engines/servicemix-camel/ engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/ engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/ shared-libraries/ser...
Date Wed, 11 Dec 2013 05:04:38 GMT
Author: ningjiang
Date: Wed Dec 11 05:04:38 2013
New Revision: 1550051

URL: http://svn.apache.org/r1550051
Log:
SM-2218 Do not throw exception in the SimpleBeanFactory getAliases() method

Added:
    servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java
    servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/
    servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml
Modified:
    servicemix/components/trunk/engines/servicemix-camel/pom.xml
    servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java

Modified: servicemix/components/trunk/engines/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/pom.xml?rev=1550051&r1=1550050&r2=1550051&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-camel/pom.xml Wed Dec 11 05:04:38 2013
@@ -189,6 +189,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jaxb</artifactId>
+            <version>${camel.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <scope>test</scope>

Added: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java?rev=1550051&view=auto
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java
(added)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JAXBConverterLoadingSpringTest.java
Wed Dec 11 05:04:38 2013
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+
+import java.util.List;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+
+public class JAXBConverterLoadingSpringTest extends SpringJbiTestSupport {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public void test() throws Exception {
+        // We just need to make sure the fallbackConverter can be load
+        assertTrue(true);
+    }
+
+    @Override
+    protected String getServiceUnitName() {
+        return "su14";
+    }
+
+    @Override
+    protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList)
{
+    }
+}
\ No newline at end of file

Added: servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml?rev=1550051&view=auto
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml
(added)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/resources/org/apache/servicemix/camel/su14-src/camel-context.xml
Wed Dec 11 05:04:38 2013
@@ -0,0 +1,49 @@
+<?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.
+
+-->
+<!-- START SNIPPET: camel -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+    ">
+
+  <camelContext xmlns="http://camel.apache.org/schema/spring" id="su14">
+    <route>
+      <from uri="direct:start"/>
+      <convertBodyTo type="org.apache.servicemix.camel.su14.Person"/>
+      <to uri="mock:result"/>
+    </route>
+  </camelContext>
+
+    <!-- setup AOP to inject the interceptor -->
+    <bean class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
+        <property name="beanNames">
+            <list>
+                <value>*Handler</value>
+            </list>
+        </property>
+        <property name="interceptorNames">
+            <value>transactionInterceptor</value>
+        </property>
+    </bean>
+
+</beans>
+<!-- END SNIPPET: camel -->

Modified: servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java?rev=1550051&r1=1550050&r2=1550051&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
(original)
+++ servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
Wed Dec 11 05:04:38 2013
@@ -44,10 +44,11 @@ public class SimpleBeanFactory implement
     }
     public String[] getAliases(String name) throws NoSuchBeanDefinitionException {
         Object bean = beans.get(name);
-        if (bean == null) {
-            throw new NoSuchBeanDefinitionException(name);
+        if (bean != null) {
+           return new String[]{name};
+        } else {
+           return new String[0];
         }
-        return new String[0];
     }
     public Object getBean(String name) throws BeansException {
         return getBean(name, (Class) null);
@@ -110,4 +111,4 @@ public class SimpleBeanFactory implement
         return false;
     }
     
-}
\ No newline at end of file
+}



Mime
View raw message