From c077a60cbaf845d716095dc7b502f0cf074bc2f2 Mon Sep 17 00:00:00 2001
From: Aslak Knutsen <aslak@redhat.com>
Date: Tue, 22 May 2012 02:36:08 +0200
Subject: [PATCH] Changed artifact artifactId, name and parent

---
 pom.xml                                       |   2 +-
 spring/pom.xml                                | 118 +-----------------
 spring/spring-ejb/pom.xml                     |   7 +-
 spring/spring-hibernate/pom.xml               |   7 +-
 spring/spring-inject/pom.xml                  |   7 +-
 spring/spring-javaconfig/pom.xml              |   7 +-
 spring/spring-jdbc/pom.xml                    |   7 +-
 ...DBCTestHelper.java => JdbcTestHelper.java} |   0
 spring/spring-jms/pom.xml                     |   7 +-
 spring/spring-jpa/pom.xml                     |   7 +-
 spring/spring-jsr330/pom.xml                  |   7 +-
 spring/spring-testng/pom.xml                  |   7 +-
 12 files changed, 43 insertions(+), 140 deletions(-)
 rename spring/spring-jdbc/src/test/java/com/acme/spring/jdbc/{JDBCTestHelper.java => JdbcTestHelper.java} (100%)

diff --git a/pom.xml b/pom.xml
index 23dbc48..a270c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
                 <module>ui</module>
                 <module>multinode</module>
                 <module>extensions</module>
-                <<module>spring</module>
+                <module>spring</module>
             </modules>
         </profile>
         <profile>
diff --git a/spring/pom.xml b/spring/pom.xml
index a4e38d9..0890264 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    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.showcase</groupId>
-	<artifactId>arquillian-showcase</artifactId>
+        <artifactId>arquillian-showcase-parent</artifactId>
+        <groupId>org.jboss.arquillian.showcase</groupId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <artifactId>arquillian-showcase-spring</artifactId>
     <packaging>pom</packaging>
 
-    <name>Showcase for Arquillian Spring Framework Extension</name>
+    <name>Arquillian Showcase Spring Aggregator</name>
     <url>http://www.jboss.org</url>
     <description>Showcase for Spring Framework extension for Arquillian</description>
 
@@ -34,9 +34,6 @@
 
     <!-- Properties -->
     <properties>
-        <!-- jboss-parent override -->
-        <maven.compiler.argument.target>1.5</maven.compiler.argument.target>
-        <maven.compiler.argument.source>1.5</maven.compiler.argument.source>
 
         <!-- Arquillian version -->
         <version.arquillian>1.0.0.Final</version.arquillian>
@@ -51,40 +48,10 @@
         <version.cglib>2.2.2</version.cglib>
     </properties>
 
-    <!-- Licenses -->
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-    </licenses>
-
     <!-- Dependency Management -->
     <dependencyManagement>
         <dependencies>
 
-            <dependency>
-                <groupId>org.jboss.spec</groupId>
-                <artifactId>jboss-javaee-6.0</artifactId>
-                <version>3.0.0.Final</version>
-                <type>pom</type>
-                <scope>provided</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian</groupId>
-                <artifactId>arquillian-bom</artifactId>
-                <version>${version.arquillian}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-service-deployer-spring-3</artifactId>
@@ -189,64 +156,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.argument.source}</source>
-                    <target>${maven.compiler.argument.target}</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <trimStackTrace>false</trimStackTrace>
-                    <printSummary>true</printSummary>
-                    <includes>
-                        <include>**/*TestCase.java</include>
-                        <include>**/*TestSuite.java</include>
-                    </includes>
-                    <useFile>true</useFile>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>signature-check</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java15</artifactId>
-                        <version>1.0</version>
-                    </signature>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <activation>
@@ -263,7 +172,6 @@
                 <dependency>
                     <groupId>org.jboss.as</groupId>
                     <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <version>7.1.1.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -347,20 +255,6 @@
             <url>http://repo.springsource.org/release</url>
         </repository>
 
-        <!-- Uncomment when running the tests for JBoss AS 6 -->
-        <!--<repository>-->
-            <!--<id>jboss-deprecated</id>-->
-            <!--<name>JBoss Deprecated</name>-->
-            <!--<url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>-->
-            <!--<layout>default</layout>-->
-            <!--<releases>-->
-                <!--<enabled>true</enabled>-->
-                <!--<updatePolicy>never</updatePolicy>-->
-            <!--</releases>-->
-            <!--<snapshots>-->
-                <!--<enabled>false</enabled>-->
-            <!--</snapshots>-->
-        <!--</repository>-->
     </repositories>
 
 </project>
\ No newline at end of file
diff --git a/spring/spring-ejb/pom.xml b/spring/spring-ejb/pom.xml
index 93b6780..40837f6 100644
--- a/spring/spring-ejb/pom.xml
+++ b/spring/spring-ejb/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-ejb</artifactId>
+    <artifactId>arquillian-showcase-spring-ejb</artifactId>
     <packaging>jar</packaging>
 
-    <name>EJB3 Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: EJB3</name>
     <url>http://www.jboss.org</url>
     <description>EJB3 Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-hibernate/pom.xml b/spring/spring-hibernate/pom.xml
index e4272bf..1039a1e 100644
--- a/spring/spring-hibernate/pom.xml
+++ b/spring/spring-hibernate/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-hibernate</artifactId>
+    <artifactId>arquillian-showcase-spring-hibernate</artifactId>
     <packaging>jar</packaging>
 
-    <name>Hibernate Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: Hibernate</name>
     <url>http://www.jboss.org</url>
     <description>Hibernate Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-inject/pom.xml b/spring/spring-inject/pom.xml
index 498efea..ebc4b8b 100644
--- a/spring/spring-inject/pom.xml
+++ b/spring/spring-inject/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-inject</artifactId>
+    <artifactId>arquillian-showcase-spring-inject</artifactId>
     <packaging>jar</packaging>
 
-    <name>Injection Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: Injection</name>
     <url>http://www.jboss.org</url>
     <description>Injection Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-javaconfig/pom.xml b/spring/spring-javaconfig/pom.xml
index 419de8f..7adc2cc 100644
--- a/spring/spring-javaconfig/pom.xml
+++ b/spring/spring-javaconfig/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-javaconfig</artifactId>
+    <artifactId>arquillian-showcase-spring-javaconfig</artifactId>
     <packaging>jar</packaging>
 
-    <name>Java-based Configuration Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: Java-based Configuration</name>
     <url>http://www.jboss.org</url>
     <description>Java-based Configuration Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-jdbc/pom.xml b/spring/spring-jdbc/pom.xml
index 49fb615..8c2b4d2 100644
--- a/spring/spring-jdbc/pom.xml
+++ b/spring/spring-jdbc/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-jdbc</artifactId>
+    <artifactId>arquillian-showcase-spring-jdbc</artifactId>
     <packaging>jar</packaging>
 
-    <name>JDBC Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: JDBC</name>
     <url>http://www.jboss.org</url>
     <description>JDBC Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-jdbc/src/test/java/com/acme/spring/jdbc/JDBCTestHelper.java b/spring/spring-jdbc/src/test/java/com/acme/spring/jdbc/JdbcTestHelper.java
similarity index 100%
rename from spring/spring-jdbc/src/test/java/com/acme/spring/jdbc/JDBCTestHelper.java
rename to spring/spring-jdbc/src/test/java/com/acme/spring/jdbc/JdbcTestHelper.java
diff --git a/spring/spring-jms/pom.xml b/spring/spring-jms/pom.xml
index f598e8d..bab6b62 100644
--- a/spring/spring-jms/pom.xml
+++ b/spring/spring-jms/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-jms</artifactId>
+    <artifactId>arquillian-showcase-spring-jms</artifactId>
     <packaging>jar</packaging>
 
-    <name>JMS Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: JMS</name>
     <url>http://www.jboss.org</url>
     <description>JMS Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-jpa/pom.xml b/spring/spring-jpa/pom.xml
index dd93c20..065973f 100644
--- a/spring/spring-jpa/pom.xml
+++ b/spring/spring-jpa/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-jpa</artifactId>
+    <artifactId>arquillian-showcase-spring-jpa</artifactId>
     <packaging>jar</packaging>
 
-    <name>JPA Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: JPA</name>
     <url>http://www.jboss.org</url>
     <description>JPA Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-jsr330/pom.xml b/spring/spring-jsr330/pom.xml
index 69fd178..2e8c909 100644
--- a/spring/spring-jsr330/pom.xml
+++ b/spring/spring-jsr330/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-jsr330</artifactId>
+    <artifactId>arquillian-showcase-spring-jsr330</artifactId>
     <packaging>jar</packaging>
 
-    <name>JSR-330 Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: JSR-330</name>
     <url>http://www.jboss.org</url>
     <description>JSR-330 Showcase of Spring Framework 3 extension for Arquillian</description>
 
diff --git a/spring/spring-testng/pom.xml b/spring/spring-testng/pom.xml
index ca8162b..49914ca 100644
--- a/spring/spring-testng/pom.xml
+++ b/spring/spring-testng/pom.xml
@@ -6,18 +6,19 @@
     <!-- Parent -->
     <parent>
         <groupId>org.jboss.arquillian.showcase</groupId>
-        <artifactId>spring</artifactId>
+        <artifactId>arquillian-showcase-spring</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jboss.arquillian.showcase</groupId>
-    <artifactId>spring-testng</artifactId>
+    <artifactId>arquillian-showcase-spring-testng</artifactId>
     <packaging>jar</packaging>
 
-    <name>TestNG Showcase Arquillian Spring Framework 3 Extension</name>
+    <name>Arquillian Showcase Spring: TestNG</name>
     <url>http://www.jboss.org</url>
     <description>TestNG Showcase of Spring Framework 3 extension for Arquillian</description>