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 dd...@apache.org on 2007/02/06 04:23:07 UTC
svn commit: r503968 - in /portals/pluto/trunk/assembly: pom.xml
src/main/assembly/bundle-ant.xml
Author: ddewolf
Date: Mon Feb 5 19:23:06 2007
New Revision: 503968
URL: http://svn.apache.org/viewvc?view=rev&rev=503968
Log:
Making maven install pluto into downloaded tomcat; Closer, but still has error
Modified:
portals/pluto/trunk/assembly/pom.xml
portals/pluto/trunk/assembly/src/main/assembly/bundle-ant.xml
Modified: portals/pluto/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/pom.xml?view=diff&rev=503968&r1=503967&r2=503968
==============================================================================
--- portals/pluto/trunk/assembly/pom.xml (original)
+++ portals/pluto/trunk/assembly/pom.xml Mon Feb 5 19:23:06 2007
@@ -40,7 +40,7 @@
<goals>
<goal>run</goal>
</goals>
- <phase>package</phase>
+ <phase>compile</phase>
</execution>
</executions>
<configuration>
@@ -62,6 +62,23 @@
<version>2.7.4</version>
</dependency>
</dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <installDir>${project.build.directory}/pluto-tomcat</installDir>
+ <installationDirectory>${project.build.directory}/pluto-tomcat</installationDirectory>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: portals/pluto/trunk/assembly/src/main/assembly/bundle-ant.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/src/main/assembly/bundle-ant.xml?view=diff&rev=503968&r1=503967&r2=503968
==============================================================================
--- portals/pluto/trunk/assembly/src/main/assembly/bundle-ant.xml (original)
+++ portals/pluto/trunk/assembly/src/main/assembly/bundle-ant.xml Mon Feb 5 19:23:06 2007
@@ -1,9 +1,9 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
@@ -64,9 +64,9 @@
value="${project.build.directory}/pluto-tomcat"/>
- <target name="package" depends="download-tomcat" description="Package pluto into a tomcat distribution">
-
- </target>
+ <target name="package"
+ depends="download-tomcat,update-tomcat-config"
+ description="Package pluto into a tomcat distribution"/>
<target name="download-tomcat"
@@ -96,8 +96,7 @@
</target>
<target name="update-tomcat-config">
- <!-- Copy over README -->
- <copy file="README" todir="${package.dir}"/>
+ <copy file="${basedir}/../README" todir="${package.dir}"/>
<!-- Add emptySessionPath="true" to Connector element in server.xml -->
<replace file="${package.dir}/conf/server.xml"
@@ -134,7 +133,7 @@
<arg line="install"/>
</exec>
<exec executable="mvn" vmlauncher="false" dir="${basedir}">
- <arg line="pluto:install -DinstallDir=${user.dir}/${package.dir}"/>
+ <arg line="pluto:install -DinstallDir=${package.dir}"/>
</exec>
</target>