Update for Forge/Furnace Alpha10

forge · Aug 20, 2013 · eaa8a3c · eaa8a3c
1 parent 7d96446
commit eaa8a3c
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 150 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,42 +14,43 @@
 
    <properties>
       <switchyard.version>0.5.0.Final</switchyard.version>
-      <furnace.version>2.0.0.Alpha9</furnace.version>
+      <furnace.version>2.0.0.Alpha10</furnace.version>
+      <forge.version>2.0.0.Alpha10</forge.version>
    </properties>
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>container-cdi</artifactId>
+         <groupId>org.jboss.forge.furnace.container</groupId>
+         <artifactId>cdi</artifactId>
          <classifier>forge-addon</classifier>
          <version>${furnace.version}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
-         <version>${furnace.version}</version>
+         <version>${forge.version}</version>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
-         <version>${furnace.version}</version>
+         <version>${forge.version}</version>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
-         <version>${furnace.version}</version>
+         <version>${forge.version}</version>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
-         <version>${furnace.version}</version>
+         <version>${forge.version}</version>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>

diff --git a/src/main/java/org/switchyard/tools/forge/AbstractSwitchyardFacet.java b/src/main/java/org/switchyard/tools/forge/AbstractSwitchyardFacet.java
@@ -29,6 +29,7 @@
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 import org.jboss.forge.addon.projects.facets.DependencyFacet;
+import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.projects.facets.PackagingFacet;
 
 /**
@@ -89,7 +90,7 @@ public boolean isInstalled()
     */
    public String getVersion()
    {
-      return getFaceted().getFacet(DependencyFacet.class).getProperty(VERSION);
+      return getFaceted().getFacet(MetadataFacet.class).getEffectiveProperty(VERSION);
    }
 
    /**
@@ -99,6 +100,6 @@ public String getVersion()
     */
    public void setVersion(String version)
    {
-      getFaceted().getFacet(DependencyFacet.class).setProperty(VERSION, version);
+      getFaceted().getFacet(MetadataFacet.class).setDirectProperty(VERSION, version);
    }
 }
diff --git a/src/main/java/org/switchyard/tools/forge/bean/BeanServiceConfigurator.java b/src/main/java/org/switchyard/tools/forge/bean/BeanServiceConfigurator.java
@@ -20,7 +20,7 @@
 package org.switchyard.tools.forge.bean;
 
 import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.projects.facets.ResourceFacet;
+import org.jboss.forge.addon.projects.facets.ResourcesFacet;
 import org.jboss.forge.furnace.services.Exported;
 import org.switchyard.tools.forge.plugin.TemplateResource;
 
@@ -49,11 +49,11 @@ public void newBean(Project project, String pkgName, final String serviceName) t
       TemplateResource beanIntf = new TemplateResource(BEAN_INTERFACE_TEMPLATE);
       beanIntf.serviceName(serviceName);
       String interfaceFile = beanIntf.writeJavaSource(
-               project.getFacet(ResourceFacet.class), pkgName, serviceName, false);
+               project.getFacet(ResourcesFacet.class), pkgName, serviceName, false);
 
       TemplateResource beanImpl = new TemplateResource(BEAN_IMPLEMENTATION_TEMPLATE);
       beanImpl.serviceName(serviceName);
       String implementationFile = beanImpl.writeJavaSource(
-               project.getFacet(ResourceFacet.class), pkgName, serviceName + "Bean", false);
+               project.getFacet(ResourcesFacet.class), pkgName, serviceName + "Bean", false);
    }
 }
diff --git a/src/main/java/org/switchyard/tools/forge/bpm/BPMServiceConfigurator.java b/src/main/java/org/switchyard/tools/forge/bpm/BPMServiceConfigurator.java
@@ -26,7 +26,7 @@
 import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
-import org.jboss.forge.addon.projects.facets.ResourceFacet;
+import org.jboss.forge.addon.projects.facets.ResourcesFacet;
 import org.jboss.forge.furnace.services.Exported;
 import org.jboss.forge.parser.JavaParser;
 import org.jboss.forge.parser.java.JavaInterface;
@@ -129,7 +129,7 @@ public void newProcess(
                   .replaceToken(VAR_MESSAGE_CONTENT_IN_NAME, argMessageContentInName)
                   .replaceToken(VAR_MESSAGE_CONTENT_OUT_NAME, argMessageContentOutName)
                   .packageName(pkgName);
-         template.writeResource(project.getFacet(ResourceFacet.class).getResource(processDefinitionPath));
+         template.writeResource(project.getFacet(ResourcesFacet.class).getResource(processDefinitionPath));
       }
 
       boolean agent = argAgent != null ? argAgent.booleanValue() : false;

diff --git a/src/main/java/org/switchyard/tools/forge/camel/CamelServiceConfigurator.java b/src/main/java/org/switchyard/tools/forge/camel/CamelServiceConfigurator.java
@@ -19,12 +19,8 @@
 
 package org.switchyard.tools.forge.camel;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.projects.facets.MetadataFacet;
-import org.jboss.forge.addon.projects.facets.ResourceFacet;
+import org.jboss.forge.addon.projects.facets.ResourcesFacet;
 import org.jboss.forge.furnace.services.Exported;
 import org.switchyard.component.camel.config.model.v1.V1CamelImplementationModel;
 import org.switchyard.config.model.composite.v1.V1ComponentModel;
@@ -72,7 +68,8 @@ public String getType()
     * @param wsdlPort WSDL portType (ex. MyService);
     * @param interfaceClass the fully qualified java interface class (only required if Type is JAVA)
     */
-   public void createXMLRoute(Project project, String routeName, Type type, String wsdlPath, String wsdlPort, String interfaceClass) throws java.io.IOException
+   public void createXMLRoute(Project project, String routeName, Type type, String wsdlPath, String wsdlPort,
+            String interfaceClass) throws java.io.IOException
    {
       // Gather interface details
       String intfValue;
@@ -101,7 +98,7 @@ public void createXMLRoute(Project project, String routeName, Type type, String
       TemplateResource xmlRoute = new TemplateResource(ROUTE_XML_TEMPLATE);
       String routeFile = routeName + ".xml";
       xmlRoute.serviceName(routeName);
-      xmlRoute.writeResource(project.getFacet(ResourceFacet.class).getResource(routeFile));
+      xmlRoute.writeResource(project.getFacet(ResourcesFacet.class).getResource(routeFile));
       impl.setXMLPath(routeFile);
       component.setImplementation(impl);
 
@@ -123,11 +120,11 @@ public void createJavaRoute(Project project, String routeName, String pkgName)
       TemplateResource camelIntf = new TemplateResource(ROUTE_INTERFACE_TEMPLATE);
       camelIntf.serviceName(routeName);
       String interfaceFile = camelIntf.writeJavaSource(
-               project.getFacet(ResourceFacet.class), pkgName, routeName, false);
+               project.getFacet(ResourcesFacet.class), pkgName, routeName, false);
 
       TemplateResource camelImpl = new TemplateResource(ROUTE_IMPLEMENTATION_TEMPLATE);
       camelImpl.serviceName(routeName);
       String implementationFile = camelImpl.writeJavaSource(
-               project.getFacet(ResourceFacet.class), pkgName, routeName + "Builder", false);
+               project.getFacet(ResourcesFacet.class), pkgName, routeName + "Builder", false);
    }
 }
diff --git a/src/main/java/org/switchyard/tools/forge/plugin/SwitchYardConfigurator.java b/src/main/java/org/switchyard/tools/forge/plugin/SwitchYardConfigurator.java
@@ -28,7 +28,7 @@
 import org.jboss.forge.addon.parser.java.resources.JavaResource;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
-import org.jboss.forge.addon.projects.facets.ResourceFacet;
+import org.jboss.forge.addon.projects.facets.ResourcesFacet;
 import org.jboss.forge.furnace.services.Exported;
 import org.switchyard.config.model.composite.ComponentModel;
 import org.switchyard.config.model.composite.ComponentReferenceModel;
@@ -158,7 +158,7 @@ public JavaResource createServiceTest(Project project, final String serviceName,
 
       TemplateResource template = new TemplateResource(TEST_SERVICE_TEMPLATE);
       template.serviceName(serviceName);
-      String testFile = template.writeJavaSource(project.getFacet(ResourceFacet.class),
+      String testFile = template.writeJavaSource(project.getFacet(ResourcesFacet.class),
                pkgName, serviceName + "Test", true);
       return project.getFacet(JavaSourceFacet.class).getTestJavaResource(testFile);
    }

diff --git a/src/main/java/org/switchyard/tools/forge/plugin/SwitchYardFacet.java b/src/main/java/org/switchyard/tools/forge/plugin/SwitchYardFacet.java
@@ -46,7 +46,6 @@
 import org.jboss.forge.addon.facets.constraints.RequiresFacet;
 import org.jboss.forge.addon.maven.projects.MavenFacet;
 import org.jboss.forge.addon.maven.projects.MavenPluginFacet;
-import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.facets.DependencyFacet;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.projects.facets.PackagingFacet;
@@ -78,7 +77,6 @@ public class SwitchYardFacet extends AbstractSwitchyardFacet
    private static final Logger logger = Logger.getLogger(SwitchYardFacet.class.getName());
    private static final Log LOG = LogFactory.getLog(SwitchYardFacet.class);
 
-
    // repository id of JBoss Nexus repository
    private static final String CONFIG_ATTR = "switchyard.config";
 
@@ -106,29 +104,31 @@ public SwitchYardFacet()
    {
       super(DEPENDENCIES);
    }
-   
-//   @Override
-//   public void setFaceted(Project origin){
-//	   LOG.info("Called setFaceted");
-//	   super.setFaceted(origin);
-//	   this.install();
-//   }
+
+   // @Override
+   // public void setFaceted(Project origin){
+   // LOG.info("Called setFaceted");
+   // super.setFaceted(origin);
+   // this.install();
+   // }
 
    @Override
    public boolean install()
    {
-	   logger.info("In SwitchYardFacetInstall");
+      logger.info("In SwitchYardFacetInstall");
       // Doing this in a try/finally to set and unset the context class loader
       final ClassLoader orig = Classes.setTCCL(getClass().getClassLoader());
       try
       {
          // TOOD allow user to choose this
-         boolean rtnval= performInstall(getFaceted().getFacet(MetadataFacet.class).getProjectName());
+         boolean rtnval = performInstall(getFaceted().getFacet(MetadataFacet.class).getProjectName());
          logger.info("Intall returning " + rtnval);
          return rtnval;
-      }catch(Exception ex){
-    	  ex.printStackTrace();
-    	  return false;
+      }
+      catch (Exception ex)
+      {
+         ex.printStackTrace();
+         return false;
       }
       finally
       {
@@ -361,7 +361,7 @@ private void tweakForOpenShift() throws Exception
     */
    private void addScannerPlugin(Model pom, Profile profile) throws Exception
    {
-      String version = getFaceted().getFacet(DependencyFacet.class).getProperty(VERSION);
+      String version = getFaceted().getFacet(MetadataFacet.class).getEffectiveProperty(VERSION);
       Dependency dep = DependencyBuilder.create(SWITCHYARD_PLUGIN + ":" + version);
       org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin();
 
@@ -409,7 +409,7 @@ private void addScannerPlugin(Model pom, Profile profile) throws Exception
 
    private boolean performInstall(String appName)
    {
-	   logger.info("Called PerformInstall");
+      logger.info("Called PerformInstall");
       try
       {
          tweakForOpenShift();
@@ -449,7 +449,7 @@ private boolean performInstall(String appName)
       }
       catch (Exception ex)
       {
-    	  ex.printStackTrace();
+         ex.printStackTrace();
          return false;
       }
       return true;