Renamed package org.jboss.forge.maven.addon to org.jboss.forge.addon.…

…maven
forge · May 28, 2013 · b032555 · b032555
1 parent 75f1878
commit b032555
Show file tree

Hide file tree

Showing 72 changed files with 147 additions and 181 deletions.
diff --git a/addons/api/src/main/java/org/jboss/forge/addon/addons/facets/ForgeAddonFacet.java b/addons/api/src/main/java/org/jboss/forge/addon/addons/facets/ForgeAddonFacet.java
@@ -8,13 +8,13 @@
 
 import org.jboss.forge.addon.dependencies.builder.CoordinateBuilder;
 import org.jboss.forge.addon.facets.AbstractFacet;
+import org.jboss.forge.addon.maven.plugins.ConfigurationBuilder;
+import org.jboss.forge.addon.maven.plugins.ConfigurationElementBuilder;
+import org.jboss.forge.addon.maven.plugins.ExecutionBuilder;
+import org.jboss.forge.addon.maven.plugins.MavenPluginBuilder;
+import org.jboss.forge.addon.maven.projects.MavenPluginFacet;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
-import org.jboss.forge.maven.addon.plugins.ConfigurationBuilder;
-import org.jboss.forge.maven.addon.plugins.ConfigurationElementBuilder;
-import org.jboss.forge.maven.addon.plugins.ExecutionBuilder;
-import org.jboss.forge.maven.addon.plugins.MavenPluginBuilder;
-import org.jboss.forge.maven.addon.projects.MavenPluginFacet;
 
 /**
  * Configures the current project as a forge addon

diff --git a/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java b/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java
@@ -18,6 +18,7 @@
 import org.jboss.forge.addon.dependencies.Dependency;
 import org.jboss.forge.addon.dependencies.builder.DependencyBuilder;
 import org.jboss.forge.addon.javaee.facets.CDIFacet;
+import org.jboss.forge.addon.maven.projects.MavenFacet;
 import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
@@ -30,7 +31,6 @@
 import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.forge.furnace.versions.SingleVersion;
-import org.jboss.forge.maven.addon.projects.MavenFacet;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
 import org.junit.Ignore;

diff --git a/arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java b/arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java
@@ -20,6 +20,9 @@
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
+import org.jboss.forge.addon.maven.dependencies.FileResourceFactory;
+import org.jboss.forge.addon.maven.dependencies.MavenContainer;
+import org.jboss.forge.addon.maven.dependencies.MavenDependencyResolver;
 import org.jboss.forge.arquillian.archive.ForgeArchive;
 import org.jboss.forge.arquillian.archive.ForgeRemoteAddon;
 import org.jboss.forge.arquillian.protocol.ForgeProtocolDescription;
@@ -35,9 +38,6 @@
 import org.jboss.forge.furnace.util.Addons;
 import org.jboss.forge.furnace.util.ClassLoaders;
 import org.jboss.forge.furnace.util.Files;
-import org.jboss.forge.maven.addon.dependencies.FileResourceFactory;
-import org.jboss.forge.maven.addon.dependencies.MavenContainer;
-import org.jboss.forge.maven.addon.dependencies.MavenDependencyResolver;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 

diff --git a/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java b/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java
@@ -22,15 +22,15 @@
 import org.jboss.forge.addon.dependencies.builder.DependencyQueryBuilder;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
+import org.jboss.forge.addon.maven.dependencies.FileResourceFactory;
+import org.jboss.forge.addon.maven.dependencies.MavenContainer;
+import org.jboss.forge.addon.maven.dependencies.MavenDependencyResolver;
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.repositories.AddonRepository;
 import org.jboss.forge.furnace.repositories.AddonRepositoryMode;
 import org.jboss.forge.furnace.repositories.MutableAddonRepository;
 import org.jboss.forge.furnace.util.OperatingSystemUtils;
-import org.jboss.forge.maven.addon.dependencies.FileResourceFactory;
-import org.jboss.forge.maven.addon.dependencies.MavenContainer;
-import org.jboss.forge.maven.addon.dependencies.MavenDependencyResolver;
 
 /**
  * A class with a main method to bootstrap Furnace.

diff --git a/...strap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java b/...strap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java
@@ -16,15 +16,15 @@
 import org.jboss.forge.addon.dependencies.builder.DependencyQueryBuilder;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
+import org.jboss.forge.addon.maven.dependencies.FileResourceFactory;
+import org.jboss.forge.addon.maven.dependencies.MavenContainer;
+import org.jboss.forge.addon.maven.dependencies.MavenDependencyResolver;
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.Addon;
 import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.exception.ContainerException;
 import org.jboss.forge.furnace.repositories.AddonRepository;
 import org.jboss.forge.furnace.spi.ContainerLifecycleListener;
-import org.jboss.forge.maven.addon.dependencies.FileResourceFactory;
-import org.jboss.forge.maven.addon.dependencies.MavenContainer;
-import org.jboss.forge.maven.addon.dependencies.MavenDependencyResolver;
 
 /**
  * Installs the required core org.jboss.forge {@link Addon} instances.

diff --git a/container-tests/src/test/java/org/jboss/forge/furnace/MultipleRepositoryTest.java b/container-tests/src/test/java/org/jboss/forge/furnace/MultipleRepositoryTest.java
@@ -13,6 +13,9 @@
 import org.jboss.forge.addon.convert.ConverterFactory;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
+import org.jboss.forge.addon.maven.dependencies.FileResourceFactory;
+import org.jboss.forge.addon.maven.dependencies.MavenContainer;
+import org.jboss.forge.addon.maven.dependencies.MavenDependencyResolver;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.AddonId;
@@ -22,9 +25,6 @@
 import org.jboss.forge.furnace.services.ExportedInstance;
 import org.jboss.forge.furnace.util.Addons;
 import org.jboss.forge.furnace.util.Files;
-import org.jboss.forge.maven.addon.dependencies.FileResourceFactory;
-import org.jboss.forge.maven.addon.dependencies.MavenContainer;
-import org.jboss.forge.maven.addon.dependencies.MavenDependencyResolver;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...orge/maven/addon/environment/Network.java → ...orge/addon/maven/environment/Network.java b/...orge/maven/addon/environment/Network.java → ...orge/addon/maven/environment/Network.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.maven.addon.environment;
+package org.jboss.forge.addon.maven.environment;
 
 import org.jboss.forge.addon.environment.Category;
 import org.jboss.forge.addon.environment.Environment;

diff --git a/...ge/maven/addon/plugins/Configuration.java → ...ge/addon/maven/plugins/Configuration.java b/...ge/maven/addon/plugins/Configuration.java → ...ge/addon/maven/plugins/Configuration.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/...n/addon/plugins/ConfigurationBuilder.java → ...n/maven/plugins/ConfigurationBuilder.java b/...n/addon/plugins/ConfigurationBuilder.java → ...n/maven/plugins/ConfigurationBuilder.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/...n/addon/plugins/ConfigurationElement.java → ...n/maven/plugins/ConfigurationElement.java b/...n/addon/plugins/ConfigurationElement.java → ...n/maven/plugins/ConfigurationElement.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/.../plugins/ConfigurationElementBuilder.java → .../plugins/ConfigurationElementBuilder.java b/.../plugins/ConfigurationElementBuilder.java → .../plugins/ConfigurationElementBuilder.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/...don/plugins/ConfigurationElementImpl.java → ...ven/plugins/ConfigurationElementImpl.java b/...don/plugins/ConfigurationElementImpl.java → ...ven/plugins/ConfigurationElementImpl.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...onfigurationElementNotFoundException.java → ...onfigurationElementNotFoundException.java b/...onfigurationElementNotFoundException.java → ...onfigurationElementNotFoundException.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 public class ConfigurationElementNotFoundException extends RuntimeException
 {

diff --git a/...addon/plugins/ConfigurationException.java → ...maven/plugins/ConfigurationException.java b/...addon/plugins/ConfigurationException.java → ...maven/plugins/ConfigurationException.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 /**
  * @author <a href="mailto:paul.bakker.nl@gmail.com">Paul Bakker</a>

diff --git a/...aven/addon/plugins/ConfigurationImpl.java → ...ddon/maven/plugins/ConfigurationImpl.java b/...aven/addon/plugins/ConfigurationImpl.java → ...ddon/maven/plugins/ConfigurationImpl.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../forge/maven/addon/plugins/Execution.java → .../forge/addon/maven/plugins/Execution.java b/.../forge/maven/addon/plugins/Execution.java → .../forge/addon/maven/plugins/Execution.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/...maven/addon/plugins/ExecutionBuilder.java → ...addon/maven/plugins/ExecutionBuilder.java b/...maven/addon/plugins/ExecutionBuilder.java → ...addon/maven/plugins/ExecutionBuilder.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/...ge/maven/addon/plugins/ExecutionImpl.java → ...ge/addon/maven/plugins/ExecutionImpl.java b/...ge/maven/addon/plugins/ExecutionImpl.java → ...ge/addon/maven/plugins/ExecutionImpl.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...orge/maven/addon/plugins/MavenPlugin.java → ...orge/addon/maven/plugins/MavenPlugin.java b/...orge/maven/addon/plugins/MavenPlugin.java → ...orge/addon/maven/plugins/MavenPlugin.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/...ven/addon/plugins/MavenPluginAdapter.java → ...don/maven/plugins/MavenPluginAdapter.java b/...ven/addon/plugins/MavenPluginAdapter.java → ...don/maven/plugins/MavenPluginAdapter.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;

diff --git a/...ven/addon/plugins/MavenPluginBuilder.java → ...don/maven/plugins/MavenPluginBuilder.java b/...ven/addon/plugins/MavenPluginBuilder.java → ...don/maven/plugins/MavenPluginBuilder.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.List;
 

diff --git a/.../maven/addon/plugins/MavenPluginImpl.java → .../addon/maven/plugins/MavenPluginImpl.java b/.../maven/addon/plugins/MavenPluginImpl.java → .../addon/maven/plugins/MavenPluginImpl.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...n/addon/plugins/MavenPluginInstaller.java → ...n/maven/plugins/MavenPluginInstaller.java b/...n/addon/plugins/MavenPluginInstaller.java → ...n/maven/plugins/MavenPluginInstaller.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 import org.jboss.forge.addon.projects.Project;
 

diff --git a/...ge/maven/addon/plugins/PluginElement.java → ...ge/addon/maven/plugins/PluginElement.java b/...ge/maven/addon/plugins/PluginElement.java → ...ge/addon/maven/plugins/PluginElement.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.plugins;
+package org.jboss.forge.addon.maven.plugins;
 
 /**
  * @author <a href="mailto:paul.bakker.nl@gmail.com">Paul Bakker</a>

diff --git a/...orge/maven/addon/projects/MavenFacet.java → ...orge/addon/maven/projects/MavenFacet.java b/...orge/maven/addon/projects/MavenFacet.java → ...orge/addon/maven/projects/MavenFacet.java
@@ -4,15 +4,15 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.maven.addon.projects;
+package org.jboss.forge.addon.maven.projects;
 
 import java.util.List;
 
 import org.apache.maven.model.Model;
+import org.jboss.forge.addon.maven.resources.MavenPomResource;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 import org.jboss.forge.addon.resource.DirectoryResource;
-import org.jboss.forge.maven.addon.resources.MavenPomResource;
 
 /**
  * A {@link ProjectFacet} adding support for the Maven build system.

diff --git a/...aven/addon/projects/MavenPluginFacet.java → ...ddon/maven/projects/MavenPluginFacet.java b/...aven/addon/projects/MavenPluginFacet.java → ...ddon/maven/projects/MavenPluginFacet.java
@@ -4,18 +4,18 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.maven.addon.projects;
+package org.jboss.forge.addon.maven.projects;
 
 import java.util.List;
 
 import org.apache.maven.model.Plugin;
 import org.jboss.forge.addon.dependencies.Coordinate;
 import org.jboss.forge.addon.dependencies.DependencyRepository;
 import org.jboss.forge.addon.dependencies.util.Dependencies;
+import org.jboss.forge.addon.maven.plugins.MavenPlugin;
+import org.jboss.forge.addon.maven.plugins.MavenPluginBuilder;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
-import org.jboss.forge.maven.addon.plugins.MavenPlugin;
-import org.jboss.forge.maven.addon.plugins.MavenPluginBuilder;
 
 /**
  * @author <a href="mailto:paul.bakker.nl@gmail.com">Paul Bakker</a>

diff --git a/...on/resources/MavenDependencyResource.java → ...en/resources/MavenDependencyResource.java b/...on/resources/MavenDependencyResource.java → ...en/resources/MavenDependencyResource.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.resources;
+package org.jboss.forge.addon.maven.resources;
 
 import org.apache.maven.model.Dependency;
 import org.jboss.forge.addon.resource.Resource;

diff --git a/...ven/addon/resources/MavenPomResource.java → ...don/maven/resources/MavenPomResource.java b/...ven/addon/resources/MavenPomResource.java → ...don/maven/resources/MavenPomResource.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.resources;
+package org.jboss.forge.addon.maven.resources;
 
 import org.apache.maven.model.Model;
 import org.jboss.forge.addon.resource.FileResource;

diff --git a/...addon/resources/MavenProfileResource.java → ...maven/resources/MavenProfileResource.java b/...addon/resources/MavenProfileResource.java → ...maven/resources/MavenProfileResource.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.resources;
+package org.jboss.forge.addon.maven.resources;
 
 import org.apache.maven.model.Profile;
 import org.jboss.forge.addon.resource.Resource;

diff --git a/...on/resources/MavenRepositoryResource.java → ...en/resources/MavenRepositoryResource.java b/...on/resources/MavenRepositoryResource.java → ...en/resources/MavenRepositoryResource.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.maven.addon.resources;
+package org.jboss.forge.addon.maven.resources;
 
 import org.apache.maven.model.Repository;
 import org.jboss.forge.addon.resource.Resource;

diff --git a/.../maven/addon/projects/MavenFacetImpl.java → .../addon/maven/projects/MavenFacetImpl.java b/.../maven/addon/projects/MavenFacetImpl.java → .../addon/maven/projects/MavenFacetImpl.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.maven.addon.projects;
+package org.jboss.forge.addon.maven.projects;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -39,18 +39,18 @@
 import org.apache.maven.settings.Settings;
 import org.jboss.forge.addon.environment.Environment;
 import org.jboss.forge.addon.facets.AbstractFacet;
+import org.jboss.forge.addon.maven.dependencies.MavenContainer;
+import org.jboss.forge.addon.maven.environment.Network;
+import org.jboss.forge.addon.maven.projects.MavenFacet;
+import org.jboss.forge.addon.maven.projects.util.NativeSystemCall;
+import org.jboss.forge.addon.maven.projects.util.NullOutputStream;
+import org.jboss.forge.addon.maven.projects.util.RepositoryUtils;
+import org.jboss.forge.addon.maven.resources.MavenPomResource;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.addon.resource.ResourceFactory;
 import org.jboss.forge.furnace.util.OperatingSystemUtils;
-import org.jboss.forge.maven.addon.dependencies.MavenContainer;
-import org.jboss.forge.maven.addon.environment.Network;
-import org.jboss.forge.maven.addon.projects.MavenFacet;
-import org.jboss.forge.maven.addon.projects.util.NativeSystemCall;
-import org.jboss.forge.maven.addon.projects.util.NullOutputStream;
-import org.jboss.forge.maven.addon.projects.util.RepositoryUtils;
-import org.jboss.forge.maven.addon.resources.MavenPomResource;
 import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
 import org.sonatype.aether.util.repository.DefaultMirrorSelector;
 import org.sonatype.aether.util.repository.DefaultProxySelector;