You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/10/25 13:19:31 UTC

[16/33] activemq-artemis git commit: ARTEMIS-756 Moving Client CDI as a main module

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIExample.java
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIExample.java b/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIExample.java
deleted file mode 100644
index bbbf49c..0000000
--- a/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIExample.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.activemq.artemis.core.example;
-
-import org.apache.deltaspike.cdise.api.CdiContainer;
-import org.apache.deltaspike.cdise.api.CdiContainerLoader;
-
-/**
- * A simple example using DeltaSpike CDI Control to connect to an external broker
- */
-public class CDIExample {
-
-   public static void main(final String[] args) throws Exception {
-      CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
-      cdiContainer.boot();
-
-      cdiContainer.shutdown();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIMessagingIntegrator.java
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIMessagingIntegrator.java b/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIMessagingIntegrator.java
deleted file mode 100644
index a3b530c..0000000
--- a/examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIMessagingIntegrator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.activemq.artemis.core.example;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.jms.JMSContext;
-import javax.jms.Queue;
-
-@ApplicationScoped
-public class CDIMessagingIntegrator {
-   @Inject
-   private JMSContext context;
-   public void init(@Observes @Initialized(ApplicationScoped.class) Object obj) {
-      String body = "This is a test";
-      Queue queue = context.createQueue("test");
-      context.createProducer().send(queue, body);
-      String receivedBody = context.createConsumer(queue).receiveBody(String.class, 5000);
-      System.out.println("Received a message " + receivedBody);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/examples/features/sub-modules/cdi/src/main/resources/META-INF/apache-deltaspike.properties
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/cdi/src/main/resources/META-INF/apache-deltaspike.properties b/examples/features/sub-modules/cdi/src/main/resources/META-INF/apache-deltaspike.properties
deleted file mode 100644
index eb75483..0000000
--- a/examples/features/sub-modules/cdi/src/main/resources/META-INF/apache-deltaspike.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-username=guest
-password=guest
-url=tcp://localhost:61616
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/examples/features/sub-modules/cdi/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/cdi/src/main/resources/META-INF/beans.xml b/examples/features/sub-modules/cdi/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index b6f51f1..0000000
--- a/examples/features/sub-modules/cdi/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ 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://xmlns.jcp.org/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-		http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       bean-discovery-mode="annotated">
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/examples/features/sub-modules/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/pom.xml b/examples/features/sub-modules/pom.xml
index 79fc7d7..5dfc9cd 100644
--- a/examples/features/sub-modules/pom.xml
+++ b/examples/features/sub-modules/pom.xml
@@ -52,7 +52,6 @@ under the License.
             <module>aerogear</module>
             <module>artemis-ra-rar</module>
             <module>vertx</module>
-            <module>cdi</module>
          </modules>
       </profile>
    </profiles>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/pom.xml b/integration/artemis-cdi-integration/pom.xml
deleted file mode 100644
index c04ab0c..0000000
--- a/integration/artemis-cdi-integration/pom.xml
+++ /dev/null
@@ -1,121 +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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>artemis-pom</artifactId>
-        <groupId>org.apache.activemq</groupId>
-        <version>1.5.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <properties>
-        <activemq.basedir>${project.basedir}/../../</activemq.basedir>
-    </properties>
-
-    <artifactId>artemis-cdi-client</artifactId>
-    <name>ActiveMQ Artemis CDI Integration</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-jms-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-jms-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logmanager</groupId>
-            <artifactId>jboss-logmanager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.junit</groupId>
-            <artifactId>arquillian-junit-container</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>Weld</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.weld.se</groupId>
-                    <artifactId>weld-se</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-weld-embedded</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>OWB</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-resource</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans.arquillian</groupId>
-                    <artifactId>owb-arquillian-standalone</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.2_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/ArtemisClientConfiguration.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/ArtemisClientConfiguration.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/ArtemisClientConfiguration.java
deleted file mode 100644
index 4bd816c..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/ArtemisClientConfiguration.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.artemis.client.cdi.configuration;
-
-import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
-
-public interface ArtemisClientConfiguration {
-
-   String IN_VM_CONNECTOR = InVMConnectorFactory.class.getName();
-   String REMOTE_CONNECTOR = NettyConnectorFactory.class.getName();
-
-   /**
-    * @return if present, sends a username for the connection
-    */
-   String getUsername();
-
-   /**
-    * @return the password for the connection.  If username is set, password must be set
-    */
-   String getPassword();
-
-   /**
-    * Either url should be set, or host, port, connector factory should be set.
-    *
-    * @return if set, will be used in the server locator to look up the server instead of the hostname/port combination
-    */
-   String getUrl();
-
-   /**
-    * @return The hostname to connect to
-    */
-   String getHost();
-
-   /**
-    * @return the port number to connect to
-    */
-   Integer getPort();
-
-   /**
-    * @return the connector factory to use for connections.
-    */
-   String getConnectorFactory();
-
-   /**
-    * @return Whether or not to start the embedded broker
-    */
-   boolean startEmbeddedBroker();
-
-   /**
-    * @return whether or not this is an HA connection
-    */
-   boolean isHa();
-
-   /**
-    * @return whether or not the authentication parameters should be used
-    */
-   boolean hasAuthentication();
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/DefaultArtemisClientConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/DefaultArtemisClientConfigurationImpl.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/DefaultArtemisClientConfigurationImpl.java
deleted file mode 100644
index 272e1bf..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/DefaultArtemisClientConfigurationImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.artemis.client.cdi.configuration;
-
-import javax.enterprise.inject.Vetoed;
-import java.util.Map;
-
-@Vetoed
-public class DefaultArtemisClientConfigurationImpl implements ArtemisClientConfiguration {
-
-   private String host;
-   private Integer port;
-   private String url;
-   private String username;
-   private String password;
-   private boolean ha;
-
-   public DefaultArtemisClientConfigurationImpl() {
-   }
-
-   public DefaultArtemisClientConfigurationImpl(Map<String, Object> params) {
-      host = (String) params.get("host");
-      port = (Integer) params.get("port");
-      url = (String) params.get("url");
-      username = (String) params.get("username");
-      password = (String) params.get("password");
-      Boolean isHa = (Boolean) params.get("ha");
-      if (isHa == null) {
-         isHa = false;
-      }
-      ha = isHa;
-   }
-
-   @Override
-   public String getHost() {
-      return host;
-   }
-
-   @Override
-   public Integer getPort() {
-      return port;
-   }
-
-   @Override
-   public String getUsername() {
-      return username;
-   }
-
-   @Override
-   public String getPassword() {
-      return password;
-   }
-
-   @Override
-   public String getUrl() {
-      return url;
-   }
-
-   @Override
-   public String getConnectorFactory() {
-      return startEmbeddedBroker() ? IN_VM_CONNECTOR : REMOTE_CONNECTOR;
-   }
-
-   @Override
-   public boolean startEmbeddedBroker() {
-      return host == null && url == null;
-   }
-
-   @Override
-   public boolean isHa() {
-      return ha;
-   }
-
-   @Override
-   public boolean hasAuthentication() {
-      return getUsername() != null && getUsername().length() > 0;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/AnyLiteral.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/AnyLiteral.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/AnyLiteral.java
deleted file mode 100644
index 6d0ccaf..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/AnyLiteral.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.artemis.client.cdi.extension;
-
-import javax.enterprise.inject.Any;
-import javax.enterprise.util.AnnotationLiteral;
-
-class AnyLiteral extends AnnotationLiteral<Any> implements Any {
-
-   static final Any INSTANCE = new AnyLiteral();
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
deleted file mode 100644
index 54f5a7f..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.artemis.client.cdi.extension;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-import org.apache.artemis.client.cdi.configuration.DefaultArtemisClientConfigurationImpl;
-
-import static java.util.Collections.emptySet;
-
-class ArtemisClientConfigBean implements Bean<ArtemisClientConfiguration> {
-
-   @Override
-   public Class<?> getBeanClass() {
-      return DefaultArtemisClientConfigurationImpl.class;
-   }
-
-   @Override
-   public Set<InjectionPoint> getInjectionPoints() {
-      return emptySet();
-   }
-
-   @Override
-   public boolean isNullable() {
-      return false;
-   }
-
-   @Override
-   public ArtemisClientConfiguration create(CreationalContext<ArtemisClientConfiguration> creationalContext) {
-      return new DefaultArtemisClientConfigurationImpl();
-   }
-
-   @Override
-   public void destroy(ArtemisClientConfiguration configuration,
-                       CreationalContext<ArtemisClientConfiguration> creationalContext) {
-   }
-
-   @Override
-   public Set<Type> getTypes() {
-      Set<Type> types = new HashSet<>();
-      types.add(DefaultArtemisClientConfigurationImpl.class);
-      types.add(ArtemisClientConfiguration.class);
-      return types;
-   }
-
-   @Override
-   public Set<Annotation> getQualifiers() {
-      Set<Annotation> qualifiers = new HashSet<>();
-      qualifiers.add(AnyLiteral.INSTANCE);
-      qualifiers.add(DefaultLiteral.INSTANCE);
-      return qualifiers;
-
-   }
-
-   @Override
-   public Class<? extends Annotation> getScope() {
-      return ApplicationScoped.class;
-   }
-
-   @Override
-   public String getName() {
-      return null;
-   }
-
-   @Override
-   public Set<Class<? extends Annotation>> getStereotypes() {
-      return emptySet();
-   }
-
-   @Override
-   public boolean isAlternative() {
-      return false;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
deleted file mode 100644
index 5f38240..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.artemis.client.cdi.extension;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
-
-import static java.util.Collections.emptySet;
-
-public class ArtemisEmbeddedServerConfigBean implements Bean<Configuration> {
-
-   @Override
-   public Class<?> getBeanClass() {
-      return ConfigurationImpl.class;
-   }
-
-   @Override
-   public Set<InjectionPoint> getInjectionPoints() {
-      return emptySet();
-   }
-
-   @Override
-   public boolean isNullable() {
-      return false;
-   }
-
-   @Override
-   public Configuration create(CreationalContext<Configuration> creationalContext) {
-      Map<String, Object> params = new HashMap<>();
-      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1");
-      return new ConfigurationImpl().setSecurityEnabled(false).setPersistenceEnabled(false).setJMXManagementEnabled(false).addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName(), params));
-   }
-
-   @Override
-   public void destroy(Configuration configuration, CreationalContext<Configuration> creationalContext) {
-   }
-
-   @Override
-   public Set<Type> getTypes() {
-      Set<Type> types = new HashSet<>();
-      types.add(ConfigurationImpl.class);
-      types.add(Configuration.class);
-      return types;
-   }
-
-   @Override
-   public Set<Annotation> getQualifiers() {
-      Set<Annotation> qualifiers = new HashSet<>();
-      qualifiers.add(AnyLiteral.INSTANCE);
-      qualifiers.add(DefaultLiteral.INSTANCE);
-      return qualifiers;
-
-   }
-
-   @Override
-   public Class<? extends Annotation> getScope() {
-      return ApplicationScoped.class;
-   }
-
-   @Override
-   public String getName() {
-      return null;
-   }
-
-   @Override
-   public Set<Class<? extends Annotation>> getStereotypes() {
-      return emptySet();
-   }
-
-   @Override
-   public boolean isAlternative() {
-      return false;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
deleted file mode 100644
index d9a0d54..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.artemis.client.cdi.extension;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-import org.apache.artemis.client.cdi.logger.ActiveMQCDILogger;
-
-public class ArtemisExtension implements Extension {
-
-   private boolean foundEmbeddedConfig = false;
-   private boolean foundConfiguration = false;
-
-   <T extends ArtemisClientConfiguration> void foundClientConfig(@Observes ProcessAnnotatedType<T> pat) {
-      ActiveMQCDILogger.LOGGER.discoveredConfiguration(pat);
-      foundConfiguration = true;
-   }
-
-   <T extends Configuration> void foundEmbeddedConfig(@Observes ProcessAnnotatedType<T> pat) {
-      ActiveMQCDILogger.LOGGER.discoveredClientConfiguration(pat);
-      foundEmbeddedConfig = true;
-   }
-
-   void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery) {
-      if (!foundConfiguration) {
-         afterBeanDiscovery.addBean(new ArtemisClientConfigBean());
-      } else {
-         ActiveMQCDILogger.LOGGER.notUsingDefaultConfiguration();
-      }
-      if (!foundEmbeddedConfig) {
-         afterBeanDiscovery.addBean(new ArtemisEmbeddedServerConfigBean());
-      } else {
-         ActiveMQCDILogger.LOGGER.notUsingDefaultClientConfiguration();
-      }
-
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/DefaultLiteral.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/DefaultLiteral.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/DefaultLiteral.java
deleted file mode 100644
index 2280535..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/DefaultLiteral.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.artemis.client.cdi.extension;
-
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.AnnotationLiteral;
-
-class DefaultLiteral extends AnnotationLiteral<Default> implements Default {
-
-   static final Default INSTANCE = new DefaultLiteral();
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
deleted file mode 100644
index b249474..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.artemis.client.cdi.factory;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.jms.JMSContext;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.artemis.api.jms.JMSFactoryType;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServers;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-
-@ApplicationScoped
-public class ConnectionFactoryProvider {
-
-   @Produces
-   @ApplicationScoped
-   private ActiveMQConnectionFactory activeMQConnectionFactory;
-
-   @Inject
-   private ArtemisClientConfiguration configuration;
-
-   @Inject
-   private Configuration embeddedConfiguration;
-
-   @PostConstruct
-   public void setupConnection() {
-      if (configuration.startEmbeddedBroker()) {
-         try {
-            ActiveMQServer activeMQServer = ActiveMQServers.newActiveMQServer(embeddedConfiguration, false);
-            JMSServerManagerImpl jmsServerManager = new JMSServerManagerImpl(activeMQServer);
-            jmsServerManager.start();
-         } catch (Exception e) {
-            throw new RuntimeException("Unable to start embedded JMS", e);
-         }
-      }
-
-      try {
-         this.activeMQConnectionFactory = createConnectionFactory();
-      } catch (Exception e) {
-         throw new RuntimeException("Unable to connect to remote server", e);
-      }
-   }
-
-   @Produces
-   @ApplicationScoped
-   public JMSContext createJMSContext() {
-      return this.activeMQConnectionFactory.createContext();
-   }
-
-   private ActiveMQConnectionFactory createConnectionFactory() throws Exception {
-      Map<String, Object> params = new HashMap<>();
-      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1");
-      final ActiveMQConnectionFactory activeMQConnectionFactory;
-      if (configuration.getUrl() != null) {
-         activeMQConnectionFactory = ActiveMQJMSClient.createConnectionFactory(configuration.getUrl(), null);
-      } else {
-         if (configuration.getHost() != null) {
-            params.put(TransportConstants.HOST_PROP_NAME, configuration.getHost());
-            params.put(TransportConstants.PORT_PROP_NAME, configuration.getPort());
-         }
-         if (configuration.isHa()) {
-            activeMQConnectionFactory = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(configuration.getConnectorFactory(), params));
-         } else {
-            activeMQConnectionFactory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(configuration.getConnectorFactory(), params));
-         }
-      }
-      if (configuration.hasAuthentication()) {
-         activeMQConnectionFactory.setUser(configuration.getUsername());
-         activeMQConnectionFactory.setPassword(configuration.getPassword());
-      }
-      // The CF will probably be GCed since it was injected, so we disable the finalize check
-      return activeMQConnectionFactory.disableFinalizeChecks();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java b/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
deleted file mode 100644
index fd2f7e7..0000000
--- a/integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.artemis.client.cdi.logger;
-
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
-
-/**
- * Logger code 57
- *
- * each message id must be 6 digits long starting with 57, the 3rd digit donates the level so
- *
- * INF0  1
- * WARN  2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- *
- * so an INFO message would be 571000 to 571999
- */
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQCDILogger extends BasicLogger {
-
-   ActiveMQCDILogger LOGGER = Logger.getMessageLogger(ActiveMQCDILogger.class, ActiveMQCDILogger.class.getPackage().getName());
-
-   @LogMessage
-   @Message(id = 571000, value = "Discovered configuration class {0}", format = Message.Format.MESSAGE_FORMAT)
-   void discoveredConfiguration(ProcessAnnotatedType<?> pat);
-
-   @LogMessage
-   @Message(id = 571001, value = "Discovered client configuration class {0}", format = Message.Format.MESSAGE_FORMAT)
-   void discoveredClientConfiguration(ProcessAnnotatedType<?> pat);
-
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 573000, value = "Configuration found, not using built in configuration")
-   void notUsingDefaultConfiguration();
-
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 573001, value = "Configuration found, not using built in configuration")
-   void notUsingDefaultClientConfiguration();
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/resources/META-INF/beans.xml b/integration/artemis-cdi-integration/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index b6f51f1..0000000
--- a/integration/artemis-cdi-integration/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ 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://xmlns.jcp.org/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-		http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       bean-discovery-mode="annotated">
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/integration/artemis-cdi-integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
deleted file mode 100644
index 81282d4..0000000
--- a/integration/artemis-cdi-integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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.
-#
-
-org.apache.artemis.client.cdi.extension.ArtemisExtension
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/integration/artemis-cdi-integration/src/test/java/org/apache/activemq/artemis/cdi/bootstrap/CDIBootstrapTest.java
----------------------------------------------------------------------
diff --git a/integration/artemis-cdi-integration/src/test/java/org/apache/activemq/artemis/cdi/bootstrap/CDIBootstrapTest.java b/integration/artemis-cdi-integration/src/test/java/org/apache/activemq/artemis/cdi/bootstrap/CDIBootstrapTest.java
deleted file mode 100644
index 84afda7..0000000
--- a/integration/artemis-cdi-integration/src/test/java/org/apache/activemq/artemis/cdi/bootstrap/CDIBootstrapTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.activemq.artemis.cdi.bootstrap;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-import javax.jms.JMSContext;
-import javax.jms.Queue;
-
-import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
-import org.apache.artemis.client.cdi.configuration.DefaultArtemisClientConfigurationImpl;
-import org.apache.artemis.client.cdi.extension.ArtemisExtension;
-import org.apache.artemis.client.cdi.factory.ConnectionFactoryProvider;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(Arquillian.class)
-public class CDIBootstrapTest {
-
-   @Deployment
-   public static Archive<?> createArchive() {
-      return ShrinkWrap.create(JavaArchive.class).addAsServiceProviderAndClasses(Extension.class, ArtemisExtension.class).addClasses(NativeConfig.class, ConnectionFactoryProvider.class).addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-   }
-
-   @Inject
-   private JMSContext jmsContext;
-
-   @Test
-   public void shouldStartJMS() throws Exception {
-      String body = "This is a test";
-      Queue queue = jmsContext.createQueue("test");
-      jmsContext.createProducer().send(queue, body);
-      String receivedBody = jmsContext.createConsumer(queue).receiveBody(String.class, 5000);
-      Assert.assertNotNull(receivedBody);
-      assertEquals(body, receivedBody);
-   }
-
-   @ApplicationScoped
-   public static class NativeConfig extends DefaultArtemisClientConfigurationImpl {
-
-      @Override
-      public String getConnectorFactory() {
-         return ArtemisClientConfiguration.IN_VM_CONNECTOR;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23207c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d040375..4978f98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
    <modules>
       <module>artemis-protocols</module>
       <module>artemis-dto</module>
+      <module>artemis-cdi-client</module>
       <module>artemis-boot</module>
       <module>artemis-web</module>
       <module>artemis-website</module>
@@ -54,7 +55,6 @@
       <module>integration/activemq-spring-integration</module>
       <module>integration/activemq-aerogear-integration</module>
       <module>integration/activemq-vertx-integration</module>
-      <module>integration/artemis-cdi-integration</module>
       <module>artemis-distribution</module>
       <module>tests</module>
       <module>artemis-features</module>