almost all working, additional refactoring for package consistency

forge · Mar 1, 2011 · f5044bc · f5044bc
1 parent c2bca95
commit f5044bc
Show file tree

Hide file tree

Showing 124 changed files with 256 additions and 392 deletions.
diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/ForgeAPIFacet.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/ForgeAPIFacet.java
@@ -8,23 +8,23 @@
 
 import javax.inject.Inject;
 
-import org.jboss.seam.forge.project.PackagingType;
-import org.jboss.seam.forge.project.constraints.RequiresFacets;
-import org.jboss.seam.forge.project.constraints.RequiresPackagingType;
 import org.jboss.seam.forge.project.dependencies.Dependency;
 import org.jboss.seam.forge.project.dependencies.DependencyBuilder;
 import org.jboss.seam.forge.project.facets.BaseFacet;
 import org.jboss.seam.forge.project.facets.DependencyFacet;
 import org.jboss.seam.forge.project.facets.PackagingFacet;
+import org.jboss.seam.forge.project.packaging.PackagingType;
 import org.jboss.seam.forge.shell.Shell;
 import org.jboss.seam.forge.shell.plugins.Alias;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresPackagingType;
 import org.jboss.seam.forge.spec.cdi.CDIFacet;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 @Alias("forge.api")
-@RequiresFacets({ DependencyFacet.class, PackagingFacet.class, CDIFacet.class })
+@RequiresFacet({ DependencyFacet.class, PackagingFacet.class, CDIFacet.class })
 @RequiresPackagingType(PackagingType.JAR)
 public class ForgeAPIFacet extends BaseFacet
 {

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/ProjectPlugin.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/ProjectPlugin.java
@@ -31,8 +31,6 @@
 import org.jboss.seam.forge.dev.dependencies.DependencyPropertyCompleter;
 import org.jboss.seam.forge.dev.dependencies.RepositoryCompleter;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
-import org.jboss.seam.forge.project.constraints.RequiresProject;
 import org.jboss.seam.forge.project.dependencies.Dependency;
 import org.jboss.seam.forge.project.dependencies.DependencyBuilder;
 import org.jboss.seam.forge.project.dependencies.DependencyRepository;
@@ -41,14 +39,16 @@
 import org.jboss.seam.forge.project.facets.MetadataFacet;
 import org.jboss.seam.forge.shell.PromptType;
 import org.jboss.seam.forge.shell.Shell;
+import org.jboss.seam.forge.shell.ShellColor;
 import org.jboss.seam.forge.shell.plugins.Alias;
 import org.jboss.seam.forge.shell.plugins.Command;
 import org.jboss.seam.forge.shell.plugins.DefaultCommand;
 import org.jboss.seam.forge.shell.plugins.Option;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresProject;
 import org.jboss.seam.forge.shell.plugins.Topic;
-import org.jboss.seam.forge.shell.util.ShellColor;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/java/JavaPlugin.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/java/JavaPlugin.java
@@ -36,13 +36,12 @@
 import org.jboss.seam.forge.parser.java.SyntaxError;
 import org.jboss.seam.forge.parser.java.util.Strings;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
 import org.jboss.seam.forge.project.facets.JavaSourceFacet;
 import org.jboss.seam.forge.resources.java.JavaResource;
 import org.jboss.seam.forge.shell.PromptType;
+import org.jboss.seam.forge.shell.ShellColor;
 import org.jboss.seam.forge.shell.ShellPrintWriter;
 import org.jboss.seam.forge.shell.ShellPrompt;
-import org.jboss.seam.forge.shell.color.JavaColorizer;
 import org.jboss.seam.forge.shell.plugins.Alias;
 import org.jboss.seam.forge.shell.plugins.Command;
 import org.jboss.seam.forge.shell.plugins.Current;
@@ -51,8 +50,9 @@
 import org.jboss.seam.forge.shell.plugins.PipeIn;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
-import org.jboss.seam.forge.shell.util.ShellColor;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
+import org.jboss.seam.forge.shell.util.JavaColorizer;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
@@ -144,7 +144,7 @@ else if (in != null)
    }
 
    @Command("list-imports")
-   @ResourceScope(JavaResource.class)
+   @RequiresResource(JavaResource.class)
    public void listImports(
             final PipeOut out) throws FileNotFoundException
    {
@@ -158,7 +158,7 @@ public void listImports(
    }
 
    @Command("new-field")
-   @ResourceScope(JavaResource.class)
+   @RequiresResource(JavaResource.class)
    public void newField(
             @PipeIn final String in,
             final PipeOut out,

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/LsMavenPomPlugin.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/LsMavenPomPlugin.java
@@ -31,19 +31,19 @@
 import org.jboss.seam.forge.dev.mvn.resources.MavenDependencyResource;
 import org.jboss.seam.forge.dev.mvn.resources.MavenPomResource;
 import org.jboss.seam.forge.dev.mvn.resources.MavenProfileResource;
-import org.jboss.seam.forge.project.Resource;
 import org.jboss.seam.forge.project.dependencies.Dependency;
 import org.jboss.seam.forge.project.dependencies.ScopeType;
+import org.jboss.seam.forge.resources.Resource;
+import org.jboss.seam.forge.shell.ShellColor;
 import org.jboss.seam.forge.shell.plugins.Alias;
 import org.jboss.seam.forge.shell.plugins.Current;
 import org.jboss.seam.forge.shell.plugins.DefaultCommand;
 import org.jboss.seam.forge.shell.plugins.Help;
 import org.jboss.seam.forge.shell.plugins.Option;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
 import org.jboss.seam.forge.shell.plugins.Topic;
-import org.jboss.seam.forge.shell.util.ShellColor;
 
 /**
  * LsMavenPomPlugin
@@ -52,7 +52,7 @@
  * @version $Revision: $
  */
 @Alias("ls")
-@ResourceScope(MavenPomResource.class)
+@RequiresResource(MavenPomResource.class)
 @Topic("File & Resources")
 @Help("Prints the contents current pom file")
 public class LsMavenPomPlugin implements Plugin

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/MavenPlugin.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/MavenPlugin.java
@@ -29,26 +29,26 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.Resource;
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
-import org.jboss.seam.forge.project.constraints.RequiresProject;
 import org.jboss.seam.forge.project.dependencies.DependencyBuilder;
 import org.jboss.seam.forge.project.facets.MavenCoreFacet;
 import org.jboss.seam.forge.project.services.ProjectFactory;
 import org.jboss.seam.forge.project.services.ResourceFactory;
 import org.jboss.seam.forge.resources.DirectoryResource;
 import org.jboss.seam.forge.resources.FileResource;
+import org.jboss.seam.forge.resources.Resource;
 import org.jboss.seam.forge.shell.PromptType;
 import org.jboss.seam.forge.shell.Shell;
+import org.jboss.seam.forge.shell.ShellColor;
 import org.jboss.seam.forge.shell.plugins.Alias;
 import org.jboss.seam.forge.shell.plugins.Command;
 import org.jboss.seam.forge.shell.plugins.Option;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresProject;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
 import org.jboss.seam.forge.shell.plugins.Topic;
 import org.jboss.seam.forge.shell.util.PathspecParser;
-import org.jboss.seam.forge.shell.util.ShellColor;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
@@ -57,7 +57,7 @@
 @Topic("Project")
 @RequiresProject
 @RequiresFacet(MavenCoreFacet.class)
-@ResourceScope(DirectoryResource.class)
+@RequiresResource(DirectoryResource.class)
 public class MavenPlugin implements Plugin
 {
    private final Shell shell;

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/MvnShellPlugin.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/MvnShellPlugin.java
@@ -26,16 +26,16 @@
 
 import javax.inject.Inject;
 
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
-import org.jboss.seam.forge.project.constraints.RequiresProject;
 import org.jboss.seam.forge.project.facets.MavenCoreFacet;
 import org.jboss.seam.forge.resources.DirectoryResource;
 import org.jboss.seam.forge.shell.Shell;
 import org.jboss.seam.forge.shell.plugins.Alias;
 import org.jboss.seam.forge.shell.plugins.DefaultCommand;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresProject;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
 import org.jboss.seam.forge.shell.plugins.Topic;
 import org.jboss.seam.forge.shell.util.NativeSystemCall;
 
@@ -47,7 +47,7 @@
 @Topic("Project")
 @RequiresProject
 @RequiresFacet(MavenCoreFacet.class)
-@ResourceScope(DirectoryResource.class)
+@RequiresResource(DirectoryResource.class)
 public class MvnShellPlugin implements Plugin
 {
    private final Shell shell;

diff --git a/...plugins/src/main/java/org/jboss/seam/forge/dev/mvn/resources/MavenDependencyResource.java b/...plugins/src/main/java/org/jboss/seam/forge/dev/mvn/resources/MavenDependencyResource.java
@@ -19,9 +19,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.seam.forge.project.Resource;
-import org.jboss.seam.forge.project.ResourceFlag;
 import org.jboss.seam.forge.project.dependencies.Dependency;
+import org.jboss.seam.forge.resources.Resource;
+import org.jboss.seam.forge.resources.ResourceFlag;
 import org.jboss.seam.forge.resources.VirtualResource;
 
 /**

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/resources/MavenPomResource.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/resources/MavenPomResource.java
@@ -26,13 +26,13 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.jboss.seam.forge.project.Resource;
-import org.jboss.seam.forge.project.ResourceFlag;
-import org.jboss.seam.forge.project.ResourceHandles;
 import org.jboss.seam.forge.project.dependencies.Dependency;
 import org.jboss.seam.forge.project.dependencies.MavenDependencyAdapter;
 import org.jboss.seam.forge.project.services.ResourceFactory;
 import org.jboss.seam.forge.resources.FileResource;
+import org.jboss.seam.forge.resources.Resource;
+import org.jboss.seam.forge.resources.ResourceFlag;
+import org.jboss.seam.forge.resources.ResourceHandles;
 
 /**
  * MavenPomResource

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/resources/MavenProfileResource.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/resources/MavenProfileResource.java
@@ -20,9 +20,9 @@
 import java.util.List;
 
 import org.apache.maven.model.Profile;
-import org.jboss.seam.forge.project.Resource;
 import org.jboss.seam.forge.project.dependencies.Dependency;
 import org.jboss.seam.forge.project.dependencies.MavenDependencyAdapter;
+import org.jboss.seam.forge.resources.Resource;
 import org.jboss.seam.forge.resources.VirtualResource;
 
 /**

diff --git a/...ell/plugins/builtin/NewProjectPlugin.java → ...m/forge/dev/project/NewProjectPlugin.java b/...ell/plugins/builtin/NewProjectPlugin.java → ...m/forge/dev/project/NewProjectPlugin.java
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.jboss.seam.forge.shell.plugins.builtin;
+package org.jboss.seam.forge.dev.project;
 
 import java.io.IOException;
 
@@ -30,7 +30,6 @@
 import org.jboss.seam.forge.parser.JavaParser;
 import org.jboss.seam.forge.parser.java.JavaClass;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.Resource;
 import org.jboss.seam.forge.project.facets.DependencyFacet;
 import org.jboss.seam.forge.project.facets.JavaSourceFacet;
 import org.jboss.seam.forge.project.facets.MavenCoreFacet;
@@ -40,6 +39,7 @@
 import org.jboss.seam.forge.project.services.ResourceFactory;
 import org.jboss.seam.forge.resources.DirectoryResource;
 import org.jboss.seam.forge.resources.FileResource;
+import org.jboss.seam.forge.resources.Resource;
 import org.jboss.seam.forge.resources.ResourceException;
 import org.jboss.seam.forge.shell.PromptType;
 import org.jboss.seam.forge.shell.Shell;

diff --git a/dev-plugins/src/main/java/org/jboss/seam/forge/dev/vcs/GitShellPlugin.java b/dev-plugins/src/main/java/org/jboss/seam/forge/dev/vcs/GitShellPlugin.java
@@ -32,7 +32,7 @@
 import org.jboss.seam.forge.shell.plugins.DefaultCommand;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
 import org.jboss.seam.forge.shell.plugins.Topic;
 import org.jboss.seam.forge.shell.util.NativeSystemCall;
 
@@ -41,7 +41,7 @@
  */
 @Alias("git")
 @Topic("Version Control")
-@ResourceScope(DirectoryResource.class)
+@RequiresResource(DirectoryResource.class)
 public class GitShellPlugin implements Plugin
 {
    private final Shell shell;

diff --git a/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/cdi/BeansPlugin.java b/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/cdi/BeansPlugin.java
@@ -33,10 +33,10 @@
 import org.jboss.seam.forge.parser.java.Method;
 import org.jboss.seam.forge.parser.java.SyntaxError;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
 import org.jboss.seam.forge.project.facets.JavaSourceFacet;
 import org.jboss.seam.forge.resources.java.JavaResource;
 import org.jboss.seam.forge.shell.PromptType;
+import org.jboss.seam.forge.shell.ShellColor;
 import org.jboss.seam.forge.shell.ShellMessages;
 import org.jboss.seam.forge.shell.ShellPrompt;
 import org.jboss.seam.forge.shell.events.InstallFacets;
@@ -47,8 +47,8 @@
 import org.jboss.seam.forge.shell.plugins.Option;
 import org.jboss.seam.forge.shell.plugins.PipeOut;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
-import org.jboss.seam.forge.shell.util.ShellColor;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
@@ -131,7 +131,7 @@ public void listAlternatives(final PipeOut out)
    }
 
    @Command("new-conversation")
-   @ResourceScope(JavaResource.class)
+   @RequiresResource(JavaResource.class)
    public void newConversation(
             @Option(name = "timeout") final Long timeout,
             @Option(name = "named", defaultValue = "") final String name,

diff --git a/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/cdi/CDIFacet.java b/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/cdi/CDIFacet.java
@@ -26,19 +26,19 @@
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 
-import org.jboss.seam.forge.project.PackagingType;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.constraints.RequiresFacets;
 import org.jboss.seam.forge.project.facets.BaseFacet;
 import org.jboss.seam.forge.project.facets.PackagingFacet;
 import org.jboss.seam.forge.project.facets.ResourceFacet;
 import org.jboss.seam.forge.project.facets.WebResourceFacet;
+import org.jboss.seam.forge.project.packaging.PackagingType;
 import org.jboss.seam.forge.resources.DirectoryResource;
 import org.jboss.seam.forge.resources.FileResource;
 import org.jboss.seam.forge.shell.Shell;
+import org.jboss.seam.forge.shell.ShellColor;
 import org.jboss.seam.forge.shell.events.PackagingChanged;
 import org.jboss.seam.forge.shell.plugins.Alias;
-import org.jboss.seam.forge.shell.util.ShellColor;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
 import org.jboss.shrinkwrap.descriptor.api.DescriptorImporter;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
 import org.jboss.shrinkwrap.descriptor.api.spec.cdi.beans.BeansDescriptor;
@@ -47,7 +47,7 @@
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 @Alias("forge.spec.cdi")
-@RequiresFacets({ ResourceFacet.class, PackagingFacet.class })
+@RequiresFacet({ ResourceFacet.class, PackagingFacet.class })
 public class CDIFacet extends BaseFacet
 {
    @Inject

diff --git a/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewEntityPlugin.java b/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewEntityPlugin.java
@@ -36,8 +36,6 @@
 import org.jboss.seam.forge.parser.java.JavaClass;
 import org.jboss.seam.forge.parser.java.util.Refactory;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
-import org.jboss.seam.forge.project.constraints.RequiresProject;
 import org.jboss.seam.forge.project.facets.JavaSourceFacet;
 import org.jboss.seam.forge.resources.java.JavaResource;
 import org.jboss.seam.forge.shell.PromptType;
@@ -47,6 +45,8 @@
 import org.jboss.seam.forge.shell.plugins.Help;
 import org.jboss.seam.forge.shell.plugins.Option;
 import org.jboss.seam.forge.shell.plugins.Plugin;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresProject;
 import org.jboss.seam.forge.shell.plugins.Topic;
 
 /**

diff --git a/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewFieldPlugin.java b/j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewFieldPlugin.java
@@ -42,10 +42,8 @@
 import org.jboss.seam.forge.parser.java.util.Refactory;
 import org.jboss.seam.forge.parser.java.util.Types;
 import org.jboss.seam.forge.project.Project;
-import org.jboss.seam.forge.project.Resource;
-import org.jboss.seam.forge.project.constraints.RequiresFacet;
-import org.jboss.seam.forge.project.constraints.RequiresProject;
 import org.jboss.seam.forge.project.facets.JavaSourceFacet;
+import org.jboss.seam.forge.resources.Resource;
 import org.jboss.seam.forge.resources.java.JavaResource;
 import org.jboss.seam.forge.shell.PromptType;
 import org.jboss.seam.forge.shell.Shell;
@@ -55,7 +53,9 @@
 import org.jboss.seam.forge.shell.plugins.Help;
 import org.jboss.seam.forge.shell.plugins.Option;
 import org.jboss.seam.forge.shell.plugins.Plugin;
-import org.jboss.seam.forge.shell.plugins.ResourceScope;
+import org.jboss.seam.forge.shell.plugins.RequiresFacet;
+import org.jboss.seam.forge.shell.plugins.RequiresProject;
+import org.jboss.seam.forge.shell.plugins.RequiresResource;
 import org.jboss.seam.forge.shell.plugins.Topic;
 
 /**
@@ -65,7 +65,7 @@
 @Topic("File & Resources")
 @RequiresProject
 @RequiresFacet(PersistenceFacet.class)
-@ResourceScope(JavaResource.class)
+@RequiresResource(JavaResource.class)
 @Help("A plugin to manage simple @Entity and View creation; a basic MVC framework plugin.")
 public class NewFieldPlugin implements Plugin
 {