Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

SWITCHYARD-1310 Acquire Transformer/Validator instance from CDI registry

Author:    Tomohisa Igarashi <tm.igarashi@gmail.com>
Signed-off-by: Lukasz Dywicki <luke@code-house.org>
  • Loading branch information...
commit c1183af8b104fd911a52b9f10424b8b071554fa2 1 parent 0aa8ba3
@igarashitm igarashitm authored splatch committed
Showing with 81 additions and 59 deletions.
  1. +1 −1  jboss-as7/extension/src/main/java/org/switchyard/as7/extension/deployment/SwitchYardDependencyProcessor.java
  2. +4 −0 jboss-as7/modules/pom.xml
  3. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/amqp/resources/module.xml
  4. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/atom/resources/module.xml
  5. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/core/resources/module.xml
  6. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/file/resources/module.xml
  7. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/ftp/resources/module.xml
  8. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/jms/resources/module.xml
  9. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/jpa/resources/module.xml
  10. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/mail/resources/module.xml
  11. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/netty/resources/module.xml
  12. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/quartz/resources/module.xml
  13. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/resources/module.xml
  14. +1 −4 jboss-as7/modules/src/main/resources/switchyard/components/camel/sql/resources/module.xml
  15. +1 −1  jboss-as7/modules/src/main/resources/switchyard/components/camel/switchyard/resources/module.xml
  16. +1 −1  jboss-as7/modules/src/main/resources/switchyard/components/common/camel/resources/module.xml
  17. +17 −3 jboss-as7/modules/src/main/resources/switchyard/core/assembly-component.xml
  18. +1 −1  jboss-as7/modules/src/main/resources/switchyard/core/bus/camel/module.xml
  19. +2 −2 jboss-as7/modules/src/main/resources/switchyard/core/{common-camel → common/camel}/module.xml
  20. +37 −0 jboss-as7/modules/src/main/resources/switchyard/core/common/cdi/module.xml
  21. +1 −1  jboss-as7/modules/src/main/resources/switchyard/core/deploy/module.xml
  22. +2 −1  jboss-as7/modules/src/main/resources/switchyard/core/module.xml
  23. +1 −0  jboss-as7/modules/src/main/resources/switchyard/core/transform/module.xml
  24. +1 −0  jboss-as7/modules/src/main/resources/switchyard/core/validate/module.xml
View
2  .../src/main/java/org/switchyard/as7/extension/deployment/SwitchYardDependencyProcessor.java
@@ -43,7 +43,7 @@
private static final ModuleIdentifier SWITCHYARD_ID = ModuleIdentifier.create("org.switchyard");
private static final ModuleIdentifier SWITCHYARD_API_ID = ModuleIdentifier.create("org.switchyard.api");
private static final ModuleIdentifier SWITCHYARD_COMMON_ID = ModuleIdentifier.create("org.switchyard.common");
- private static final ModuleIdentifier SWITCHYARD_COMMON_CAMEL_ID = ModuleIdentifier.create("org.switchyard.common-camel");
+ private static final ModuleIdentifier SWITCHYARD_COMMON_CAMEL_ID = ModuleIdentifier.create("org.switchyard.common.camel");
private static final ModuleIdentifier SWITCHYARD_BUS_CAMEL = ModuleIdentifier.create("org.switchyard.bus.camel");
private static final ModuleIdentifier SWITCHYARD_CONFIG_ID = ModuleIdentifier.create("org.switchyard.config");
private static final ModuleIdentifier SWITCHYARD_RUNTIME_ID = ModuleIdentifier.create("org.switchyard.runtime");
View
4 jboss-as7/modules/pom.xml
@@ -135,6 +135,10 @@
</dependency>
<dependency>
<groupId>org.switchyard</groupId>
+ <artifactId>switchyard-common-cdi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.switchyard</groupId>
<artifactId>switchyard-api</artifactId>
</dependency>
<dependency>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/amqp/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.jms"/>
<module name="org.apache.camel.amqp" export="true" optional="true">
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/atom/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.atom" export="true" optional="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/core/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.switchyard.component.camel.switchyard" export="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/file/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.switchyard.component.camel.switchyard" export="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/ftp/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.ftp" export="true" optional="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/jms/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.jms" export="true" optional="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/jpa/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.jpa" export="true" optional="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/mail/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.mail" export="true" optional="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/netty/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.switchyard.security"/>
<module name="org.switchyard.component.common"/>
<module name="org.jboss.netty"/>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/quartz/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.quartz" export="true" optional="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core" export="true" />
<module name="org.apache.camel.script" export="true">
<imports>
View
5 jboss-as7/modules/src/main/resources/switchyard/components/camel/sql/resources/module.xml
@@ -30,13 +30,10 @@
<module name="javax.api"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.jaxb-impl"/>
- <module name="org.switchyard.api"/>
- <module name="org.switchyard.common-camel"/>
- <module name="org.switchyard.config"/>
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.sql" export="true" optional="true">
<imports>
View
2  ...s7/modules/src/main/resources/switchyard/components/camel/switchyard/resources/module.xml
@@ -32,7 +32,7 @@
<module name="org.switchyard.api"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.component.common"/>
<module name="org.switchyard.component.common.camel">
<imports>
View
2  jboss-as7/modules/src/main/resources/switchyard/components/common/camel/resources/module.xml
@@ -36,7 +36,7 @@
<module name="org.apache.camel.core"/>
<module name="org.apache.camel.spring"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.component.common"/>
</dependencies>
</module>
View
20 jboss-as7/modules/src/main/resources/switchyard/core/assembly-component.xml
@@ -41,8 +41,13 @@
<filtered>true</filtered>
</file>
<file>
- <source>src/main/resources/switchyard/core/common-camel/module.xml</source>
- <outputDirectory>/modules/org/switchyard/common-camel/main</outputDirectory>
+ <source>src/main/resources/switchyard/core/common/camel/module.xml</source>
+ <outputDirectory>/modules/org/switchyard/common/camel/main</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>src/main/resources/switchyard/core/common/cdi/module.xml</source>
+ <outputDirectory>/modules/org/switchyard/common/cdi/main</outputDirectory>
<filtered>true</filtered>
</file>
<file>
@@ -134,7 +139,16 @@
<includes>
<include>org.switchyard:switchyard-common-camel</include>
</includes>
- <outputDirectory>/modules/org/switchyard/common-camel/main</outputDirectory>
+ <outputDirectory>/modules/org/switchyard/common/camel/main</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}
+ </outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>org.switchyard:switchyard-common-cdi</include>
+ </includes>
+ <outputDirectory>/modules/org/switchyard/common/cdi/main</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}
</outputFileNameMapping>
</dependencySet>
View
2  jboss-as7/modules/src/main/resources/switchyard/core/bus/camel/module.xml
@@ -36,6 +36,6 @@
<module name="org.apache.camel.core"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.runtime"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
</dependencies>
</module>
View
4 ...s/switchyard/core/common-camel/module.xml → ...s/switchyard/core/common/camel/module.xml
@@ -22,7 +22,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<module xmlns="urn:jboss:module:1.0" name="org.switchyard.common-camel">
+<module xmlns="urn:jboss:module:1.0" name="org.switchyard.common.camel">
<resources>
<resource-root path="switchyard-common-camel-${project.version}.jar"/>
@@ -32,7 +32,7 @@
<module name="javax.api" />
<module name="org.apache.log4j"/>
<module name="org.switchyard.api"/>
- <module name="org.apache.deltaspike.core-api"/>
+ <module name="org.switchyard.common.cdi"/>
<module name="org.apache.camel.cdi"/>
<module name="org.apache.camel.core"/>
</dependencies>
View
37 jboss-as7/modules/src/main/resources/switchyard/core/common/cdi/module.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.switchyard.common.cdi">
+
+ <resources>
+ <resource-root path="switchyard-common-cdi-${project.version}.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.enterprise.api"/>
+ <module name="org.apache.log4j"/>
+ <module name="org.apache.deltaspike.core-api"/>
+ </dependencies>
+</module>
View
2  jboss-as7/modules/src/main/resources/switchyard/core/deploy/module.xml
@@ -35,7 +35,7 @@
<module name="org.switchyard.api.extensions.wsdl"/>
<module name="org.switchyard.bus.camel"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.runtime"/>
<module name="org.switchyard.security" export="true"/>
View
3  jboss-as7/modules/src/main/resources/switchyard/core/module.xml
@@ -51,7 +51,8 @@
<module name="org.switchyard.api"/>
<module name="org.switchyard.admin"/>
<module name="org.switchyard.common"/>
- <module name="org.switchyard.common-camel"/>
+ <module name="org.switchyard.common.camel"/>
+ <module name="org.switchyard.common.cdi"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.deploy"/>
<module name="org.switchyard.runtime"/>
View
1  jboss-as7/modules/src/main/resources/switchyard/core/transform/module.xml
@@ -36,6 +36,7 @@
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
+ <module name="org.switchyard.common.cdi"/>
<module name="org.switchyard.config"/>
<module name="org.switchyard.jaxb-impl"/>
<module name="org.milyn" export="true">
View
1  jboss-as7/modules/src/main/resources/switchyard/core/validate/module.xml
@@ -33,6 +33,7 @@
<module name="org.apache.log4j"/>
<module name="org.switchyard.api"/>
<module name="org.switchyard.common"/>
+ <module name="org.switchyard.common.cdi"/>
<module name="org.switchyard.config"/>
</dependencies>
</module>
Please sign in to comment.
Something went wrong with that request. Please try again.