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 cz...@apache.org on 2009/05/18 08:38:30 UTC
svn commit: r775830 - in /portals/pluto/trunk: pluto-portal/pom.xml
pluto-portal/src/assemble/ pluto-testsuite/pom.xml
pluto-testsuite/src/assemble/
Author: cziegeler
Date: Mon May 18 06:38:29 2009
New Revision: 775830
URL: http://svn.apache.org/viewvc?rev=775830&view=rev
Log:
Remove obsolete assemblies and further clean up of poms
Removed:
portals/pluto/trunk/pluto-portal/src/assemble/
portals/pluto/trunk/pluto-testsuite/src/assemble/
Modified:
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=775830&r1=775829&r2=775830&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon May 18 06:38:29 2009
@@ -124,67 +124,19 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1-beta-1</version>
<configuration>
- <webResources>
- <resource>
- <filtering>true</filtering>
- <directory>${pom.basedir}/src/main/resources</directory>
- <includes>
- <include>pluto-portal-driver-config.xml</include>
- </includes>
- <targetPath>WEB-INF</targetPath>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <tasks>
- <get src="http://archive.apache.org/dist/tomcat/tomcat-5/archive/v5.5.9/bin/jakarta-tomcat-5.5.9.tar.gz" dest="target/tomcat.tar.gz" />
- <gunzip src="target/tomcat.tar.gz" />
- <untar src="target/tomcat.tar" />
- </tasks>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
- <!-- TODO fix skip -->
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <descriptor>src/assemble/bin.xml</descriptor>
- <finalName>pluto-portal-${pom.version}</finalName>
- </configuration>
- <executions>
- <execution>
- <id>make-project-assembly-source-release</id>
- <inherited>false</inherited>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <webResources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <includes>
+ <include>pluto-portal-driver-config.xml</include>
+ </includes>
+ <targetPath>WEB-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
-
</build>
<!-- Don't create distribution artifacts -->
@@ -205,5 +157,3 @@
</profile>
</profiles>
</project>
-
-
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775830&r1=775829&r2=775830&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 06:38:29 2009
@@ -75,131 +75,103 @@
</dependency>
</dependencies>
- <!-- Build configuration -->
- <build>
- <finalName>pluto-testsuite</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
- <!-- TODO fix skip -->
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- configure maven-war-plugin to use updated web.xml -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- </configuration>
- </plugin>
- <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
- <plugin>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</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>
+ <!-- Build configuration -->
+ <build>
+ <finalName>pluto-testsuite</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>integration-test</phase>
+ <!-- configure maven-war-plugin to use updated web.xml -->
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
<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>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </plugin>
</plugins>
- </build>
- </profile>
+ </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>
+
<!-- Don't create distribution artifacts -->
<profile>
<id>apache-release</id>
@@ -215,8 +187,5 @@
</plugins>
</build>
</profile>
- </profiles>
-
+ </profiles>
</project>
-
-