Author: cmoulliard
Date: Wed Oct 3 11:58:38 2012
New Revision: 1393444
URL: http://svn.apache.org/viewvc?rev=1393444&view=rev
Log:
Remove container name as it is proved/passed as a parameter using
arquillian.launch property
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/ArchiveUtil.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/DeploymentFactory.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/DeploymentFactory.java
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/ArchiveUtil.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/ArchiveUtil.java?rev=1393444&r1=1393443&r2=1393444&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/ArchiveUtil.java
(original)
+++
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/ArchiveUtil.java
Wed Oct 3 11:58:38 2012
@@ -17,8 +17,9 @@ import java.io.File;
*/
public class ArchiveUtil {
- @TargetsContainer("weld-ee-embedded-1.1")
- public static Archive<?> createWeldArchive(String[] packages) {
+ //weld-ee-embedded-1.1
+ @TargetsContainer("")
+ public static Archive<?> createJarArchive(String[] packages) {
JavaArchive jar = ShrinkWrap.create(JavaArchive.class)
.addPackage(CdiCamelContext.class.getPackage())
@@ -31,8 +32,9 @@ public class ArchiveUtil {
return jar;
}
- @TargetsContainer("jbossas-managed")
- public static Archive<?> createJBossASArchive(String[] packages) {
+ // jbossas-managed
+ @TargetsContainer("")
+ public static Archive<?> createWarArchive(String[] packages) {
JavaArchive jarTest = ShrinkWrap.create(JavaArchive.class)
.addPackages(false, packages)
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/DeploymentFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/DeploymentFactory.java?rev=1393444&r1=1393443&r2=1393444&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/DeploymentFactory.java
(original)
+++
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/DeploymentFactory.java
Wed Oct 3 11:58:38 2012
@@ -16,19 +16,9 @@
*/
package org.apache.camel.example.cdi.one;
-import org.apache.camel.cdi.CdiCamelContext;
-import org.apache.camel.cdi.internal.CamelExtension;
import org.apache.camel.example.cdi.ArchiveUtil;
import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
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.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-
-import java.io.File;
/**
* Factory to create archive according to the container selected
@@ -47,10 +37,10 @@ public class DeploymentFactory {
System.out.println("Deployment type : " + deploymentType);
if (deploymentType.equals("weld-ee-embedded-1.1")) {
- archive = ArchiveUtil.createWeldArchive(packages);
+ archive = ArchiveUtil.createJarArchive(packages);
} else if (deploymentType.equals("jbossas-managed")) {
- archive = ArchiveUtil.createJBossASArchive(packages);
+ archive = ArchiveUtil.createWarArchive(packages);
}
return archive;
}
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/DeploymentFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/DeploymentFactory.java?rev=1393444&r1=1393443&r2=1393444&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/DeploymentFactory.java
(original)
+++
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/DeploymentFactory.java
Wed Oct 3 11:58:38 2012
@@ -16,19 +16,9 @@
*/
package org.apache.camel.example.cdi.two;
-import org.apache.camel.cdi.CdiCamelContext;
-import org.apache.camel.cdi.internal.CamelExtension;
import org.apache.camel.example.cdi.ArchiveUtil;
import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
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.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-
-import java.io.File;
/**
* Factory to create archive (jar, war)
@@ -47,10 +37,10 @@ public class DeploymentFactory {
System.out.println("Deployment type : " + deploymentType);
if (deploymentType.equals("weld-ee-embedded-1.1")) {
- archive = ArchiveUtil.createWeldArchive(packages);
+ archive = ArchiveUtil.createJarArchive(packages);
} else if (deploymentType.equals("jbossas-managed")) {
- archive = ArchiveUtil.createJBossASArchive(packages);
+ archive = ArchiveUtil.createWarArchive(packages);
}
return archive;
}
