[jboss-svn-commits] JBL Code SVN: r11172 - labs/jbosslabs/trunk/portal-extensions/configuration.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-04-20 16:35:31 -0400 (Fri, 20 Apr 2007)
New Revision: 11172

Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/project.xml
Log:
Removing jbossws.war on build

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml	2007-04-20 20:34:59 UTC (rev 11171)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml	2007-04-20 20:35:31 UTC (rev 11172)
@@ -1,37 +1,45 @@
-<!-- 
+<!--
   JBoss, the OpenSource J2EE webOS
   Distributable under LGPL license.
   See terms of license at gnu.org. 
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-	<goal name="prj-install">
-		<ant:copy todir="${local.server.dir}" overwrite="true">
-	    		<ant:fileset dir="to-copy-install">
-				<exclude name="**/*.sample"/>
-			</ant:fileset>
-		</ant:copy>
-	</goal>
+    <goal name="prj-install">
+        <ant:copy todir="${local.server.dir}" overwrite="true">
+            <ant:fileset dir="to-copy-install">
+                <exclude name="**/*.sample"/>
+            </ant:fileset>
+        </ant:copy>
+    </goal>
 
-	<goal name="all">
-	</goal>
-	
-	<goal name="clean">
-	</goal>
+    <goal name="all">
+    </goal>
 
-	<goal name="build">
-	</goal>
-    
-	<goal name="deploy">
-		<ant:copy todir="${local.server.dir}" overwrite="true">
-	    		<ant:fileset dir="to-copy">
-				<exclude name="**/*.sample"/>
-			</ant:fileset>
-		</ant:copy>
-		<ant:delete file="${local.deploy.dir}/jboss-portal.sar/conf/data/default-object.xml" />
-		<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-samples.sar" />	
-	        <ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
-		
-		<ant:delete dir="${local.deploy.dir}/jboss-hibernate.deployer" />	
-		<ant:delete dir="${local.deploy.dir}/jboss-ws4ee.sar" />	
-	</goal>
+    <goal name="clean">
+    </goal>
+
+    <goal name="build">
+    </goal>
+
+    <goal name="deploy">
+        <ant:copy todir="${local.server.dir}" overwrite="true">
+            <ant:fileset dir="to-copy">
+                <exclude name="**/*.sample"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:delete file="${local.deploy.dir}/jboss-portal.sar/conf/data/default-object.xml" />
+        <ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-samples.sar" />
+        <ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
+
+        <ant:delete dir="${local.deploy.dir}/jboss-hibernate.deployer" />
+        <ant:delete dir="${local.deploy.dir}/jboss-ws4ee.sar" />
+
+        <ant:available file="${local.deploy.dir}/jbossws.sar" property="jbossws.file.present" type="file" />
+        <j:if test="${jbossws.file.present}">
+            <j:set var="jar.to.dir" value="${local.deploy.dir}/jbossws.sar" />
+            <attainGoal name="jar-to-dir" />
+        </j:if>
+        <ant:delete file="${local.deploy.dir}/jbossws.sar/jbossws-context.war" />
+    </goal>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/project.xml	2007-04-20 20:34:59 UTC (rev 11171)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/project.xml	2007-04-20 20:35:31 UTC (rev 11172)
@@ -8,6 +8,7 @@
     <pomVersion>3</pomVersion>
     <id>configuration</id>
     <name>Configuration</name>
+    <extend>../common.xml</extend>
     <currentVersion>1.0</currentVersion>
     <organization>
         <name>Adam Warski</name>