Add missing beans.xml and Fix project renaming logging

forge · May 9, 2013 · 7fc47f7 · 7fc47f7
1 parent d02152d
commit 7fc47f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/addons/api/src/main/resources/META-INF/beans.xml b/addons/api/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd" />
diff --git a/addons/impl/src/main/java/org/jboss/forge/addons/AddonProjectConfigurator.java b/addons/impl/src/main/java/org/jboss/forge/addons/AddonProjectConfigurator.java
@@ -68,8 +68,8 @@ public void setupAddonProject(Project project, Version forgeVersion, Iterable<Ad
       metadata.setProjectName(projectName + "-parent");
       DirectoryResource newRoot = project.getProjectRoot().getParent().getChildDirectory(metadata.getProjectName());
       // FORGE-877: there's an eclipse (not m2e) limitation that says if a project is located directly in the workspace
-      // folder, then the project name must match the project folder name
-      if (!newRoot.exists() && !project.getProjectRoot().renameTo(newRoot))
+      // folder, then the imported project's name is always the same as the folder it is contained in.
+      if (newRoot.exists() || !project.getProjectRoot().renameTo(newRoot))
       {
          log.warning("Could not rename project root");
       }