Avoiding using Furnace-SE for now

forgeide · Mar 6, 2014 · bba15a8 · bba15a8
1 parent 47e918d
commit bba15a8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -94,9 +94,15 @@
          <artifactId>javax.ws.rs-api</artifactId>
          <scope>provided</scope>
       </dependency>
+      <!-- <dependency> <groupId>org.jboss.forge.furnace</groupId> <artifactId>furnace-se</artifactId> <version>${version.forge}</version> </dependency> -->
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>furnace-se</artifactId>
+         <artifactId>furnace</artifactId>
+         <version>${version.forge}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-proxy</artifactId>
          <version>${version.forge}</version>
       </dependency>
       <dependency>

diff --git a/src/main/java/org/forgeide/producer/FurnaceProducer.java b/src/main/java/org/forgeide/producer/FurnaceProducer.java
@@ -20,8 +20,8 @@
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.AddonRegistry;
+import org.jboss.forge.furnace.impl.FurnaceImpl;
 import org.jboss.forge.furnace.repositories.AddonRepositoryMode;
-import org.jboss.forge.furnace.se.FurnaceFactory;
 
 /**
  * 
@@ -36,12 +36,12 @@ public class FurnaceProducer
 
    private Furnace furnace;
 
-   private Map<String,List<String>> availableCommands;
+   private Map<String, List<String>> availableCommands;
 
    @PostConstruct
    public void setup()
    {
-      furnace = FurnaceFactory.getInstance();
+      furnace = new FurnaceImpl();
 
       String path = servletContext.getRealPath("/WEB-INF/addon-repository");
       File repoDir = new File(path);
@@ -62,15 +62,16 @@ public void setup()
       }
 
       // Query the available commands
-      availableCommands = new HashMap<String,List<String>>();
+      availableCommands = new HashMap<String, List<String>>();
 
       AddonRegistry addonRegistry = furnace.getAddonRegistry();
       CommandFactory commandFactory = addonRegistry.getServices(CommandFactory.class).get();
       IDEUIContext context = new IDEUIContext();
       for (UICommand cmd : commandFactory.getCommands())
       {
          UICommandMetadata metadata = cmd.getMetadata(context);
-         if (!availableCommands.containsKey(metadata.getCategory().getName())) {
+         if (!availableCommands.containsKey(metadata.getCategory().getName()))
+         {
             availableCommands.put(metadata.getCategory().getName(), new ArrayList<String>());
          }
          availableCommands.get(metadata.getCategory().getName()).add(metadata.getName());
@@ -83,8 +84,10 @@ public Furnace getFurnace()
       return furnace;
    }
 
-   @Produces @Forge
-   public Map<String,List<String>> getAvailableCommands() {
+   @Produces
+   @Forge
+   public Map<String, List<String>> getAvailableCommands()
+   {
       return availableCommands;
    }
 

diff --git a/src/main/java/org/forgeide/service/CommandServices.java b/src/main/java/org/forgeide/service/CommandServices.java
@@ -15,20 +15,21 @@
 
 /**
  * Provides RESTful services for querying Forge commands
- *
+ * 
  * @author Shane Bryzak
- *
+ * 
  */
 @Path("/commands")
 @Model
-public class CommandServices 
+public class CommandServices
 {
-   @Inject @Forge
-   Instance<Map<String,List<String>>> availableCommands;
+   @Inject
+   @Forge
+   Instance<Map<String, List<String>>> availableCommands;
 
    @GET
    @Produces(MediaType.APPLICATION_JSON)
-   public Map<String,List<String>> getCommands()
+   public Map<String, List<String>> getCommands()
    {
       return availableCommands.get();
    }