Author: wsmoak
Date: Sat Jun 10 11:05:23 2006
New Revision: 413339
URL: http://svn.apache.org/viewvc?rev=413339&view=rev
Log:
Use 'artifactId' in the configured 'url' system property, which makes the
plugin config generic.
Note that the 'itest' profile can go in the shale-apps parent pom once MNG-2221
is resolved.
(Inherited plugin configurations cause duplicate executions.)
Comment out the itest profile for the usecases until we have a reusable
TestSetup class available.
Modified:
struts/shale/branches/mvn_reorg/shale-apps/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml
Modified: struts/shale/branches/mvn_reorg/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/pom.xml?rev=413339&r1=413338&r2=413339&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/pom.xml Sat Jun 10 11:05:23 2006
@@ -30,8 +30,9 @@
<packaging>pom</packaging>
<name>Apache Shale Framework Sample Apps</name>
<url>http://struts.apache.org/struts-shale</url>
-<!--
- -->
+
+ <!-- TODO: Move the 'itest' profile and dependencies to this pom when
MNG-2221 is fixed. -->
+
<profiles>
<profile>
<activation>
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=413339&r1=413338&r2=413339&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Sat Jun 10
11:05:23 2006
@@ -142,7 +142,7 @@
<systemProperties>
<property>
<name>url</name>
-
<value>http://localhost:8080/shale-blank</value>
+
<value>http://localhost:8080/${artifactId}</value>
</property>
<!-- Define cargo.tomcat5x.home
~/.m2/settings.xml or with -D on the command line -->
<property>
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml?rev=413339&r1=413338&r2=413339&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml Sat Jun
10 11:05:23 2006
@@ -136,7 +136,7 @@
</build>
<profiles>
- <profile>
+ <!--profile>
<id>itest</id>
<build>
<plugins>
@@ -160,9 +160,8 @@
<systemProperties>
<property>
<name>url</name>
-
<value>http://localhost:8080/shale-usecases</value>
+
<value>http://localhost:8080/${artifactId}</value>
</property>
- <!-- Define cargo.tomcat5x.home
~/.m2/settings.xml or with -D on the command line -->
<property>
<name>cargo.tomcat5x.home</name>
<value>${cargo.tomcat5x.home}</value>
@@ -174,7 +173,7 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile-->
</profiles>
</project>
