Index: castor/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/castor/plugin.jelly,v
retrieving revision 1.6
diff -U3 -r1.6 plugin.jelly
--- castor/plugin.jelly	4 Mar 2004 18:01:05 -0000	1.6
+++ castor/plugin.jelly	23 Apr 2004 22:57:59 -0000
@@ -38,28 +38,17 @@
     <maven:addPath id="maven.compile.src.set"
                    refid="maven.castor.compile.src.set"/>
 
-    <!-- determine if SourceGenerator needs to be run in a separate JVM, -->
-    <!-- to pick up the castorbuilder.properties file                    -->
+    <!-- add castor properties file directory to classpath if set -->
+    <!-- NOTE: need to set temp 'dir' var as                      -->
+    <!--       !empty{maven.castor.properties.dir} doesn't        -->
+    <!--       work as expected.                                  -->
     <j:set var="dir" value="${maven.castor.properties.dir}"/>
-    <j:choose>
-      <!-- NOTE: need to set temp 'dir' var as               -->
-      <!--       !empty{maven.castor.properties.dir} doesn't -->
-      <!--       work as expected.                           -->
- 
-      <j:when test="${!empty(dir)}">
-        <ant:property name="maven.castor.fork" value="true"/>
-        <ant:path id="maven.castor.classpath">
-          <ant:path refid="maven.dependency.classpath"/>
-          <ant:pathelement location="${maven.castor.properties.dir}"/>
-        </ant:path>  
-      </j:when>
-      <j:otherwise>
-        <ant:property name="maven.castor.fork" value="false"/>
-        <ant:path id="maven.castor.classpath">
-          <ant:path refid="maven.dependency.classpath"/>
-        </ant:path>  
-      </j:otherwise>
-    </j:choose>
+    <ant:path id="maven.castor.classpath">
+      <ant:path refid="maven.dependency.classpath"/>
+      <j:if test="${!empty(dir)}">
+        <ant:pathelement location="${maven.castor.properties.dir}"/>
+      </j:if>
+    </ant:path>
   </goal>
 
   <define:taglib uri="castor">
@@ -88,7 +77,7 @@
         <ant:echo message="Generating sources for ${schema}"/>
 
         <ant:java className="org.exolab.castor.builder.SourceGenerator"
-                  fork="${maven.castor.fork}"
+                  fork="true"
                   failonerror="true">
           <ant:arg value="-i"/>
           <ant:arg value="${schema}"/>