You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/09/14 15:28:58 UTC
svn commit: r1384762 - in /camel/trunk: components/camel-cdi/
components/camel-cdi/src/main/java/org/apache/camel/cdi/
components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/
components/camel-cdi/src/main/java/org/apache/camel/component/cdi/ ...
Author: hadrian
Date: Fri Sep 14 13:28:57 2012
New Revision: 1384762
URL: http://svn.apache.org/viewvc?rev=1384762&view=rev
Log:
CAMEL-5614. Patch applied with thanks to Lukasz
Added:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelContext.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiInjector.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiInjector.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextBean.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextConfig.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextMap.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextMap.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelFactory.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java (contents, props changed)
- copied, changed from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/InjectLiteral.java
Removed:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiInjector.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextBean.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextConfig.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextMap.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/InjectLiteral.java
Modified:
camel/trunk/components/camel-cdi/pom.xml
camel/trunk/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContextTestSupport.java
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java
Modified: camel/trunk/components/camel-cdi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/pom.xml?rev=1384762&r1=1384761&r2=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/pom.xml (original)
+++ camel/trunk/components/camel-cdi/pom.xml Fri Sep 14 13:28:57 2012
@@ -33,13 +33,12 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.cdi.*</camel.osgi.export.pkg>
<camel.osgi.import>
- !org.apache.camel.component.cdi.*,
+ !org.apache.camel.cdi.*,
org.apache.deltaspike.core.api.*;resolution:=optional,
*
</camel.osgi.import>
<camel.osgi.export.pkg>
org.apache.camel.cdi.*;${camel.osgi.version},
- org.apache.camel.component.cdi.*;${camel.osgi.version}
</camel.osgi.export.pkg>
</properties>
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi;
+package org.apache.camel.cdi;
import java.util.HashMap;
import java.util.Map;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelContext.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelContext.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelContext.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelContext.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi;
+package org.apache.camel.cdi;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiInjector.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiInjector.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiInjector.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiInjector.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiInjector.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiInjector.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiInjector.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi;
+package org.apache.camel.cdi;
import org.apache.camel.IsSingleton;
import org.apache.camel.spi.Injector;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiInjector.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/BeanAdapter.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextBean.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextBean.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextBean.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java Fri Sep 14 13:28:57 2012
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
@@ -29,7 +30,7 @@ import javax.enterprise.inject.spi.Injec
import javax.enterprise.inject.spi.InjectionTarget;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.cdi.CdiCamelContext;
+import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.util.ObjectHelper;
import org.apache.deltaspike.core.api.literal.AnyLiteral;
import org.apache.deltaspike.core.api.literal.DefaultLiteral;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextConfig.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextConfig.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextConfig.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java Fri Sep 14 13:28:57 2012
@@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import java.util.ArrayList;
import java.util.List;
+
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.cdi.CdiCamelContext;
+import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.util.ObjectHelper;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextMap.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextMap.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextMap.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextMap.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextMap.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelContextMap.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextMap.java Fri Sep 14 13:28:57 2012
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Instance;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelExtension.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
@@ -47,8 +48,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.cdi.ContextName;
-import org.apache.camel.component.cdi.CdiCamelContext;
import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.util.ObjectHelper;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelFactory.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelFactory.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelFactory.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/CamelFactory.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelFactory.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Annotated;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/DelegateInjectionTarget.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java (from r1384724, camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/InjectLiteral.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java?p2=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java&p1=camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/InjectLiteral.java&r1=1384724&r2=1384762&rev=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/internal/InjectLiteral.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java Fri Sep 14 13:28:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cdi.internal;
+package org.apache.camel.cdi.internal;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
Propchange: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: camel/trunk/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1384762&r1=1384761&r2=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ camel/trunk/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Fri Sep 14 13:28:57 2012
@@ -1 +1 @@
-org.apache.camel.component.cdi.internal.CamelExtension
\ No newline at end of file
+org.apache.camel.cdi.internal.CamelExtension
\ No newline at end of file
Modified: camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContextTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContextTestSupport.java?rev=1384762&r1=1384761&r2=1384762&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContextTestSupport.java (original)
+++ camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContextTestSupport.java Fri Sep 14 13:28:57 2012
@@ -19,8 +19,7 @@ package org.apache.camel.cdi;
import java.util.logging.LogManager;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.cdi.CdiCamelContext;
-import org.apache.camel.component.cdi.internal.CamelExtension;
+import org.apache.camel.cdi.internal.CamelExtension;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.deltaspike.cdise.api.CdiContainer;
import org.apache.deltaspike.cdise.api.CdiContainerLoader;
Modified: camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java?rev=1384762&r1=1384761&r2=1384762&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java (original)
+++ camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/IntegrationTest.java Fri Sep 14 13:28:57 2012
@@ -18,14 +18,15 @@ package org.apache.camel.itest.cdi;
import java.util.Map;
import java.util.Set;
+
import javax.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.Uri;
-import org.apache.camel.component.cdi.internal.CamelContextMap;
-import org.apache.camel.component.cdi.internal.CamelExtension;
+import org.apache.camel.cdi.internal.CamelContextMap;
+import org.apache.camel.cdi.internal.CamelExtension;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.CamelContextHelper;
import org.jboss.arquillian.container.test.api.Deployment;