Refactored from org.jboss.forge to org.jboss.forge.addon (for addons)

forge · May 20, 2013 · 1f0ec6c · 1f0ec6c
1 parent 0802d77
commit 1f0ec6c
Show file tree

Hide file tree

Showing 118 changed files with 604 additions and 523 deletions.
diff --git a/addon-manager/addon/pom.xml b/addon-manager/addon/pom.xml
@@ -1,7 +1,7 @@
 <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>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -12,25 +12,25 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-impl</artifactId>
          <scope>runtime</scope>
       </dependency>

diff --git a/addon-manager/api/pom.xml b/addon-manager/api/pom.xml
@@ -1,7 +1,7 @@
 <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>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,7 +15,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>

diff --git a/addon-manager/example/pom.xml b/addon-manager/example/pom.xml
@@ -1,21 +1,25 @@
-<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">
+<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>
       <relativePath>../../pom.xml</relativePath>
    </parent>
+
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>example</artifactId>
    <name>Forge - Example Addon</name>
+
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
          <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>example2</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>

diff --git a/addon-manager/example2/pom.xml b/addon-manager/example2/pom.xml
@@ -1,13 +1,17 @@
-<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">
+<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>
       <relativePath>../../pom.xml</relativePath>
    </parent>
+
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>example2</artifactId>
    <name>Forge - Example Addon 2</name>
+
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>

diff --git a/addon-manager/impl/pom.xml b/addon-manager/impl/pom.xml
@@ -1,7 +1,7 @@
 <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>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -17,21 +17,21 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <scope>provided</scope>
       </dependency>

diff --git a/addon-manager/pom.xml b/addon-manager/pom.xml
@@ -7,6 +7,7 @@
       <relativePath>../pom.xml</relativePath>
    </parent>
 
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>addon-manager-parent</artifactId>
    <name>Forge - Addon Manager - Parent</name>
    <packaging>pom</packaging>
@@ -24,17 +25,17 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addon-manager-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addon-manager-impl</artifactId>
             <version>${project.version}</version>
          </dependency>

diff --git a/addon-manager/tests/pom.xml b/addon-manager/tests/pom.xml
@@ -12,25 +12,25 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>example</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>

diff --git a/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java b/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
@@ -41,16 +41,16 @@ public class AddonManagerTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:addon-manager", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:addon-manager", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:addon-manager", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:addon-manager", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
@@ -69,7 +69,7 @@ public static ForgeArchive getDeployment()
    public void testInstallingAddonWithSingleOptionalAddonDependency() throws InterruptedException
    {
       int addonCount = registry.getAddons().size();
-      AddonId example = AddonId.fromCoordinates("org.jboss.forge:example,2.0.0-SNAPSHOT");
+      AddonId example = AddonId.fromCoordinates("org.jboss.forge.addon:example,2.0.0-SNAPSHOT");
       InstallRequest request = addonManager.install(example);
 
       Assert.assertEquals(0, request.getRequiredAddons().size());
@@ -87,14 +87,14 @@ public void testInstallingAddonWithSingleOptionalAddonDependency() throws Interr
       Set<AddonDependencyEntry> dependencies = repository.getAddonDependencies(example);
       Assert.assertEquals(1, dependencies.size());
       AddonDependencyEntry dependency = dependencies.toArray(new AddonDependencyEntry[dependencies.size()])[0];
-      Assert.assertEquals("org.jboss.forge:example2", dependency
+      Assert.assertEquals("org.jboss.forge.addon:example2", dependency
                .getId().getName());
       Assert.assertEquals(new SingleVersion("2.0.0-SNAPSHOT"), dependency
                .getId().getVersion());
       Assert.assertTrue(dependency.isOptional());
       Assert.assertFalse(dependency.isExported());
 
-      Assert.assertTrue(registry.getAddon(AddonId.from("org.jboss.forge:example2", "2.0.0-SNAPSHOT"))
+      Assert.assertTrue(registry.getAddon(AddonId.from("org.jboss.forge.addon:example2", "2.0.0-SNAPSHOT"))
                .getStatus().isMissing());
 
       Addons.waitUntilStarted(registry.getAddon(example), 10, TimeUnit.SECONDS);
@@ -105,7 +105,7 @@ public void testInstallingAddonWithSingleOptionalAddonDependency() throws Interr
    public void testInstallingAlreadyInstalledAddonWithTwoRequiredAddonDependency() throws InterruptedException
    {
       final int addonInitialCount = registry.getAddons().size();
-      AddonId resources = AddonId.fromCoordinates("org.jboss.forge:resources,2.0.0-SNAPSHOT");
+      AddonId resources = AddonId.fromCoordinates("org.jboss.forge.addon:resources,2.0.0-SNAPSHOT");
       InstallRequest request = addonManager.install(resources);
 
       Assert.assertEquals(1, request.getRequiredAddons().size());
@@ -116,15 +116,15 @@ public void testInstallingAlreadyInstalledAddonWithTwoRequiredAddonDependency()
       Assert.assertTrue(repository.isEnabled(resources));
       Assert.assertEquals(3, repository.getAddonResources(resources).size());
 
-      AddonId facets = AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT");
+      AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT");
       Assert.assertTrue(repository.isEnabled(facets));
 
       Set<AddonDependencyEntry> dependencies = repository.getAddonDependencies(resources);
       Assert.assertEquals(3, dependencies.size());
       List<String> addonDependenciesIds = new ArrayList<String>();
-      addonDependenciesIds.add("org.jboss.forge:convert");
-      addonDependenciesIds.add("org.jboss.forge:facets");
-      addonDependenciesIds.add("org.jboss.forge:ui-hints");
+      addonDependenciesIds.add("org.jboss.forge.addon:convert");
+      addonDependenciesIds.add("org.jboss.forge.addon:facets");
+      addonDependenciesIds.add("org.jboss.forge.addon:ui-hints");
 
       for (AddonDependencyEntry dependency : dependencies)
       {

diff --git a/addons/addon/pom.xml b/addons/addon/pom.xml
@@ -1,47 +1,49 @@
 <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>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+
    <artifactId>addons</artifactId>
    <name>Forge - Addon Development Addon</name>
+
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>

diff --git a/addons/api/pom.xml b/addons/api/pom.xml
@@ -1,7 +1,7 @@
 <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>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,37 +15,37 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>