MPJDEVELOPER-1. Fix JPR file generation.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114764 13f79535-47bb-0310-9956-ffa450edef68

jdeveloper/plugin.jelly

@@ -5,7 +5,7 @@
   xmlns:j="jelly:core" 
   xmlns:util="jelly:util">
   <!--==================================================================-->
-  <!-- Generate Jdeveloper IDE files                                    -->
+  <!-- Generates Jdeveloper IDE files                                   -->
   <!--==================================================================-->    
   <goal name="jdeveloper"
     description="Generate JDeveloper project files"
@@ -69,12 +69,13 @@
            <jdkList class="java.util.ArrayList"/>      
            <libraryList class="java.util.ArrayList">            
              <j:forEach var="lib" items="${pom.artifacts}">  
+               <j:set var="libentry" value="${maven.jdeveloper.relative.path}/${maven.jdeveloper.maven.home}/repository/${lib.dependency.artifactId}/jars/${lib.name}" trim="true"/>         
                <Item class="oracle.jdeveloper.library.JLibrary">           
                  <defaultLibraryDefinition>
                    <JDKVersion/>
                    <classPath>
                      <entries>
-                       <Item path="${maven.jdeveloper.relative.path}/${maven.jdeveloper.maven.home}/repository/${lib.dependency.artifactId}/jars/${lib.name}" jar-entry=""/>
+                       <Item path="${libentry}" jar-entry=""/>
                      </entries>
                    </classPath>
                    <docPath>
@@ -124,7 +125,7 @@
                      <Item>
                        <Key>oracle.jdeveloper.compiler.OjcConfiguration</Key>
                        <Value class="oracle.jdeveloper.compiler.OjcConfiguration">
-                         <assertionsEnabled>false</assertionsEnabled>
+                         <assertionsEnabled>true</assertionsEnabled>
                          <copyRes>
                            <Item>.gif</Item>
                            <Item>.properties</Item>
@@ -195,9 +196,9 @@
                         <jdkVersionNumber>1.4.1</jdkVersionNumber>                        
                         <libraries>                                                
                           <j:set var="path" trim="true">   
-                           JDeveloper Runtime;                      
+                           JDeveloper Runtime                      
                             <j:forEach var="dep" items="${pom.dependencies}">
-                              ${dep.artifactId};                          
+                              ;${dep.artifactId}                          
                             </j:forEach>
                           </j:set>                        
                           ${path}
@@ -331,8 +332,12 @@
           <projectSourcePath>
             <entries>
               <Item path="${pom.build.sourceDirectory}"/>        
-              <Item path="${pom.build.unitTestDirectory}"/>
-              <Item path="${pom.build.integrationTestDirectory}"/>
+              <j:if test="${pom.build.unitTestSourceDirectory}!= ''">
+                <Item path="${pom.build.unitTestSourceDirectory}"/>
+              </j:if>
+              <j:if test="${pom.build.integrationUnitTestSourceDirectory}!= ''">
+                <Item path="${pom.build.integrationUnitTestSourceDirectory}"/>
+              </j:if>
               <Item path="target/xdoclet/ejbdoclet"/>
               <Item path="target/xdoclet/jmxdoclet"/>
             </entries>     
@@ -368,20 +373,24 @@
       </ant:patternset>
     </ant:fileset>
   </ant:fileScanner>  
-  <ant:fileScanner var="unitTestSourceFiles">
-    <ant:fileset dir="${pom.build.unitTestDirectory}">
-      <ant:patternset>       
-        <ant:include name="**/*.java"/>       
-      </ant:patternset>
-    </ant:fileset>
-  </ant:fileScanner>  
-  <ant:fileScanner var="integrationTestSourceFiles">
-    <ant:fileset dir="${pom.build.integrationTestDirectory}">
-      <ant:patternset>       
-        <ant:include name="**/*.java"/>       
-      </ant:patternset>
-    </ant:fileset>
-  </ant:fileScanner>  
+  <j:if test="${pom.build.unitTestSourceDirectory} != ''">	
+    <ant:fileScanner var="unitTestSourceFiles">
+      <ant:fileset dir="${pom.build.unitTestDirectory}">
+        <ant:patternset>       
+          <ant:include name="**/*.java"/>       
+        </ant:patternset>
+      </ant:fileset>
+     </ant:fileScanner>  
+  </j:if>
+  <j:if test="${pom.build.integrationUnitTestSourceDirectory}!= ''">	
+    <ant:fileScanner var="integrationTestSourceFiles">
+      <ant:fileset dir="${pom.build.integrationUnitTestDirectory}">
+        <ant:patternset>       
+          <ant:include name="**/*.java"/>       
+        </ant:patternset>
+      </ant:fileset>
+    </ant:fileScanner>  
+  </j:if>
   <ant:fileScanner var="javaDocFiles">
     <ant:fileset dir="${pom.build.sourceDirectory}">
       <ant:patternset>       

jdeveloper/project.xml

@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdeveloper-plugin</id>
   <name>Maven JDeveloper Plug-in</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <inceptionYear>2002</inceptionYear>
   <description>A plugin to generate various files for Oracle's JDeveloper IDE and ease the use of Maven within that environment</description>
   <shortDescription>JDeveloper Plugin for Maven</shortDescription>

jdeveloper/xdocs/changes.xml

@@ -6,6 +6,12 @@
   </properties>
 
   <body>
+    <release version="1.3" date="In CVS">
+      <action dev="evenisse" type="fix" issue="MPJDEVELOPER-1">
+        Fix JPR file generation.
+      </action>
+    </release>
+    
     <release version="1.2" date="2003-09-29">
     </release>