4:13 p.m.
Author: chris.laprun(a)jboss.com
Date: 2008-02-14 17:13:56 -0500 (Thu, 14 Feb 2008)
New Revision: 9975
Added:
modules/portlet/trunk/build/distrib/JBossPC-README.txt
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Now create bundled distributions. Requires either (or both) TOMCAT_6_HOME or
JBOSS_4_2_HOME to be set.
Copied: modules/portlet/trunk/build/distrib/JBossPC-README.txt (from rev 9970,
modules/portlet/trunk/build/distrib/README.txt)
===================================================================
--- modules/portlet/trunk/build/distrib/JBossPC-README.txt (rev
0)
+++ modules/portlet/trunk/build/distrib/JBossPC-README.txt 2008-02-14 22:13:56 UTC (rev
9975)
@@ -0,0 +1,15 @@
+
+JBoss Portlet Container
+LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product
usage)
+
+JBoss Portlet Container is the next generation portlet container on which future versions
of JBoss
+Portal will be based. It provides a standard-compliant implementation of the JSR-286
Portlet 2.0
+specification. It has been developed with reusability in mind so that advanced users, who
don't require
+a full-fledged portal, can leverage the portlet management services it provides in their
own applications.
+JBoss Portlet Container is available through the business-friendly LGPL open source
license.
+
+This distribution also contains a simple portal built on top of JBoss Portlet Container.
This simple
+portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x.
+
+INSTALLATION AND RUNNING:
+For installation, please refer to the user guide available in the 'jbosspc-docs'
directory
\ No newline at end of file
Property changes on: modules/portlet/trunk/build/distrib/JBossPC-README.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-02-14 19:59:47 UTC (rev 9974)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-02-14 22:13:56 UTC (rev 9975)
@@ -1,29 +1,30 @@
<project default="all" name="JBoss Portlet Container">
<property name="source.dir" value="../.."/>
- <property name="docs.dir" value="${source.dir}/docs"/>
- <property name="release.version" value="2.0.B1"/>
+ <property name="src.docs.dir" value="${source.dir}/docs"/>
+ <property name="pc.release.version" value="2.0.0.B1"/>
+ <property name="demo.release.version" value="1.0.0.B1"/>
<!-- -->
- <property name="pc.release.name"
value="jboss-pc-${release.version}"/>
+ <property name="pc.release.name"
value="jboss-portletcontainer-${pc.release.version}"/>
+ <property name="demo.release.name"
value="jboss-simple-portal-${demo.release.version}"/>
<property name="pc.release.name.src"
value="${pc.release.name}-src"/>
- <property name="pc.release.name.as42"
value="${pc.release.name}-jbossas42"/>
- <property name="pc.release.name.tomcat6"
value="${pc.release.name}-tomcat6"/>
+ <property name="demo.release.name.as42"
value="${demo.release.name}-jbossas42"/>
+ <property name="demo.release.name.tomcat6"
value="${demo.release.name}-tomcat6"/>
<!-- -->
<property name="pc.build.src"
value="output/${pc.release.name.src}"/>
- <property name="pc.build.bin.as42"
value="output/${pc.release.name.as42}"/>
- <property name="pc.build.bin.tomcat6"
value="output/${pc.release.name.tomcat6}"/>
+ <property name="pc.build.bin.as42"
value="output/${demo.release.name.as42}"/>
+ <property name="pc.build.bin.tomcat6"
value="output/${demo.release.name.tomcat6}"/>
- <property environment="env"/>
-
<!-- Clean -->
<target name="clean">
<delete dir="output"/>
</target>
<!-- Build and compress everything -->
- <target name="all" depends="licenses,build,package,zip"
description="do everything - build source, doc, distro"/>
+ <target name="all"
depends="__check-env,licenses,build,package,zip"
+ description="do everything - build source, doc, distro"/>
<!-- Licenses -->
<target name="licenses" unless="no-doc">
@@ -38,11 +39,11 @@
<include name="public-domain.txt"/>
<include name="sun-jaf.txt"/>
</fileset>-->
- <mkdir dir="output/docs/licenses"/>
+ <mkdir dir="output/jbosspc-docs/licenses"/>
<!--<concat
destfile="output/docs/licenses/thirdparty-licenses.txt">
<fileset refid="thirdparty-licenses"/>
</concat>-->
- <copy todir="output/docs/licenses">
+ <copy todir="output/jbosspc-docs/licenses">
<!--<fileset refid="thirdparty-licenses"/>-->
<fileset dir="../licences" includes="JBossEULA.txt"/>
</copy>
@@ -54,7 +55,7 @@
<!-- Build JBoss Portlet Container documentation -->
<target name="doc.build" unless="no-doc">
<sequential>
- <ant dir="${docs.dir}/user-guide"
antfile="build.xml"/>
+ <ant dir="${src.docs.dir}/user-guide"
antfile="build.xml"/>
</sequential>
</target>
@@ -85,25 +86,42 @@
<!--
| JBoss Portlet Container binary distribution for AS 4.2.x
-->
- <target name="package-as42" description="package AS
binary">
+ <target name="package-as42" description="package AS binary"
if="JBOSS_4_2_HOME">
+ <copy todir="${pc.build.bin.as42}">
+ <fileset dir="${JBOSS_4_2_HOME}" includes="**/*"/>
+ </copy>
<antcall target="__package-binary">
<param name="bin.dir" value="${pc.build.bin.as42}"/>
+ <param name="deploy.dir"
value="${pc.build.bin.as42}/server/default/deploy"/>
</antcall>
- <copy todir="${pc.build.bin.as42}/simple-portal">
+ <!--<copy todir="${pc.build.bin.as42}/simple-portal">
<fileset dir="${source.dir}/test/target/portal/as42/simple-portal"
includes="**/*"/>
+ </copy>-->
+ <copy
todir="${pc.build.bin.as42}/server/default/deploy/simple-portal">
+ <fileset dir="${source.dir}/test/target/portal/as42/simple-portal"
includes="**/*"/>
</copy>
</target>
<!--
| JBoss Portlet Container binary distribution for Tomcat 6.x
-->
- <target name="package-tomcat6" description="package Tomcat
binary">
+ <target name="package-tomcat6" description="package Tomcat
binary" if="TOMCAT_6_HOME">
+ <copy todir="${pc.build.bin.tomcat6}">
+ <fileset dir="${TOMCAT_6_HOME}" includes="**/*"/>
+ </copy>
<antcall target="__package-binary">
<param name="bin.dir"
value="${pc.build.bin.tomcat6}"/>
+ <param name="deploy.dir"
value="${pc.build.bin.as42}/webapps"/>
</antcall>
- <copy todir="${pc.build.bin.tomcat6}/simple-portal">
+ <!--<copy todir="${pc.build.bin.tomcat6}/simple-portal">
<fileset dir="${source.dir}/test/target/portal/tomcat"
includes="**/*"/>
+ </copy>-->
+ <copy todir="${pc.build.bin.tomcat6}/lib">
+ <fileset
dir="${source.dir}/test/target/portal/tomcat/copy-to-tomcat-lib"
includes="**/*.jar"/>
</copy>
+ <copy todir="${pc.build.bin.tomcat6}/webapps">
+ <fileset dir="${source.dir}/test/target/portal/tomcat/"
includes="**/*.war"/>
+ </copy>
</target>
<!-- Compress packages -->
@@ -112,10 +130,10 @@
<param name="release.name"
value="${pc.release.name.src}"/>
</antcall>
<antcall target="__zip">
- <param name="release.name"
value="${pc.release.name.as42}"/>
+ <param name="release.name"
value="${demo.release.name.as42}"/>
</antcall>
<antcall target="__zip">
- <param name="release.name"
value="${pc.release.name.tomcat6}"/>
+ <param name="release.name"
value="${demo.release.name.tomcat6}"/>
</antcall>
</target>
@@ -126,6 +144,12 @@
<antcall target="__package-distrib">
<param name="todir" value="${bin.dir}"/>
</antcall>
+ <antcall target="__package-bundled-binary">
+ <param name="deploy.dir" value="${deploy.dir}"/>
+ </antcall>
+ </target>
+
+ <target name="__package-standalone-binary" if="bin-alone">
<mkdir dir="${bin.dir}/lib"/>
<copy todir="${bin.dir}/lib" flatten="true">
<fileset dir="${source.dir}" includes="**/target/*.jar"
excludes="**/*sources.jar"/>
@@ -135,10 +159,17 @@
</copy>
</target>
+ <target name="__package-bundled-binary" unless="bin-alone">
+ <copy todir="${deploy.dir}" flatten="true">
+ <fileset dir="${source.dir}/test/target/portal/samples"
includes="*.war"/>
+ </copy>
+ </target>
+
<target name="__package-distrib">
<mkdir dir="${todir}"/>
+ <copy file="JBossPC-README.txt" todir="${todir}"/>
<antcall target="__package-doc">
- <param name="todir" value="${todir}/docs"/>
+ <param name="todir" value="${todir}/jbosspc-docs"/>
</antcall>
</target>
@@ -147,9 +178,8 @@
<mkdir dir="${todir}"/>
<mkdir dir="${todir}/user-guide"/>
<copy todir="${todir}/user-guide">
- <fileset dir="${docs.dir}/user-guide/build/en/"/>
+ <fileset dir="${src.docs.dir}/user-guide/build/en/"/>
</copy>
- <copy file="README.txt" todir="${todir}"/>
<!--<copy todir="${todir}/docs/licenses">
<fileset dir="output/docs/licenses"/>
</copy>-->
@@ -162,4 +192,30 @@
</tar>
<checksum file="output/${release.name}.tar.gz"/>
</target>
+
+ <target name="__check-env">
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_HOME"
value="${env.JBOSS_4_2_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="TOMCAT_6_HOME"
value="${env.TOMCAT_6_HOME}">
+ <and>
+ <isset property="env.TOMCAT_6_HOME"/>
+ <not>
+ <isset property="TOMCAT_6_HOME"/>
+ </not>
+ </and>
+ </condition>
+
+ <echo message="Set JBOSS_4_2_HOME and/or TOMCAT_6_HOME variables for binary
distributions:"/>
+ <echo message="JBoss AS 4.2.x home: ${JBOSS_4_2_HOME}"/>
+ <echo message="Tomcat 6.x home: ${TOMCAT_6_HOME}"/>
+ </target>
</project>