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 cd...@apache.org on 2006/12/15 13:54:22 UTC
svn commit: r487539 - /portals/pluto/trunk/dist-build.xml
Author: cdoremus
Date: Fri Dec 15 04:54:21 2006
New Revision: 487539
URL: http://svn.apache.org/viewvc?view=rev&rev=487539
Log:
Added Sun Java System Application Server name to Glassfish record. Removed SunOne record.
Modified:
portals/pluto/trunk/dist-build.xml
Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?view=diff&rev=487539&r1=487538&r2=487539
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Fri Dec 15 04:54:21 2006
@@ -20,12 +20,12 @@
ant -Dpluto.version=<version> -f dist-build.xml
The binary distribution is done in the following way:
- 1. Downloads Tomcat from Apache and unzips it into a working directory. To this distribution, the
+ 1. prepare-bin-dist: Downloads Tomcat from Apache and unzips it into a working directory. To this distribution, the
build:
a. Adds emptySessionPath="true" to server.xml.
b. Adds a pluto user with pluto role to tomcat-users.xml.
c. Adds a pluto role to the tomcat user in tomcat-users.xml.
- 2. Runs 'mvn install' and 'mvn pluto:install' to create the Pluto driver and testsuite
+ 2. run-maven: Runs 'mvn install' and 'mvn pluto:install' to create the Pluto driver and testsuite
and installs them into the Tomcat dist in the working directory.
3. Bundles up the altered Tomcat dist with Pluto into a zip, gzip and bzip2 file.
@@ -40,7 +40,8 @@
<property name="tomcat.version" value="5.5.17" description="Version of Tomcat to deploy Pluto"/>
<property name="dist.basedir" value="target/dist" description="Base working directory"/>
- <property name="base.name" value="apache-tomcat-${tomcat.version}"/>
+ <property name="base.tomcat.project" value="apache" description="Base project name for tomcat"/>
+ <property name="base.name" value="${base.tomcat.project}-tomcat-${tomcat.version}"/>
<property name="dist.dir" value="${dist.basedir}/${base.name}"/>
<property name="pluto.name" value="pluto-${pluto.version}"/>
<property name="pluto.dir" value="${dist.basedir}/${pluto.name}"/>
@@ -105,7 +106,7 @@
<mkdir dir="${dist.basedir}"/>
</target>
- <target name="bin-dist" depends="prepare-bin-dist,run-maven" description="Creates zip, gzip, and bzip2 distributions">
+ <target name="bin-dist" depends="prepare-bin-dist,run-maven,move-ant-task" description="Creates zip, gzip, and bzip2 distributions">
<!-- Copy over jars needed to deploy custom portlets -->
<copy file="pluto-util/target/pluto-util-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>
<copy file="pluto-descriptor-api/target/pluto-descriptor-api-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>
@@ -169,17 +170,17 @@
summary="true"
/>
- <!-- Put tomcat user in 'pluto' role in tomcat-users.xml -->
+ <!-- Put tomcat user in 'pluto' and 'manager' roles in tomcat-users.xml -->
<replace file="${dist.dir}/conf/tomcat-users.xml"
token="roles="tomcat""
- value="roles="tomcat,pluto""
+ value="roles="tomcat,pluto,manager""
summary="true"
/>
- <!-- Add 'pluto' user to tomcat-users.xml -->
+ <!-- Add 'pluto' user to tomcat-users.xml and put user in pluto and manager roles -->
<replace file="${dist.dir}/conf/tomcat-users.xml"
token="</tomcat-users>"
- value="<user name="pluto" password="pluto" roles="pluto" />${line.separator}</tomcat-users>"
+ value="<user name="pluto" password="pluto" roles="pluto,manager" />${line.separator}</tomcat-users>"
summary="true"
/>
</target>
@@ -192,7 +193,11 @@
<arg line="pluto:install -DinstallDir=${user.dir}/${dist.dir}"/>
</exec>
</target>
-
+
+ <target name="move-ant-task" description="Moves Ant task jar into the distribution">
+ <copy file="${user.dir}/pluto-ant-tasks/target/pluto-ant-tasks-${pluto.version}.jar" todir="${dist.dir}"/>
+ </target>
+
<target name="clean" depends="check-pluto-version">
<delete dir="${dist.dir}"/>
<delete file="${unzip.file}"/>
Re: svn commit: r487539 - /portals/pluto/trunk/dist-build.xml
Posted by CD...@hannaford.com.
Sorry, but I associated the wrong comment with this commit.
This commit adds the Ant task jar to the root directory of the binary
build in support of PLUTO-279. I also added the manager role to the tomcat
and pluto users.
/Craig
cdoremus@apache.org
12/15/2006 07:54 AM
To
pluto-scm@portals.apache.org
cc
Subject
svn commit: r487539 - /portals/pluto/trunk/dist-build.xml
Author: cdoremus
Date: Fri Dec 15 04:54:21 2006
New Revision: 487539
URL: http://svn.apache.org/viewvc?view=rev&rev=487539
Log:
Added Sun Java System Application Server name to Glassfish record. Removed
SunOne record.
Modified:
portals/pluto/trunk/dist-build.xml
Modified: portals/pluto/trunk/dist-build.xml
URL:
http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?view=diff&rev=487539&r1=487538&r2=487539
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Fri Dec 15 04:54:21 2006
@@ -20,12 +20,12 @@
ant -Dpluto.version=<version> -f
dist-build.xml
The binary distribution is done in the following way:
- 1. Downloads Tomcat from Apache and unzips it into a
working directory. To this distribution, the
+ 1. prepare-bin-dist: Downloads Tomcat from Apache and
unzips it into a working directory. To this distribution, the
build:
a. Adds emptySessionPath="true" to
server.xml.
b. Adds a pluto user with pluto role to
tomcat-users.xml.
c. Adds a pluto role to the tomcat user
in tomcat-users.xml.
- 2. Runs 'mvn install' and 'mvn pluto:install' to create
the Pluto driver and testsuite
+ 2. run-maven: Runs 'mvn install' and 'mvn pluto:install'
to create the Pluto driver and testsuite
and installs them into the Tomcat dist in
the working directory.
3. Bundles up the altered Tomcat dist with Pluto into a
zip, gzip and bzip2 file.
@@ -40,7 +40,8 @@
<property name="tomcat.version" value="5.5.17"
description="Version of Tomcat to deploy Pluto"/>
<property name="dist.basedir" value="target/dist"
description="Base working directory"/>
- <property name="base.name"
value="apache-tomcat-${tomcat.version}"/>
+ <property name="base.tomcat.project" value="apache"
description="Base project name for tomcat"/>
+ <property name="base.name"
value="${base.tomcat.project}-tomcat-${tomcat.version}"/>
<property name="dist.dir"
value="${dist.basedir}/${base.name}"/>
<property name="pluto.name"
value="pluto-${pluto.version}"/>
<property name="pluto.dir"
value="${dist.basedir}/${pluto.name}"/>
@@ -105,7 +106,7 @@
<mkdir dir="${dist.basedir}"/>
</target>
- <target name="bin-dist"
depends="prepare-bin-dist,run-maven" description="Creates zip, gzip, and
bzip2 distributions">
+ <target name="bin-dist"
depends="prepare-bin-dist,run-maven,move-ant-task" description="Creates
zip, gzip, and bzip2 distributions">
<!-- Copy over jars needed to deploy
custom portlets -->
<copy
file="pluto-util/target/pluto-util-${pluto.version}.jar"
todir="${dist.dir}/PlutoDomain"/>
<copy
file="pluto-descriptor-api/target/pluto-descriptor-api-${pluto.version}.jar"
todir="${dist.dir}/PlutoDomain"/>
@@ -169,17 +170,17 @@
summary="true"
/>
- <!-- Put tomcat user in 'pluto' role in
tomcat-users.xml -->
+ <!-- Put tomcat user in 'pluto' and
'manager' roles in tomcat-users.xml -->
<replace
file="${dist.dir}/conf/tomcat-users.xml"
token="roles="tomcat""
- value="roles="tomcat,pluto""
+ value="roles="tomcat,pluto,manager""
summary="true"
/>
- <!-- Add 'pluto' user to tomcat-users.xml
-->
+ <!-- Add 'pluto' user to tomcat-users.xml
and put user in pluto and manager roles -->
<replace
file="${dist.dir}/conf/tomcat-users.xml"
token="</tomcat-users>"
- value="<user
name="pluto" password="pluto" roles="pluto"
/>${line.separator}</tomcat-users>"
+ value="<user
name="pluto" password="pluto"
roles="pluto,manager"
/>${line.separator}</tomcat-users>"
summary="true"
/>
</target>
@@ -192,7 +193,11 @@
<arg line="pluto:install
-DinstallDir=${user.dir}/${dist.dir}"/>
</exec>
</target>
-
+
+ <target name="move-ant-task" description="Moves Ant task
jar into the distribution">
+ <copy
file="${user.dir}/pluto-ant-tasks/target/pluto-ant-tasks-${pluto.version}.jar"
todir="${dist.dir}"/>
+ </target>
+
<target name="clean" depends="check-pluto-version">
<delete dir="${dist.dir}"/>
<delete file="${unzip.file}"/>