[portal-commits] JBoss Portal SVN: r6111 - in trunk: core-cms and 3 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Mon Jan 29 10:24:19 EST 2007
Author: julien at jboss.com
Date: 2007-01-29 10:24:19 -0500 (Mon, 29 Jan 2007)
New Revision: 6111
Modified:
trunk/build/distrib.xml
trunk/core-cms/build.xml
trunk/core-management/build.xml
trunk/core-samples/build.xml
trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
updated distrib.xml to package all the core-* modules, updated version to alpha 2
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-01-29 01:07:43 UTC (rev 6110)
+++ trunk/build/distrib.xml 2007-01-29 15:24:19 UTC (rev 6111)
@@ -1,7 +1,7 @@
<project default="main" name="JBoss Portal">
<property name="source.dir" value="../../jboss-portal-2.6"/>
- <property name="release.version" value="2.6-ALPHA1"/>
+ <property name="release.version" value="2.6-ALPHA2"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
@@ -56,18 +56,22 @@
<!-- Build JBoss Portal artifacts -->
<target name="source.build">
+
+ <!-- Normal build -->
<ant dir="${source.dir}/build" antfile="build.xml"/>
+
+ <!-- HA specific targets -->
<ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/>
- <ant dir="${source.dir}/core" antfile="build.xml" target="datasource">
+ <ant dir="${source.dir}/core-cms" antfile="build.xml" target="output-ha"/>
+
+ <!-- Datasource files -->
+ <ant dir="${source.dir}/core" antfile="build.xml" target="datasource">
<!-- Hack because invoking the datasource generation from another build file replace ${/} -->
<property name="/" value="${/}"/>
</ant>
+
<ant dir="${source.dir}/wsrp" antfile="build.xml" target="output"/>
<ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/>
- <!--
- <ant dir="${source.dir}/forums" antfile="build.xml"/>
- <ant dir="${source.dir}/forums" antfile="build.xml" target="explode"/>
- -->
</target>
<!-- Build JBoss Portal documentation -->
@@ -168,6 +172,11 @@
<copy todir="${portal.build.normal.bin}/jboss-portal.sar">
<fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
</copy>
+ <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
+ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/>
+ <fileset dir="${source.dir}/core-cms/output/resources" includes="portal-cms.sar/**"/>
+ <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
+ </copy>
<mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/>
<copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar">
<fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
@@ -176,23 +185,27 @@
<!--
| JBoss Portal ha binaries distribution
-->
-
<mkdir dir="${portal.build.ha.bin}"/>
<package-bin todir="${portal.build.ha.bin}"/>
<copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
<fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/>
</copy>
- <mkdir dir="${portal.build.normal.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>
- <copy todir="${portal.build.normal.bin}/jboss-portal-ha.sar/portal-wsrp.sar">
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
+ <fileset dir="${source.dir}/core-cms/output/resources" includes="portal-cms-ha.sar/**"/>
+ </copy>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
+ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/>
+ <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
+ </copy>
+ <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar">
<fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
</copy>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README"
- todir="${portal.build.ha.bin}"/>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/>
<!--
| JBoss Portal bundled distribution
-->
-
<mkdir dir="${portal.build.normal.bundled}"/>
<package-bundled todir="${portal.build.normal.bundled}"/>
<copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar">
@@ -229,57 +242,8 @@
<include name="server/all/**"/>
</fileset>
</copy>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README"
- todir="${portal.build.ha.bundled}"/>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/>
-
-
- <!--
- | JBoss Forums Portlet source distribution
- -->
-
- <!-- Source files -->
- <!--
- <mkdir dir="${forums.build.src}"/>
- <copy todir="${forums.build.src}">
- <fileset dir="${source.dir}" includes="forums/**" excludes="*/output/**,**/CVS/*,**/build.log"/>
- </copy>
- <fixcrlf srcdir="${forums.build.src}" includes="**/*.sh" eol="lf" eof="remove"/>
- <fixcrlf srcdir="${forums.build.src}" includes="**/*.bat" eol="crlf"/>
- -->
-
- <!-- Documentation -->
-<!--
- <mkdir dir="${forums.build.src}/docs"/>
- <mkdir dir="${forums.build.src}/docs/referenceGuide"/>
- <copy todir="${forums.build.src}/docs/referenceGuide">
- <fileset dir="${source.dir}-docs/referenceGuide/build/en/"/>
- </copy>
- <mkdir dir="${forums.build.src}/docs/userGuide"/>
- <copy todir="${forums.build.src}/docs/userGuide">
- <fileset dir="${source.dir}-docs/userGuide/build/en/"/>
- </copy>
- <copy file="${source.dir}-docs/readmeFiles/jboss-forums-src.README" todir="${forums.build.src}"/>
--->
-
- <!--
- | JBoss Forums Portlet binaries distribution
- -->
-
- <!-- Documentation -->
-<!--
- <mkdir dir="${forums.build.bin}"/>
- <mkdir dir="${forums.build.bin}/docs"/>
- <mkdir dir="${forums.build.bin}/docs/referenceGuide"/>
- <copy todir="${forums.build.bin}/docs/referenceGuide">
- <fileset dir="${source.dir}-docs/referenceGuide/build/en/"/>
- </copy>
- <mkdir dir="${forums.build.bin}/docs/userGuide"/>
- <copy todir="${forums.build.bin}/docs/userGuide">
- <fileset dir="${source.dir}-docs/userGuide/build/en/"/>
- </copy>
--->
-
</target>
<!-- Create packages -->
Modified: trunk/core-cms/build.xml
===================================================================
--- trunk/core-cms/build.xml 2007-01-29 01:07:43 UTC (rev 6110)
+++ trunk/core-cms/build.xml 2007-01-29 15:24:19 UTC (rev 6111)
@@ -270,7 +270,7 @@
</target>
- <!-- Build the jboss-portal-ha.sar -->
+ <!-- Build the portal-cms-ha.sar -->
<target name="output-ha" depends="artifacts">
<copy todir="${build.resources}/portal-cms-ha.sar">
<fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/>
@@ -289,7 +289,7 @@
</target>
- <!-- Build the jboss-portal.sar -->
+ <!-- Build the portal-cms.sar -->
<target name="output" depends="artifacts">
<!-- Build configurations -->
Modified: trunk/core-management/build.xml
===================================================================
--- trunk/core-management/build.xml 2007-01-29 01:07:43 UTC (rev 6110)
+++ trunk/core-management/build.xml 2007-01-29 15:24:19 UTC (rev 6111)
@@ -212,25 +212,7 @@
</target>
- <!-- Build the jboss-portal-ha.sar -->
- <target name="output-ha" depends="artifacts">
- <copy todir="${build.resources}/portal-management-ha.sar">
- <fileset dir="${build.resources}/portal-management" excludes="**/*.xml"/>
- </copy>
-
- <copy todir="${build.resources}/portal-management-ha.sar">
- <filterset>
- <filtersfile file="../build/etc/clustered.properties"/>
- </filterset>
- <fileset dir="${build.resources}/portal-management" includes="**/*.xml"/>
- </copy>
-
- <implode
- dir="${build.resources}/portal-management-ha.sar"
- tofile="${build.lib}/portal-management-ha.sar"/>
- </target>
-
- <!-- Build the jboss-portal.sar -->
+ <!-- Build the portal-management.sar -->
<target name="output" depends="artifacts">
<!-- Build configurations -->
<copy todir="${build.resources}/portal-management.sar">
@@ -295,13 +277,6 @@
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy file="${build.lib}/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
</target>
-
- <target name="deploy-ha"
- description="Deploy high availability."
- depends="output-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/portal-management-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- </target>
<!--
| Undeploy the application
@@ -313,13 +288,6 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-management.sar"/>
</target>
- <target name="undeploy-ha"
- description="Undeploy."
- depends="init">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-management-ha.sar"/>
- </target>
-
<target name="tests" depends="init, _buildmagic:configure:deployment">
</target>
</project>
Modified: trunk/core-samples/build.xml
===================================================================
--- trunk/core-samples/build.xml 2007-01-29 01:07:43 UTC (rev 6110)
+++ trunk/core-samples/build.xml 2007-01-29 15:24:19 UTC (rev 6111)
@@ -215,23 +215,7 @@
</copy>
</target>
- <!-- Build the jboss-portal-ha.sar -->
- <target name="output-ha" depends="artifacts">
- <copy todir="${build.resources}/portal-samples-ha.sar">
- <fileset dir="${build.resources}/portal-samples" excludes="**/*.xml"/>
- </copy>
- <copy todir="${build.resources}/portal-samples-ha.sar">
- <filterset>
- <filtersfile file="../build/etc/clustered.properties"/>
- </filterset>
- <fileset dir="${build.resources}/portal-samples" includes="**/*.xml"/>
- </copy>
- <implode
- dir="${build.resources}/portal-samples-ha.sar"
- tofile="${build.lib}/portal-samples-ha.sar"/>
- </target>
-
- <!-- Build the jboss-portal.sar -->
+ <!-- Build the portal-samples.sar -->
<target name="output" depends="artifacts">
<copy todir="${build.resources}/portal-samples.sar">
<fileset dir="${build.resources}/portal-samples" excludes="**/*.xml"/>
@@ -294,13 +278,6 @@
<copy file="${build.lib}/portal-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
</target>
- <target name="deploy-ha"
- description="Deploy high availability."
- depends="output-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/portal-samples-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- </target>
-
<!--
| Undeploy the application
-->
@@ -311,13 +288,6 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-samples.sar"/>
</target>
- <target name="undeploy-ha"
- description="Undeploy."
- depends="init">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-samples-ha.sar"/>
- </target>
-
<target name="tests" depends="init, _buildmagic:configure:deployment">
</target>
</project>
Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-01-29 01:07:43 UTC (rev 6110)
+++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-01-29 15:24:19 UTC (rev 6111)
@@ -35,7 +35,7 @@
public class PortalConstants
{
/** Current version. */
- public static Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.ALPHA, "1"), "Ninja");
+ public static Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.ALPHA, "2"), "Ninja");
/** The default portal name. */
public static String DEFAULT_PORTAL_NAME = "default";
More information about the portal-commits
mailing list