Refactored addon-manager structure

forge · Jan 1, 2013 · e0f27c0 · e0f27c0
1 parent 2d36d3a
commit e0f27c0
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 64 deletions.
diff --git a/addon-manager/addon-manager-addon/pom.xml b/addon-manager/addon-manager-addon/pom.xml
@@ -1,35 +1,47 @@
 <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/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <parent>
-      <groupId>org.jboss.forge</groupId>
-      <artifactId>forge-parent</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.jboss.forge</groupId>
+		<artifactId>forge-parent</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
-   </parent>
+	</parent>
 
-   <artifactId>forge-addon-manager-addon</artifactId>
-   <name>Forge - Addon Manager - Addon</name>
+	<artifactId>addon-manager</artifactId>
+	<name>Forge - Addon Manager - Addon</name>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-manager-impl</artifactId>
-      </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.forge</groupId>
+			<artifactId>forge-addon-container-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.forge</groupId>
+			<artifactId>addon-manager-impl</artifactId>
+		</dependency>
 
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-test-harness</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>arquillian-forge-classpath</artifactId>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
+		<dependency>
+			<groupId>org.jboss.forge</groupId>
+			<artifactId>forge-test-harness</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.forge</groupId>
+			<artifactId>arquillian-forge-classpath</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<classifier>forge-addon</classifier>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/addon-manager/addon-manager-impl/pom.xml b/addon-manager/addon-manager-impl/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../../pom.xml</relativePath>
    </parent>
 
-   <artifactId>forge-addon-manager-impl</artifactId>
+   <artifactId>addon-manager-impl</artifactId>
    <name>Forge - Addon Manager - Impl</name>
 
    <dependencies>

diff --git a/addon-manager/addon-manager-tests/pom.xml b/addon-manager/addon-manager-tests/pom.xml
@@ -8,13 +8,13 @@
       <relativePath>../../pom.xml</relativePath>
    </parent>
 
-   <artifactId>forge-addon-manager-tests</artifactId>
+   <artifactId>addon-manager-tests</artifactId>
    <name>Forge - Addon Manager - Tests</name>
 
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-manager-addon</artifactId>
+         <artifactId>addon-manager</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>

diff --git a/addon-manager/pom.xml b/addon-manager/pom.xml
@@ -8,7 +8,7 @@
       <relativePath>../pom.xml</relativePath>
    </parent>
 
-   <artifactId>addon-manager</artifactId>
+   <artifactId>addon-manager-parent</artifactId>
    <name>Forge - Addon Manager - Parent</name>
    <packaging>pom</packaging>
 
@@ -18,26 +18,4 @@
       <module>addon-manager-tests</module>
    </modules>
 
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-addon-manager-impl</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-addon-manager-addon</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-manager-addon</artifactId>
-      </dependency>
-   </dependencies>
-
 </project>
diff --git a/arquillian/core/pom.xml b/arquillian/core/pom.xml
@@ -16,7 +16,7 @@
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-manager-impl</artifactId>
+         <artifactId>addon-manager-impl</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -15,7 +15,7 @@
       </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-manager-impl</artifactId>
+         <artifactId>addon-manager-impl</artifactId>
       </dependency>
    </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -205,17 +205,12 @@
          </dependency>
          <dependency>
             <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-addon-manager</artifactId>
+            <artifactId>addon-manager</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
             <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-addon-manager-impl</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-addon-manager-addon</artifactId>
+            <artifactId>addon-manager-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>