ARQ-1540 Migrate implementations into Portal Extension

- Clean up migration of GateIn portlet container
arquillian · Oct 18, 2013 · e897a61 · e897a61
1 parent ad35088
commit e897a61
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 197 deletions.
diff --git a/README.md b/README.md
@@ -14,12 +14,11 @@ Currently it supports:
 * Ability for portlet containers to add extra deployments into the runtime container prior to deployment of the test archive
 * `@PortalTest` marker annotation on test class to allow special processing by container specific implementations
 
-On it's own this extension doesn't do much, so you will need a portlet container specific implementation of this extension
-to use it. Implementations for GateIn and Pluto portlet containers can be found at
-[Portlet Bridge](http://github.com/portletbridge).
+As part of the extension we provide implementations for the following portlet containers:
+* GateIn
 
 ### Code example
---- 
+---
 
     @RunWith(Arquillian.class)
     @PortalTest

diff --git a/impl-gatein/.gitignore b/impl-gatein/.gitignore
diff --git a/impl-gatein/README.md b/impl-gatein/README.md
diff --git a/...sion/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...sion/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/impl-gatein/pom.xml b/impl-gatein/pom.xml
diff --git a/pom.xml b/pom.xml
@@ -60,6 +60,7 @@
         <module>portal/api</module>
         <module>portal/spi</module>
         <module>portal/impl/impl-base</module>
+        <module>portal/impl/impl-gatein</module>
         <module>portal/depchain</module>
     </modules>
 
@@ -78,6 +79,22 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-portal-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-portal-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-portal-impl-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>

diff --git a/...atein/gatein-arquillian-extension/pom.xml → portal/impl/impl-gatein/pom.xml b/...atein/gatein-arquillian-extension/pom.xml → portal/impl/impl-gatein/pom.xml
@@ -3,18 +3,19 @@
 
     <!-- Parent -->
     <parent>
-        <groupId>org.jboss.portletbridge.testing.gatein</groupId>
-        <artifactId>gatein-testing-parent</artifactId>
-        <version>1.0.0.Final-SNAPSHOT</version>
+        <groupId>org.jboss.arquillian.extension</groupId>
+        <artifactId>arquillian-portal-parent</artifactId>
+        <version>1.1.0.Final-SNAPSHOT</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Artifact Configuration -->
-    <artifactId>gatein-arquillian-extension</artifactId>
+    <artifactId>arquillian-portal-impl-gatein</artifactId>
     <packaging>jar</packaging>
-    <name>GateIn Arquillian Extension</name>
+    <name>Arquillian Portal Extension Implementation for GateIn</name>
 
     <dependencies>
         <dependency>
@@ -36,12 +37,6 @@
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
             <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/.../pc/arquillian/GateInPortalExtension.java → ...al/impl/gatein/GateInPortalExtension.java b/.../pc/arquillian/GateInPortalExtension.java → ...al/impl/gatein/GateInPortalExtension.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2013, 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.
  *
@@ -19,12 +19,12 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.gatein.pc.arquillian;
+package org.jboss.arquillian.portal.impl.gatein;
 
-import org.gatein.pc.arquillian.deployment.GateInDeploymentEnricher;
-import org.gatein.pc.arquillian.enricher.resource.GateInURLProvider;
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.jboss.arquillian.portal.impl.gatein.deployment.GateInDeploymentEnricher;
+import org.jboss.arquillian.portal.impl.gatein.enricher.resource.GateInURLProvider;
 import org.jboss.arquillian.portal.spi.enricher.resource.PortalURLProvider;
 
 /**

diff --git a/.../deployment/GateInDeploymentEnricher.java → .../deployment/GateInDeploymentEnricher.java b/.../deployment/GateInDeploymentEnricher.java → .../deployment/GateInDeploymentEnricher.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2013, 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.
  *
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gatein.pc.arquillian.deployment;
+package org.jboss.arquillian.portal.impl.gatein.deployment;
 
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.portal.api.PortalTest;

diff --git a/.../enricher/resource/GateInURLProvider.java → .../enricher/resource/GateInURLProvider.java b/.../enricher/resource/GateInURLProvider.java → .../enricher/resource/GateInURLProvider.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2013, 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.
  *
@@ -19,13 +19,13 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.gatein.pc.arquillian.enricher.resource;
+package org.jboss.arquillian.portal.impl.gatein.enricher.resource;
 
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.gatein.pc.arquillian.deployment.GateInDeploymentEnricher;
+import org.jboss.arquillian.portal.impl.gatein.deployment.GateInDeploymentEnricher;
 import org.jboss.arquillian.portal.spi.enricher.resource.PortalURLProvider;
 
 /**

diff --git a/...tein/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...tein/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.jboss.arquillian.portal.impl.gatein.GateInPortalExtension