update dependencies - command finally works

forge · Sep 11, 2013 · 024e936 · 024e936
1 parent 36e0967
commit 024e936
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 29 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -20,5 +20,10 @@
       <classifier>forge-addon</classifier>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+       <groupId>org.jboss.forge.addon</groupId>
+       <artifactId>dependencies-api</artifactId>
+       <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -26,15 +26,24 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-       <groupId>org.jboss.forge.addon</groupId>
-       <artifactId>ui-api</artifactId>
-       <scope>provided</scope>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>dependencies-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-       <groupId>org.jboss.forge.addon</groupId>
-       <artifactId>projects</artifactId>
-       <classifier>forge-addon</classifier>
-       <scope>provided</scope>
-      </dependency>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>ui-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>resources-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>projects-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/impl/src/main/java/org/hibernate/forge/addon/generate/GenerateEntitiesCommand.java b/impl/src/main/java/org/hibernate/forge/addon/generate/GenerateEntitiesCommand.java
@@ -4,7 +4,7 @@
 
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
-import org.jboss.forge.addon.projects.ui.AbstractProjectCommand;
+import org.jboss.forge.addon.ui.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.hints.InputType;
@@ -15,7 +15,7 @@
 import org.jboss.forge.addon.ui.util.Categories;
 import org.jboss.forge.addon.ui.util.Metadata;
 
-public class GenerateEntitiesCommand extends AbstractProjectCommand
+public class GenerateEntitiesCommand extends AbstractUICommand
 {
 
    private static String[] COMMAND_CATEGORY = { "Java EE", "Generation" };
@@ -37,10 +37,10 @@ public Metadata getMetadata()
    @Override
    public void initializeUI(UIBuilder builder) throws Exception
    {
-      Project project = getSelectedProject(builder.getUIContext());
-      MetadataFacet facet = project.getFacet(MetadataFacet.class);
-      String topLevelPackage = facet.getTopLevelPackage();
-      targetPackage.setDefaultValue(topLevelPackage);
+//      Project project = getSelectedProject(builder.getUIContext());
+//      MetadataFacet facet = project.getFacet(MetadataFacet.class);
+//      String topLevelPackage = facet.getTopLevelPackage();
+//      targetPackage.setDefaultValue(topLevelPackage);
    }
 
    @Override
@@ -54,9 +54,9 @@ protected String getParameters()
       return targetPackage.getValue();
    }
 
-   @Override
-   protected boolean isProjectRequired()
-   {
-      return true;
-   }
+//   @Override
+//   protected boolean isProjectRequired()
+//   {
+//      return true;
+//   }
 }
diff --git a/pom.xml b/pom.xml
@@ -18,6 +18,7 @@
   </properties>
   <dependencyManagement>
     <dependencies>
+      <!-- Furnace dependencies -->
       <dependency>
         <groupId>org.jboss.forge.furnace</groupId>
         <artifactId>furnace-api</artifactId>
@@ -49,6 +50,7 @@
         <version>${version.furnace}</version>
         <scope>test</scope>
       </dependency>
+      <!-- project dependencies -->
       <dependency>
         <groupId>org.jboss.forge.addon</groupId>
         <artifactId>hibernate-tools</artifactId>
@@ -71,22 +73,39 @@
         <version>${project.version}</version>
         <classifier>forge-addon</classifier>
       </dependency>
+      <!-- Addon dependencies -->
       <dependency>
-         <groupId>org.jboss.forge.addon</groupId>
-         <artifactId>ui-api</artifactId>
-         <version>${version.furnace}</version>
+        <groupId>org.jboss.forge.addon</groupId>
+        <artifactId>ui</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge.addon</groupId>
-         <artifactId>ui</artifactId>
-         <version>${version.furnace}</version>
-         <classifier>forge-addon</classifier>
+        <groupId>org.jboss.forge.addon</groupId>
+        <artifactId>projects</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <classifier>forge-addon</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.forge.addon</groupId>
+        <artifactId>dependencies-api</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.forge.addon</groupId>
+        <artifactId>resources-api</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.forge.addon</groupId>
+        <artifactId>ui-api</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
-         <artifactId>projects</artifactId>
-         <version>${version.furnace}</version>
-         <classifier>forge-addon</classifier>
+         <artifactId>projects-api</artifactId>
+         <version>2.0.0-SNAPSHOT</version>
+         <scope>provided</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -25,6 +25,11 @@
       <artifactId>arquillian-furnace-classpath</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.forge.addon</groupId>
+      <artifactId>ui</artifactId>
+      <classifier>forge-addon</classifier>
+    </dependency>
     <dependency>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>hibernate-tools</artifactId>