geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r330371 - in /geronimo/trunk: etc/maven.xml modules/axis/maven.xml modules/jetty/maven.xml modules/tomcat/maven.xml
Date Wed, 02 Nov 2005 21:57:42 GMT
Author: djencks
Date: Wed Nov  2 13:57:37 2005
New Revision: 330371

URL: http://svn.apache.org/viewcvs?rev=330371&view=rev
Log:
GERONIMO-1123 Attempt to fix the circular dependency

Modified:
    geronimo/trunk/etc/maven.xml
    geronimo/trunk/modules/axis/maven.xml
    geronimo/trunk/modules/jetty/maven.xml
    geronimo/trunk/modules/tomcat/maven.xml

Modified: geronimo/trunk/etc/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/maven.xml?rev=330371&r1=330370&r2=330371&view=diff
==============================================================================
--- geronimo/trunk/etc/maven.xml (original)
+++ geronimo/trunk/etc/maven.xml Wed Nov  2 13:57:37 2005
@@ -86,10 +86,11 @@
     </preGoal>
 
     <!-- Construct dependency lists for inclusion in generated jar. -->
-    <postGoal name="java:compile">
+    <!-- putting this goal here produces a circular dependency -->
+ <!--   <postGoal name="java:compile">
         <attainGoal name="geronimo:dependency"/>
     </postGoal>
-
+-->
     <!-- Remove the log files -->
     <goal name="clobber"
         description="Removes all (non-repository installed) build generated files">

Modified: geronimo/trunk/modules/axis/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/maven.xml?rev=330371&r1=330370&r2=330371&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/maven.xml (original)
+++ geronimo/trunk/modules/axis/maven.xml Wed Nov  2 13:57:37 2005
@@ -6,9 +6,9 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,40 +20,10 @@
     xmlns:maven="jelly:maven"
     xmlns:deploy="deploy"
     xmlns:ant="jelly:ant">
-    <goal name="setclasspath">
-        <path id="test.classpath">
-            <path refid="maven.dependency.classpath"/>
-            <pathelement location="${tools.jar}"/>
-        </path>
-    </goal>
 
-    <!--
-    <preGoal name="test:compile">
-        <ant:javac
-            destdir="${basedir}/target/test-classes"
-            debug="on"
-            fork="true">
-            <src path="${basedir}/src/test"/>
-            <ant:classpath>
-                <ant:path refid="maven.dependency.classpath"/>
-                <ant:pathelement path="${maven.build.dest}"/>
-            </ant:classpath>
-        </ant:javac>
-    </preGoal>
-
-    <preGoal name="test:test">
-        <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
-            <j:jelly xmlns="jelly:ant">
-                <ant:ant antfile="build.xml"
-                    inheritall="true"
-                    inheritrefs="true"
-                    dir="src/samples/echo"/>
-                <ant:ant antfile="build.xml"
-                    inheritall="true"
-                    inheritrefs="true"
-                    dir="src/samples/echo-pojo"/>
-            </j:jelly>
-        </j:if>
-    </preGoal>
--->
+    <!-- Construct dependency lists for inclusion in generated jar. -->
+    <postGoal name="java:compile">
+        <attainGoal name="geronimo:dependency"/>
+    </postGoal>
+    
 </project>

Modified: geronimo/trunk/modules/jetty/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/maven.xml?rev=330371&r1=330370&r2=330371&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/maven.xml (original)
+++ geronimo/trunk/modules/jetty/maven.xml Wed Nov  2 13:57:37 2005
@@ -6,16 +6,16 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  
+
 
 <!-- $Rev$ $Date$ -->
 
@@ -23,5 +23,10 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven">
+    
+    <!-- Construct dependency lists for inclusion in generated jar. -->
+    <postGoal name="java:compile">
+        <attainGoal name="geronimo:dependency"/>
+    </postGoal>
 
 </project>

Modified: geronimo/trunk/modules/tomcat/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/maven.xml?rev=330371&r1=330370&r2=330371&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/maven.xml (original)
+++ geronimo/trunk/modules/tomcat/maven.xml Wed Nov  2 13:57:37 2005
@@ -40,23 +40,15 @@
         <attainGoal name="build"/>
     </goal>
 
-<!-- It doesn't work - Invalid geronimo-service.xml file during assembly
-	<preGoal name="jar:jar">
-		<mkdir dir="${maven.build.dest}/META-INF"/>
-
-        <j:set var="planName" value="tomcat-plan.xml"/>
-        <echo>Preprocessing ${planName}</echo>
-        <velocity:merge
-            basedir="src/plan"
-            template="tomcat-plan.xml"
-            name="${maven.build.dest}/META-INF/geronimo-service.xml"/>
-	</preGoal>
--->
+    <!-- Construct dependency lists for inclusion in generated jar. -->
+    <postGoal name="java:compile">
+        <attainGoal name="geronimo:dependency"/>
+    </postGoal>
 
     <preGoal name="test:test">
-    
+
         <j:set var="endorsed.dir" value="${maven.build.dir}/endorsed"/>
-        
+
         <mkdir dir="${endorsed.dir}"/>
         <mkdir dir="${maven.build.dir}/var"/>
         <mkdir dir="${maven.build.dir}/var/catalina"/>



Mime
View raw message