You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2008/05/03 00:56:35 UTC

svn commit: r652941 - /portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml

Author: ate
Date: Fri May  2 15:56:35 2008
New Revision: 652941

URL: http://svn.apache.org/viewvc?rev=652941&view=rev
Log:
moving optional testsuite integration-test deployment within conditional profiles
so it doesn't pollute the src folder anymore when the required env parameter or system property isn't set

Modified:
    portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml?rev=652941&r1=652940&r2=652941&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml Fri May  2 15:56:35 2008
@@ -85,7 +85,6 @@
 	</dependency>
   </dependencies>
   
-  
   <!-- Build configuration -->
   <build>
     <finalName>pluto-testsuite</finalName>
@@ -127,35 +126,86 @@
       		<target>1.5</target>
       	</configuration>
       </plugin>
-       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>integration-test</phase>
-            <configuration>
-              <tasks>
-                <!--
-                  Use this to build and deploy the testsuite war.
-                  PORTLET_DEPLOY_DIR is an environmental variable 
-                  pointing to the hot-deploy directory of your portal.
-                  You can also use -Ddeploy.dir=<path to deployment dir>
-                  on the command line when invoking maven:
-                  mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
-                -->
-					<property environment="env"/>
-					<property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
-					<copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
-=              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   
+  <profiles>
+    <profile>
+      <id>deploy-testsuite</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property><name>deploy.dir</name></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>integration-test</phase>
+                <configuration>
+                  <tasks>
+                    <!--
+                      Use this to build and deploy the testsuite war.
+                      PORTLET_DEPLOY_DIR is an environmental variable 
+                      pointing to the hot-deploy directory of your portal.
+                      You can also use -Ddeploy.dir=<path to deployment dir>
+                      on the command line when invoking maven:
+                      mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
+                    -->
+                    <property environment="env"/>
+                    <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
+                    <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>deploy-testsuite-by-env</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property><name>env.PORTLET_DEPLOY_DIR</name></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>integration-test</phase>
+                <configuration>
+                  <tasks>
+                    <!--
+                      Use this to build and deploy the testsuite war.
+                      PORTLET_DEPLOY_DIR is an environmental variable 
+                      pointing to the hot-deploy directory of your portal.
+                      You can also use -Ddeploy.dir=<path to deployment dir>
+                      on the command line when invoking maven:
+                      mvn -Ddeploy.dir=/pluto-1.1.4/webapps integration-test
+                    -->
+                    <property environment="env"/>
+                    <property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}"/>
+                    <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war"/>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
 </project>