You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/01/19 04:23:52 UTC
svn commit: r613354 -
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java
Author: matzew
Date: Fri Jan 18 19:23:51 2008
New Revision: 613354
URL: http://svn.apache.org/viewvc?rev=613354&view=rev
Log:
merged TRINIDAD-907 to build-tools
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java?rev=613354&r1=613353&r2=613354&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java Fri Jan 18 19:23:51 2008
@@ -190,7 +190,7 @@
* workspace.xml file to be used in creation of the
* workspace file (.jws) or project file (.jpr). Otherwise,
* if a .jws or .jpr exists, it will be used instead.
- * @parameter expression="${force}" default-value=true
+ * @parameter expression="${force}" default-value=false
*
*/
private boolean force;
@@ -471,18 +471,24 @@
// </hash>
Xpp3Dom targetDOM = new Xpp3Dom("list");
- for (Iterator i = project.getCollectedProjects().iterator();
- i.hasNext(); )
+ for (Iterator i = project.getCollectedProjects().iterator(); i.hasNext(); )
{
MavenProject collectedProject = (MavenProject) i.next();
- File projectFile = getJProjectFile(collectedProject);
- targetDOM.addChild(createProjectReferenceDOM(workspaceDir,
- projectFile));
-
- File testProjectFile = getJProjectTestFile(collectedProject);
- targetDOM.addChild(createProjectReferenceDOM(workspaceDir,
- testProjectFile));
+ // if a child project is also a workspace, then don't
+ // put it in the .jws file. It will have its own .jws
+ // file.
+ if (!"pom".equals(collectedProject.getPackaging()))
+ {
+ File projectFile = getJProjectFile(collectedProject);
+
+ targetDOM.addChild(createProjectReferenceDOM(workspaceDir,
+ projectFile));
+
+ File testProjectFile = getJProjectTestFile(collectedProject);
+ targetDOM.addChild(createProjectReferenceDOM(workspaceDir,
+ testProjectFile));
+ }
}
// TODO: use a better merge algorithm