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 2012/05/25 15:50:44 UTC
svn commit: r1342623 - in /camel/trunk/components:
camel-blueprint/src/main/java/org/apache/camel/blueprint/
camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/
camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/
camel-tes...
Author: davsclaus
Date: Fri May 25 13:50:43 2012
New Revision: 1342623
URL: http://svn.apache.org/viewvc?rev=1342623&view=rev
Log:
CAMEL-5307: Fixed camel-test-blueprint deadlock issue.
Added:
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java
camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelEndpointInject.xml
- copied, changed from r1342539, camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java Fri May 25 13:50:43 2012
@@ -49,7 +49,7 @@ public class BlueprintComponentResolver
}
}
} catch (Exception e) {
- LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ LOG.trace("Ignored error looking up bean: " + name + " due: " + e.getMessage(), e);
}
try {
Object bean = context.getRegistry().lookup(".camelBlueprint.componentResolver." + name);
@@ -58,7 +58,7 @@ public class BlueprintComponentResolver
return ((ComponentResolver) bean).resolveComponent(name, context);
}
} catch (Exception e) {
- LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ LOG.trace("Ignored error looking up bean: " + name + " due: " + e.getMessage(), e);
}
return getComponent(name, context);
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java Fri May 25 13:50:43 2012
@@ -67,6 +67,7 @@ public class BlueprintContainerRegistry
return lookupByType(blueprintContainer, type);
}
+ @SuppressWarnings("unchecked")
public static <T> Map<String, T> lookupByType(BlueprintContainer blueprintContainer, Class<T> type) {
Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
Map<String, T> objects = new LinkedHashMap<String, T>();
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java Fri May 25 13:50:43 2012
@@ -41,7 +41,7 @@ public class BlueprintDataFormatResolver
return ((DataFormatResolver) bean).resolveDataFormat(name, context);
}
} catch (Exception e) {
- LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ LOG.trace("Ignored error looking up bean: " + name + " due: " + e.getMessage(), e);
}
return super.resolveDataFormat(name, context);
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java Fri May 25 13:50:43 2012
@@ -41,7 +41,7 @@ public class BlueprintLanguageResolver e
return ((LanguageResolver) bean).resolveLanguage(name, context);
}
} catch (Exception e) {
- LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ LOG.trace("Ignored error looking up bean: " + name + " due: " + e.getMessage(), e);
}
return super.resolveLanguage(name, context);
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java Fri May 25 13:50:43 2012
@@ -547,6 +547,7 @@ public class CamelNamespaceHandler imple
}
public Object beforeInit(Object bean, String beanName, BeanCreator beanCreator, BeanMetadata beanMetadata) {
+ LOG.trace("Before init of bean: {} -> {}", beanName, bean);
// prefer to inject later in afterInit
return bean;
}
@@ -636,6 +637,7 @@ public class CamelNamespaceHandler imple
}
public Object afterInit(Object bean, String beanName, BeanCreator beanCreator, BeanMetadata beanMetadata) {
+ LOG.trace("After init of bean: {} -> {}", beanName, bean);
// we cannot inject CamelContextAware beans as the CamelContext may not be ready
injectFields(bean, beanName);
injectMethods(bean, beanName);
Modified: camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java Fri May 25 13:50:43 2012
@@ -158,11 +158,11 @@ public final class CamelBlueprintHelper
System.err.println("Test bundle headers: " + explode(dic));
for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
- System.err.println("ServiceReference: " + ref);
+ System.err.println("ServiceReference: " + ref + ", bundle: " + ref.getBundle() + ", symbolicName: " + ref.getBundle().getSymbolicName());
}
for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
- System.err.println("Filtered ServiceReference: " + ref);
+ System.err.println("Filtered ServiceReference: " + ref + ", bundle: " + ref.getBundle() + ", symbolicName: " + ref.getBundle().getSymbolicName());
}
throw new RuntimeException("Gave up waiting for service " + flt);
Modified: camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java Fri May 25 13:50:43 2012
@@ -17,10 +17,12 @@
package org.apache.camel.test.blueprint;
import org.apache.camel.CamelContext;
+import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Before;
import org.osgi.framework.BundleContext;
+import org.osgi.service.blueprint.container.BlueprintContainer;
/**
* Base class for OSGi Blueprint unit tests with Camel.
@@ -32,9 +34,14 @@ public abstract class CamelBlueprintTest
@Before
@Override
public void setUp() throws Exception {
- this.bundleContext = CamelBlueprintHelper.createBundleContext(getClass().getSimpleName(), getBlueprintDescriptor(),
+ String symbolicName = getClass().getSimpleName();
+ this.bundleContext = CamelBlueprintHelper.createBundleContext(symbolicName, getBlueprintDescriptor(),
getBundleFilter(), getBundleVersion(), true);
super.setUp();
+
+ // must wait for blueprint container to be published then the namespace parser is complete and we are ready for testing
+ log.debug("Waiting for BlueprintContainer to be published with symbolicName: {}", symbolicName);
+ getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=" + symbolicName + ")");
}
@After
@@ -80,7 +87,10 @@ public abstract class CamelBlueprintTest
@Override
protected CamelContext createCamelContext() throws Exception {
- return CamelBlueprintHelper.getOsgiService(bundleContext, CamelContext.class);
+ CamelContext answer = CamelBlueprintHelper.getOsgiService(bundleContext, CamelContext.class);
+ // must override context so we use the correct one in testing
+ context = (ModelCamelContext) answer;
+ return answer;
}
protected <T> T getOsgiService(Class<T> type) {
Added: camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java?rev=1342623&view=auto
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java (added)
+++ camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java Fri May 25 13:50:43 2012
@@ -0,0 +1,44 @@
+/**
+ * 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.camel.test.blueprint;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class CamelEndpointInjectTest extends CamelBlueprintTestSupport {
+
+ @Override
+ protected String getBlueprintDescriptor() {
+ return "org/apache/camel/test/blueprint/camelEndpointInject.xml";
+ }
+
+ @Test
+ public void testEndpointInjection() throws Exception {
+ MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
+ assertNotNull(mock);
+ mock.expectedMessageCount(1);
+
+ MyProducer producer = context.getRegistry().lookup("myProducer", MyProducer.class);
+ producer.doSomething("Hello World");
+
+ mock.assertIsSatisfied();
+ }
+
+}
Added: camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java?rev=1342623&view=auto
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java (added)
+++ camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java Fri May 25 13:50:43 2012
@@ -0,0 +1,34 @@
+/**
+ * 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.camel.test.blueprint;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.ProducerTemplate;
+
+/**
+ *
+ */
+public class MyProducer {
+
+ @EndpointInject(ref = "testEndpoint")
+ private ProducerTemplate endpoint;
+
+ public void doSomething(String body) {
+ endpoint.sendBody(body);
+ }
+
+}
Modified: camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1342623&r1=1342622&r2=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties Fri May 25 13:50:43 2012
@@ -23,6 +23,7 @@ log4j.rootLogger=INFO, file
#log4j.logger.de.kalpatec.pojosr=DEBUG
#log4j.logger.org.apache.camel.test.blueprint=DEBUG
#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.blueprint=TRACE
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
Copied: camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelEndpointInject.xml (from r1342539, camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelEndpointInject.xml?p2=camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelEndpointInject.xml&p1=camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml&r1=1342539&r2=1342623&rev=1342623&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/filterTest.xml (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelEndpointInject.xml Fri May 25 13:50:43 2012
@@ -15,23 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- START SNIPPET: example -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-
- <camelContext id="filterCamel" xmlns="http://camel.apache.org/schema/blueprint">
-
- <route>
- <from uri="direct:start"/>
- <filter>
- <simple>${header.foo} == 'bar'</simple>
- <to uri="mock:result"/>
- </filter>
- </route>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+ <camelContext xmlns="http://camel.apache.org/schema/blueprint">
+ <endpoint id="testEndpoint" uri="mock:result"/>
</camelContext>
+ <bean id="myProducer" class="org.apache.camel.test.blueprint.MyProducer"/>
+
</blueprint>
-<!-- END SNIPPET: example -->