Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-756 Moving Client CDI as a main module

This commit is contained in:
Clebert Suconic 2016-10-24 11:26:32 -04:00
parent 35759725fe
commit b23207c019
23 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/artemis-cdi-integration/pom.xml → artemis-cdi-client/pom.xml
View File

@ -25,12 +25,12 @@
<artifactId>artemis-pom</artifactId>
<groupId>org.apache.activemq</groupId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<activemq.basedir>${project.basedir}/../../</activemq.basedir>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties>
<artifactId>artemis-cdi-client</artifactId>

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/ArtemisClientConfiguration.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/configuration/ArtemisClientConfiguration.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/configuration/DefaultArtemisClientConfigurationImpl.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/configuration/DefaultArtemisClientConfigurationImpl.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/AnyLiteral.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/AnyLiteral.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisClientConfigBean.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisEmbeddedServerConfigBean.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/extension/DefaultLiteral.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/DefaultLiteral.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/factory/ConnectionFactoryProvider.java
View File

0
integration/artemis-cdi-integration/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java → artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
View File

0
examples/features/sub-modules/cdi/src/main/resources/META-INF/beans.xml → artemis-cdi-client/src/main/resources/META-INF/beans.xml
View File

0
integration/artemis-cdi-integration/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension → artemis-cdi-client/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
View File

0
integration/artemis-cdi-integration/src/test/java/org/apache/activemq/artemis/cdi/bootstrap/CDIBootstrapTest.java → artemis-cdi-client/src/test/java/org/apache/activemq/artemis/cdi/bootstrap/CDIBootstrapTest.java
View File

12
examples/features/sub-modules/cdi/pom.xml → examples/features/standard/cdi/pom.xml
View File

@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq.examples.modules</groupId>
<artifactId>broker-modules</artifactId>
<groupId>org.apache.activemq.examples.broker</groupId>
<artifactId>jms-examples</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
@ -105,7 +105,7 @@
</goals>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq.examples.modules:artemis-cdi-example:${project.version}</arg>
<arg>org.apache.activemq.examples.broker:artemis-cdi-example:${project.version}</arg>
</libListWithDeps>
<instance>${basedir}/target/server0</instance>
@ -140,7 +140,7 @@
</executions>
<dependencies>
<dependency>
<groupId>org.apache.activemq.examples.modules</groupId>
<groupId>org.apache.activemq.examples.broker</groupId>
<artifactId>artemis-cdi-example</artifactId>
<version>${project.version}</version>
</dependency>
@ -174,7 +174,7 @@
</goals>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq.examples.modules:artemis-cdi-example:${project.version}</arg>
<arg>org.apache.activemq.examples.broker:artemis-cdi-example:${project.version}</arg>
</libListWithDeps>
<instance>${basedir}/target/server0</instance>
@ -209,7 +209,7 @@
</executions>
<dependencies>
<dependency>
<groupId>org.apache.activemq.examples.modules</groupId>
<groupId>org.apache.activemq.examples.broker</groupId>
<artifactId>artemis-cdi-example</artifactId>
<version>${project.version}</version>
</dependency>

0
examples/features/sub-modules/cdi/readme.md → examples/features/standard/cdi/readme.md
View File

0
examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIClientConfig.java → examples/features/standard/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIClientConfig.java
View File

0
examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIExample.java → examples/features/standard/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIExample.java
View File

0
examples/features/sub-modules/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIMessagingIntegrator.java → examples/features/standard/cdi/src/main/java/org/apache/activemq/artemis/core/example/CDIMessagingIntegrator.java
View File

0
examples/features/sub-modules/cdi/src/main/resources/META-INF/apache-deltaspike.properties → examples/features/standard/cdi/src/main/resources/META-INF/apache-deltaspike.properties
View File

0
integration/artemis-cdi-integration/src/main/resources/META-INF/beans.xml → examples/features/standard/cdi/src/main/resources/META-INF/beans.xml
View File

2
examples/features/standard/pom.xml
View File

@ -43,6 +43,7 @@ under the License.
<modules>
<module>bridge</module>
<module>browser</module>
<module>cdi</module>
<module>client-kickoff</module>
<module>consumer-rate-limit</module>
<module>dead-letter</module>
@ -104,6 +105,7 @@ under the License.
<modules>
<module>bridge</module>
<module>browser</module>
<module>cdi</module>
<module>client-kickoff</module>
<module>consumer-rate-limit</module>
<module>dead-letter</module>

1
examples/features/sub-modules/pom.xml
View File

@ -52,7 +52,6 @@ under the License.
<module>aerogear</module>
<module>artemis-ra-rar</module>
<module>vertx</module>
<module>cdi</module>
</modules>
</profile>
</profiles>

2
pom.xml
View File

@ -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>