6:20 a.m.
Author: chris.laprun(a)jboss.com
Date: 2009-05-07 07:20:47 -0400 (Thu, 07 May 2009)
New Revision: 13315
Removed:
branches/JBoss_Portal_Branch_2_7/core-management/
Modified:
branches/JBoss_Portal_Branch_2_7/build/build.xml
branches/JBoss_Portal_Branch_2_7/build/distrib.xml
Log:
- Removed now obsolete core-management that has been migrated to the jopr-plugin module
(though it might migrate to its own package).
Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build.xml 2009-05-07 09:27:45 UTC (rev 13314)
+++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2009-05-07 11:20:47 UTC (rev 13315)
@@ -1,4 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM
"../tools/etc/buildfragments/buildmagic.ent">
@@ -117,10 +140,9 @@
<module name="api"/>
<module name="server"/>
<module name="portlet-server"/>
- <module name="theme"/>
+ <module name="theme"/>
<module name="core"/>
<module name="core-cms"/>
- <module name="core-management"/>
<module name="core-identity"/>
<module name="core-admin"/>
<module name="core-wsrp"/>
@@ -130,14 +152,12 @@
<module name="registration"/>
<module name="workflow"/>
<module name="widget"/>
- <!--<module name="core-admin"/>-->
-
<!-- Module groups -->
<group name="portal">
<include
- modules="api, jems, server, security, search, portlet-server, faces,
theme, workflow, registration, core, wsrp, core-admin, core-management, core-identity,
core-cms, core-samples, widget"/>
+ modules="api, jems, server, security, search, portlet-server, faces,
theme, workflow, registration, core, wsrp, core-admin, core-identity, core-cms,
core-samples, widget"/>
</group>
<group name="security">
@@ -240,7 +260,7 @@
<!-- Add module specific elements here. -->
</target>
-
+
<target name="main" depends="most"
description="Executes the default target (most)."/>
<!--
@@ -249,10 +269,10 @@
-->
<target name="most" depends="createthirdparty, modules-most"
description="Executes all modules and builds most everything."/>
-
+
<target name="help" depends="_buildmagic:help:build"
description="Show this help message."/>
-
+
<!--
| Deploy the application
-->
@@ -284,22 +304,35 @@
description="Deploy all archives."
depends="most">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="../core/output/lib/jboss-portal.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-admin/output/lib/portal-admin.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-cms/output/lib/portal-cms.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-identity/output/lib/portal-identity.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../workflow/output/lib/portal-workflow.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-management/output/lib/portal-management.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-basic-samples.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-news-samples.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-jsp-samples.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-weather-samples.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-users-samples.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy
file="../core-samples/output/lib/portal-coordination-samples.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
+ <copy file="../core/output/lib/jboss-portal.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-admin/output/lib/portal-admin.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-cms/output/lib/portal-cms.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-identity/output/lib/portal-identity.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../workflow/output/lib/portal-workflow.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-basic-samples.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-news-samples.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-jsp-samples.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-weather-samples.war"
+ todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-users-samples.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy
file="../core-samples/output/lib/portal-coordination-samples.war"
+ todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
<!--<copy file="../core-search/output/lib/portal-search.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>-->
- <copy file="../widget/output/lib/portal-widget.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../widget/output/lib/portal-widget-netvibes.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../wsrp/output/lib/portal-wsrp.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
+ <copy file="../widget/output/lib/portal-widget.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../widget/output/lib/portal-widget-netvibes.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
+ <copy file="../wsrp/output/lib/portal-wsrp.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
</target>
<target name="undeploy-all"
@@ -358,7 +391,7 @@
</packageset>
<packageset dir="../theme/src/main">
<exclude name="org/jboss/portal/test/**"/>
- </packageset>
+ </packageset>
<packageset dir="../core/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
@@ -368,9 +401,6 @@
<packageset dir="../core-cms/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
- <packageset dir="../core-management/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
<packageset dir="../security/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
@@ -423,49 +453,50 @@
</condition>
</target>
- <!-- check if the the user has specied proxy settings -->
- <target name="check.proxy">
- <condition property="hasproxy">
- <and>
+ <!-- check if the the user has specied proxy settings -->
+ <target name="check.proxy">
+ <condition property="hasproxy">
+ <and>
<isset property="proxy.host"/>
<isset property="proxy.port"/>
<not>
- <equals arg1="" arg2="${proxy.host}"
trim="true"/>
+ <equals arg1="" arg2="${proxy.host}"
trim="true"/>
</not>
<not>
- <equals arg1="" arg2="${proxy.port}"
trim="true"/>
+ <equals arg1="" arg2="${proxy.port}"
trim="true"/>
</not>
- </and>
- </condition>
- <!-- set proxy settings -->
- <condition property="hasproxyauth">
- <and>
+ </and>
+ </condition>
+ <!-- set proxy settings -->
+ <condition property="hasproxyauth">
+ <and>
<isset property="hasproxy"/>
<isset property="proxy.username"/>
<isset property="proxy.password"/>
<not>
- <equals arg1="" arg2="${proxy.username}"
trim="true"/>
+ <equals arg1="" arg2="${proxy.username}"
trim="true"/>
</not>
<not>
- <equals arg1="" arg2="${proxy.password}"
trim="true"/>
+ <equals arg1="" arg2="${proxy.password}"
trim="true"/>
</not>
- </and>
- </condition>
+ </and>
+ </condition>
- </target>
+ </target>
- <target name="set.proxy" depends="set.proxy.withoutauth,
set.proxy.auth"/>
+ <target name="set.proxy" depends="set.proxy.withoutauth,
set.proxy.auth"/>
- <!-- set proxy settings without auth -->
- <target name="set.proxy.withoutauth" if="hasproxy"
unless="hasproxyauth" depends="check.proxy">
- <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
- <setproxy proxyhost="${proxy.host}"
proxyport="${proxy.port}"/>
- </target>
+ <!-- set proxy settings without auth -->
+ <target name="set.proxy.withoutauth" if="hasproxy"
unless="hasproxyauth" depends="check.proxy">
+ <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+ <setproxy proxyhost="${proxy.host}"
proxyport="${proxy.port}"/>
+ </target>
- <!-- set proxy settings using auth -->
- <target name="set.proxy.auth" if="hasproxyauth"
depends="check.proxy">
- <echo>Auth Proxy is set to ${proxy.host}:${proxy.port}
username=[${proxy.username}]</echo>
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
- </target>
+ <!-- set proxy settings using auth -->
+ <target name="set.proxy.auth" if="hasproxyauth"
depends="check.proxy">
+ <echo>Auth Proxy is set to ${proxy.host}:${proxy.port}
username=[${proxy.username}]</echo>
+ <setproxy proxyhost="${proxy.host}"
proxyport="${proxy.port}" proxyuser="${proxy.username}"
+ proxypassword="${proxy.password}"/>
+ </target>
</project>
Modified: branches/JBoss_Portal_Branch_2_7/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2009-05-07 09:27:45 UTC (rev
13314)
+++ branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2009-05-07 11:20:47 UTC (rev
13315)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<project default="main" name="JBoss Portal">
<property name="source.dir" value=".."/>
- <property name="docs.dir" value="${source.dir}/../docs"/>
+ <property name="docs.dir"
value="${source.dir}/../portal-docs-2.7"/>
<property name="examples.dir"
value="${source.dir}/../examples"/>
<property name="release.version" value="2.7.1"/>
@@ -93,24 +116,24 @@
<delete dir="javadoc-bundle"/>
<mkdir dir="javadoc-bundle"/>
<mkdir dir="javadoc-bundle/core"/>
- <mkdir dir="javadoc-bundle/core"/>
- <copy todir="javadoc-bundle/core">
+ <mkdir dir="javadoc-bundle/core"/>
+ <copy todir="javadoc-bundle/core">
<fileset dir="javadoc" includes="**/*"/>
</copy>
<mkdir dir="javadoc-bundle/cms"/>
- <copy todir="javadoc-bundle/cms">
+ <copy todir="javadoc-bundle/cms">
<fileset dir="../../cms/target/site/apidocs"
includes="**/*"/>
</copy>
<mkdir dir="javadoc-bundle/identity"/>
- <copy todir="javadoc-bundle/identity">
+ <copy todir="javadoc-bundle/identity">
<fileset dir="../../identity/build/javadoc"
includes="**/*"/>
</copy>
<mkdir dir="javadoc-bundle/web"/>
- <copy todir="javadoc-bundle/web">
+ <copy todir="javadoc-bundle/web">
<fileset dir="../../web/target/site/apidocs"
includes="**/*"/>
</copy>
<mkdir dir="javadoc-bundle/common"/>
- <copy todir="javadoc-bundle/common">
+ <copy todir="javadoc-bundle/common">
<fileset dir="../../common/target/site/apidocs"
includes="**/*"/>
</copy>
<mkdir dir="javadoc-bundle/portlet"/>
@@ -182,7 +205,7 @@
<sequential>
<mkdir dir="${todir}"/>
<copy todir="${todir}">
- <fileset dir="${source.dir}/core-samples/output/resources"
includes="portal-basic-samples.sar/**"/>
+ <fileset dir="${source.dir}/core-samples/output/resources"
includes="portal-basic-samples.sar/**"/>
</copy>
<copy file="${docs.dir}/readmeFiles/samples-readme.txt"
tofile="${todir}/readme.txt"/>
</sequential>
@@ -190,14 +213,14 @@
<target name="patch-log4j">
<patch
patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff"
- originalfile="${todir}/conf/jboss-log4j.xml" />
+ originalfile="${todir}/conf/jboss-log4j.xml"/>
</target>
<target name="patch-run.conf">
- <patch patchfile="${source.dir}/build/etc/resources/run.conf.diff"
originalfile="${todir}/bin/run.conf" />
+ <patch patchfile="${source.dir}/build/etc/resources/run.conf.diff"
originalfile="${todir}/bin/run.conf"/>
</target>
- <target name="patch-run.bat">
- <patch patchfile="${source.dir}/build/etc/resources/run.bat.diff"
originalfile="${todir}/bin/run.bat" />
+ <target name="patch-run.bat">
+ <patch patchfile="${source.dir}/build/etc/resources/run.bat.diff"
originalfile="${todir}/bin/run.bat"/>
</target>
@@ -207,16 +230,16 @@
<mkdir dir="${todir}"/>
<antcall target="package-doc">
<param name="todir" value="${todir}/docs"/>
- </antcall>
+ </antcall>
<antcall target="package-ds">
<param name="todir" value="${todir}/setup"/>
- </antcall>
+ </antcall>
<antcall target="package-samples">
<param name="todir" value="${todir}/samples"/>
- </antcall>
+ </antcall>
<antcall target="package-examples">
<param name="todir" value="${todir}/examples"/>
- </antcall>
+ </antcall>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README"
todir="${todir}"/>
<copy todir="${todir}/docs/portal/licenses">
<fileset dir="output/docs/licenses"/>
@@ -228,7 +251,7 @@
<sequential>
<mkdir dir="${todir}"/>
<antcall target="package-doc">
- <param name="todir" value="${todir}/docs/portal"/>
+ <param name="todir" value="${todir}/docs/portal"/>
</antcall>
<antcall target="package-ds">
<param name="todir" value="${todir}/setup"/>
@@ -266,8 +289,8 @@
excludes="*/output/**,**/CVS/*,**/build.log,build/local.properties,forums/**,thirdparty/**"/>
</copy>
<copy todir="${portal.build.src}/docs/portal/licenses">
- <fileset dir="output/docs/licenses"/>
- </copy>
+ <fileset dir="output/docs/licenses"/>
+ </copy>
<fixcrlf srcdir="${portal.build.src}" includes="**/*.sh"
eol="lf" eof="remove"/>
<fixcrlf srcdir="${portal.build.src}" includes="**/*.bat"
eol="crlf"/>
@@ -278,7 +301,7 @@
<antcall target="package-normal"/>
<antcall target="package-ha"/>
<antcall target="package-normal-bundled"/>
- </target>
+ </target>
<!--
| JBoss Portal binary distribution
@@ -287,7 +310,7 @@
<target name="package-normal" description="package
jboss-portal.sar">
<mkdir dir="${portal.build.normal.bin}"/>
<antcall target="package-bin">
- <param name="todir"
value="${portal.build.normal.bin}"/>
+ <param name="todir"
value="${portal.build.normal.bin}"/>
</antcall>
<copy todir="${portal.build.normal.bin}/jboss-portal.sar">
<fileset
dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
@@ -299,7 +322,6 @@
<fileset dir="${source.dir}/workflow/output/resources"
includes="portal-workflow.sar/**"/>
<fileset dir="${source.dir}/widget/output/resources"
includes="portal-widget.war/**"/>
<fileset dir="${source.dir}/widget/output/resources"
includes="portal-widget-netvibes.war/**"/>
- <fileset dir="${source.dir}/core-management/output/resources"
includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources"
includes="portal-admin.sar/**"/>
<fileset dir="${source.dir}/core-identity/output/resources"
includes="portal-identity.sar/**"/>
</copy>
@@ -334,7 +356,6 @@
<fileset dir="${source.dir}/workflow/output/resources"
includes="portal-workflow.sar/**"/>
<fileset dir="${source.dir}/widget/output/resources"
includes="portal-widget.war/**"/>
<fileset dir="${source.dir}/widget/output/resources"
includes="portal-widget-netvibes.war/**"/>
- <fileset dir="${source.dir}/core-management/output/resources"
includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources"
includes="portal-admin.sar/**"/>
<fileset dir="${source.dir}/core-identity/output/resources"
includes="portal-identity.sar/**"/>
</copy>
@@ -383,7 +404,7 @@
<param name="todir"
value="${portal.build.normal.bundled}"/>
</antcall>
<antcall target="patch-run.bat">
- <param name="todir"
value="${portal.build.normal.bundled}"/>
+ <param name="todir"
value="${portal.build.normal.bundled}"/>
</antcall>
</target>