[jboss-svn-commits] JBoss Common SVN: r4075 - in arquillian/trunk: container-glassfish-embedded and 31 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 1 03:22:28 EST 2010
Author: aslak
Date: 2010-03-01 03:22:26 -0500 (Mon, 01 Mar 2010)
New Revision: 4075
Added:
arquillian/trunk/packager/
arquillian/trunk/packager/applicationarchive/
arquillian/trunk/packager/applicationarchive/pom.xml
arquillian/trunk/packager/applicationarchive/src/
arquillian/trunk/packager/applicationarchive/src/main/
arquillian/trunk/packager/applicationarchive/src/main/java/
arquillian/trunk/packager/applicationarchive/src/main/java/org/
arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/
arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/
arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/packager/
arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/packager/applicationarchive/
arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/packager/applicationarchive/ApplicationArchiveDeploymentPackager.java
arquillian/trunk/packager/applicationarchive/src/main/resources/
arquillian/trunk/packager/applicationarchive/src/main/resources/META-INF/
arquillian/trunk/packager/applicationarchive/src/main/resources/META-INF/services/
arquillian/trunk/packager/applicationarchive/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager
arquillian/trunk/packager/applicationarchive/src/test/
arquillian/trunk/packager/applicationarchive/src/test/java/
arquillian/trunk/packager/applicationarchive/src/test/resources/
arquillian/trunk/packager/java-ee/
arquillian/trunk/packager/java-ee/pom.xml
arquillian/trunk/packager/java-ee/src/
arquillian/trunk/packager/java-ee/src/main/
arquillian/trunk/packager/java-ee/src/main/java/
arquillian/trunk/packager/java-ee/src/main/java/org/
arquillian/trunk/packager/java-ee/src/main/java/org/jboss/
arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/
arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/packager/
arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/packager/javaee/
arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java
arquillian/trunk/packager/java-ee/src/main/resources/
arquillian/trunk/packager/java-ee/src/main/resources/META-INF/
arquillian/trunk/packager/java-ee/src/main/resources/META-INF/services/
arquillian/trunk/packager/java-ee/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager
arquillian/trunk/packager/java-ee/src/test/
arquillian/trunk/packager/java-ee/src/test/java/
arquillian/trunk/packager/java-ee/src/test/resources/
arquillian/trunk/packager/pom.xml
Modified:
arquillian/trunk/container-glassfish-embedded/pom.xml
arquillian/trunk/container-jboss-embedded/pom.xml
arquillian/trunk/container-jboss-remote-51/pom.xml
arquillian/trunk/container-jboss-remote-60/pom.xml
arquillian/trunk/container-openejb/pom.xml
arquillian/trunk/pom.xml
Log:
ARQ-25 Extracted DeploymentPackager from impl-base
Modified: arquillian/trunk/container-glassfish-embedded/pom.xml
===================================================================
--- arquillian/trunk/container-glassfish-embedded/pom.xml 2010-02-28 01:22:07 UTC (rev 4074)
+++ arquillian/trunk/container-glassfish-embedded/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -67,6 +67,12 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-packager-javaee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-testenricher-cdi</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/container-jboss-embedded/pom.xml
===================================================================
--- arquillian/trunk/container-jboss-embedded/pom.xml 2010-02-28 01:22:07 UTC (rev 4074)
+++ arquillian/trunk/container-jboss-embedded/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -51,6 +51,12 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-packager-javaee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-testenricher-cdi</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/container-jboss-remote-51/pom.xml
===================================================================
--- arquillian/trunk/container-jboss-remote-51/pom.xml 2010-02-28 01:22:07 UTC (rev 4074)
+++ arquillian/trunk/container-jboss-remote-51/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -45,6 +45,12 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-packager-javaee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-testenricher-ejb</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/container-jboss-remote-60/pom.xml
===================================================================
--- arquillian/trunk/container-jboss-remote-60/pom.xml 2010-02-28 01:22:07 UTC (rev 4074)
+++ arquillian/trunk/container-jboss-remote-60/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -45,6 +45,12 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-packager-javaee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-testenricher-cdi</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/container-openejb/pom.xml
===================================================================
--- arquillian/trunk/container-openejb/pom.xml 2010-02-28 01:22:07 UTC (rev 4074)
+++ arquillian/trunk/container-openejb/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -44,6 +44,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-packager-applicationarchive</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!--
External Projects
Property changes on: arquillian/trunk/packager
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Property changes on: arquillian/trunk/packager/applicationarchive
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: arquillian/trunk/packager/applicationarchive/pom.xml
===================================================================
--- arquillian/trunk/packager/applicationarchive/pom.xml (rev 0)
+++ arquillian/trunk/packager/applicationarchive/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ vi:ts=2:sw=2:expandtab:
+-->
+<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/maven-v4_0_0.xsd">
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Artifact Configuration -->
+ <artifactId>arquillian-packager-applicationarchive</artifactId>
+ <name>Arquillian Packager ApplicationArchive</name>
+ <description>Packager that only return the ApplicationArchive for the Arquillian project</description>
+
+
+ <!-- Properties -->
+ <properties>
+
+
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!--
+ org.jboss.arquillian
+ -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-spi</artifactId>
+ </dependency>
+
+ <!--
+ External Projects
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
Added: arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/packager/applicationarchive/ApplicationArchiveDeploymentPackager.java
===================================================================
--- arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/packager/applicationarchive/ApplicationArchiveDeploymentPackager.java (rev 0)
+++ arquillian/trunk/packager/applicationarchive/src/main/java/org/jboss/arquillian/packager/applicationarchive/ApplicationArchiveDeploymentPackager.java 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.arquillian.packager.applicationarchive;
+
+import java.util.Collection;
+
+import org.jboss.arquillian.spi.DeploymentPackager;
+import org.jboss.shrinkwrap.api.Archive;
+
+/**
+ * A packager that only returns the given ApplicationArchive. Used by containers
+ * where no extra special packaging is required.
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class ApplicationArchiveDeploymentPackager implements DeploymentPackager
+{
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeploymentPackager#generateDeployment(org.jboss.shrinkwrap.api.Archive, java.util.Collection)
+ */
+ @Override
+ public Archive<?> generateDeployment(Archive<?> applicationArchive,
+ Collection<Archive<?>> auxiliaryArchives)
+ {
+ return applicationArchive;
+ }
+
+}
Added: arquillian/trunk/packager/applicationarchive/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager
===================================================================
--- arquillian/trunk/packager/applicationarchive/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager (rev 0)
+++ arquillian/trunk/packager/applicationarchive/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1 @@
+org.jboss.arquillian.packager.applicationarchive.ApplicationArchiveDeploymentPackager
\ No newline at end of file
Property changes on: arquillian/trunk/packager/java-ee
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: arquillian/trunk/packager/java-ee/pom.xml
===================================================================
--- arquillian/trunk/packager/java-ee/pom.xml (rev 0)
+++ arquillian/trunk/packager/java-ee/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ vi:ts=2:sw=2:expandtab:
+-->
+<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/maven-v4_0_0.xsd">
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Artifact Configuration -->
+ <artifactId>arquillian-packager-javaee</artifactId>
+ <name>Arquillian Packager Java EE</name>
+ <description>Java EE Packager for the Arquillian project</description>
+
+
+ <!-- Properties -->
+ <properties>
+
+
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!--
+ org.jboss.arquillian
+ -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-spi</artifactId>
+ </dependency>
+
+ <!--
+ External Projects
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
Added: arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java
===================================================================
--- arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java (rev 0)
+++ arquillian/trunk/packager/java-ee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.arquillian.packager.javaee;
+
+import java.util.Collection;
+
+import org.jboss.arquillian.spi.DeploymentPackager;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+/**
+ * Packager for running Arquillian against remote Java EE containers.
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class EEDeploymentPackager implements DeploymentPackager
+{
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeploymentPackager#generateDeployment(org.jboss.shrinkwrap.api.Archive, java.util.Collection)
+ */
+ @Override
+ public Archive<?> generateDeployment(Archive<?> applicationArchive, Collection<Archive<?>> auxiliaryArchives)
+ {
+ EnterpriseArchive fullDeployment = Archives.create("test.ear", EnterpriseArchive.class)
+ .addModule(applicationArchive);
+
+ for (Archive<?> moduleArchive : auxiliaryArchives)
+ {
+ if (WebArchive.class.isInstance(moduleArchive))
+ {
+ fullDeployment.addModule(moduleArchive);
+ }
+ else
+ {
+ fullDeployment.addLibrary(moduleArchive);
+ }
+ }
+ return fullDeployment;
+ }
+
+}
Added: arquillian/trunk/packager/java-ee/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager
===================================================================
--- arquillian/trunk/packager/java-ee/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager (rev 0)
+++ arquillian/trunk/packager/java-ee/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeploymentPackager 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1 @@
+org.jboss.arquillian.packager.javaee.EEDeploymentPackager
\ No newline at end of file
Added: arquillian/trunk/packager/pom.xml
===================================================================
--- arquillian/trunk/packager/pom.xml (rev 0)
+++ arquillian/trunk/packager/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ vi:ts=2:sw=2:expandtab:
+-->
+<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/maven-v4_0_0.xsd">
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Model Information -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Artifact Information -->
+ <artifactId>arquillian-packager-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Arguillian Packager Aggregator</name>
+ <url>http://www.jboss.org</url>
+ <description>Arguillian Packager Aggregator</description>
+
+ <!-- Aggregate Modules -->
+ <modules>
+
+ <module>java-ee</module>
+ <module>applicationarchive</module>
+
+ </modules>
+
+</project>
Modified: arquillian/trunk/pom.xml
===================================================================
--- arquillian/trunk/pom.xml 2010-02-28 01:22:07 UTC (rev 4074)
+++ arquillian/trunk/pom.xml 2010-03-01 08:22:26 UTC (rev 4075)
@@ -57,6 +57,7 @@
<module>protocol-local</module>
<module>testenricher</module>
+ <module>packager</module>
<!-- Containers -->
<!-- <module>container-jboss-embedded</module> -->
More information about the jboss-svn-commits
mailing list