You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2005/08/19 14:51:01 UTC

svn commit: r233477 - in /maven/maven-1/plugins/trunk/ejb: plugin.jelly plugin.properties xdocs/changes.xml xdocs/properties.xml

Author: vmassol
Date: Fri Aug 19 05:50:55 2005
New Revision: 233477

URL: http://svn.apache.org/viewcvs?rev=233477&view=rev
Log:
- By default do not generate client EJB. I believe this is a more common default that generating as generation of client EJBs is only required for distributed apps which are not so common.
- Make the ejb creation work even if there are not sources.

Modified:
    maven/maven-1/plugins/trunk/ejb/plugin.jelly
    maven/maven-1/plugins/trunk/ejb/plugin.properties
    maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
    maven/maven-1/plugins/trunk/ejb/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/ejb/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ejb/plugin.jelly?rev=233477&r1=233476&r2=233477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/ejb/plugin.jelly Fri Aug 19 05:50:55 2005
@@ -38,9 +38,22 @@
   <!--==================================================================-->
   <goal name="ejb:init">
 
-    <j:if test="${sourcesPresent == 'true'}">
-      <attainGoal name="test:test"/>
-    </j:if>
+    <!-- This is required in the case of building an ejb jar where all
+         the sources are taken from a dependent jar. When this is the case
+         the source files have not been compiled and the classes dir thus
+         not created automatically -->
+    <ant:mkdir dir="${maven.build.dest}"/>
+
+    <j:choose>
+      <j:when test="${sourcesPresent == 'true'}">
+        <attainGoal name="test:test"/>
+      </j:when>
+      <j:otherwise>
+        <!-- Make sure we always copy the resources whether there are sources or 
+             not -->
+        <attainGoal name="java:jar-resources"/>
+      </j:otherwise>
+    </j:choose>
 
   </goal>
   
@@ -103,7 +116,6 @@
         <!-- END OF TO BE REMOVED -->        
       </j:forEach>
  
-
       <j:if test="${maven.ejb.manifest.available}">
         <ant:setProperty name="manifest" value="${maven.ejb.manifest}" />
       </j:if>

Modified: maven/maven-1/plugins/trunk/ejb/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ejb/plugin.properties?rev=233477&r1=233476&r2=233477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/ejb/plugin.properties Fri Aug 19 05:50:55 2005
@@ -53,4 +53,4 @@
 maven.ejb.excludes = **/package.html
 
 # Decide whether a client jar is generated or not.
-maven.ejb.client.generate = true
+maven.ejb.client.generate = false

Modified: maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml?rev=233477&r1=233476&r2=233477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml Fri Aug 19 05:50:55 2005
@@ -25,6 +25,14 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in SVN trunk">
+      <action dev="vmassol" type="update">
+        By default do not generate client EJB. I believe this is a more common
+        default that generating as generation of client EJBs is only required
+        for distributed apps which are not so common.
+      </action>
+      <action dev="vmassol" type="fix">
+        Make the ejb creation work even if there are not sources. 
+      </action>
       <action dev="vmassol" type="fix" issue="MPEJB-12">
         Fixed default property values in the web site documentation.
       </action>
@@ -36,7 +44,7 @@
         property <code>maven.ejb.client.generate</code> which decides whether or
         not to generate the ejb client jar. It defaults to true.
       </action>
-      <action dev="vmassol" type="fix" issue="MPEJB-16" due-to="Håvard Bjåstad">
+      <action dev="vmassol" type="fix" issue="MPEJB-16" due-to="H�vard Bj�stad">
         Added new EJB type handler that supports <code>ejb</code> and
         <code>ejb-client</code> types. This fixes the bug with
         <code>ejb:install/deploy-client</code> not uploading the client

Modified: maven/maven-1/plugins/trunk/ejb/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ejb/xdocs/properties.xml?rev=233477&r1=233476&r2=233477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/xdocs/properties.xml Fri Aug 19 05:50:55 2005
@@ -148,7 +148,7 @@
             Decide wether to generate an ejb client jar or not.
           </td>
           <td>
-            true
+            false
           </td>
         </tr>
         <tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org