JBoss Portal SVN: r6325 - trunk/build.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2007-02-16 16:18:32 -0500 (Fri, 16 Feb 2007)
New Revision: 6325
Modified:
trunk/build/distrib.xml
Log:
break package target into four subtargets for packaging 4 distros
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-02-16 21:16:53 UTC (rev 6324)
+++ trunk/build/distrib.xml 2007-02-16 21:18:32 UTC (rev 6325)
@@ -85,60 +85,65 @@
<target name="build" depends="source.build,doc.build">
</target>
- <macrodef name="package-doc">
- <attribute name="todir"/>
+ <target name="package-doc">
<sequential>
- <mkdir dir="@{todir}"/>
- <mkdir dir="@{todir}/referenceGuide"/>
- <copy todir="@{todir}/referenceGuide">
+ <mkdir dir="${todir}"/>
+ <mkdir dir="${todir}/referenceGuide"/>
+ <copy todir="${todir}/referenceGuide">
<fileset dir="${source.dir}-docs/referenceGuide/build/en/"/>
</copy>
- <mkdir dir="@{todir}/userGuide"/>
- <copy todir="@{todir}/userGuide">
+ <mkdir dir="${todir}/userGuide"/>
+ <copy todir="${todir}/userGuide">
<fileset dir="${source.dir}-docs/userGuide/build/en/"/>
</copy>
- <mkdir dir="@{todir}/quickstartuser"/>
- <copy todir="@{todir}/quickstartuser">
+ <mkdir dir="${todir}/quickstartuser"/>
+ <copy todir="${todir}/quickstartuser">
<fileset dir="${source.dir}-docs/quickstartuser/build/en/"/>
</copy>
</sequential>
- </macrodef>
+ </target>
- <macrodef name="package-ds">
- <attribute name="todir"/>
+ <target name="package-ds">
<sequential>
- <mkdir dir="@{todir}"/>
- <copy todir="@{todir}">
+ <mkdir dir="${todir}"/>
+ <copy todir="${todir}">
<fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/>
</copy>
</sequential>
- </macrodef>
+ </target>
- <macrodef name="package-bin">
- <attribute name="todir"/>
+ <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
+ <target name="package-bin" unless="no-doc">
<sequential>
- <mkdir dir="@{todir}"/>
- <package-doc todir="@{todir}/docs"/>
- <package-ds todir="@{todir}/setup"/>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="@{todir}"/>
- <copy todir="@{todir}/docs/portal/licenses">
+ <mkdir dir="${todir}"/>
+ <antcall target="package-doc">
+ <param name="todir" value="${todir}/docs"/>
+ </antcall>
+ <antcall target="package-ds">
+ <param name="todir" value="${todir}/setup"/>
+ </antcall>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
+ <copy todir="${todir}/docs/portal/licenses">
<fileset dir="output/docs/licenses"/>
</copy>
</sequential>
- </macrodef>
+ </target>
- <macrodef name="package-bundled">
- <attribute name="todir"/>
+ <target name="package-bundled" unless="no-doc">
<sequential>
- <mkdir dir="@{todir}"/>
- <package-doc todir="@{todir}/docs/portal"/>
- <package-ds todir="@{todir}/setup"/>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="@{todir}"/>
- <copy todir="@{todir}/docs/portal/licenses">
+ <mkdir dir="${todir}"/>
+ <antcall target="package-doc">
+ <param name="todir" value="${todir}/docs/portal"/>
+ </antcall>
+ <antcall target="package-ds">
+ <param name="todir" value="${todir}/setup"/>
+ </antcall>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
+ <copy todir="${todir}/docs/portal/licenses">
<fileset dir="output/docs/licenses"/>
</copy>
</sequential>
- </macrodef>
+ </target>
<!-- -->
<target name="package" if="jboss.home">
@@ -151,66 +156,91 @@
-->
<mkdir dir="${portal.build.src}"/>
- <package-doc todir="${portal.build.src}/docs"/>
+ <antcall target="package-doc">
+ <param name="todir" value="${portal.build.src}/docs"/>
+ </antcall>
<copy file="${source.dir}-docs/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/>
<copy todir="${portal.build.src}">
<fileset dir="${source.dir}" includes="**/*" 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>
+ </copy>
<fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/>
<fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/>
<!--
| JBoss Portal binaries distribution
- -->
-
+ -->
+
+ <antcall target="package-normal"/>
+ <antcall target="package-ha"/>
+ <antcall target="package-normal-bundled"/>
+ <antcall target="package-ha-bundled"/>
+
+ </target>
+
+ <!--
+ | JBoss Portal binary distribution
+ -->
+
+ <target name="package-normal" description="package jboss-portal.sar">
<mkdir dir="${portal.build.normal.bin}"/>
- <package-bin todir="${portal.build.normal.bin}"/>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar">
- <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
- </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-management/output/resources" includes="portal-management.sar/**"/>
- <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
- </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"/>
- </copy>
+ <antcall target="package-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"/>
+ </copy>
+ <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar">
+ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
+ </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-management/output/resources" includes="portal-management.sar/**"/>
+ <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
+ </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"/>
+ </copy>
+ </target>
+
<!--
| 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">
+ <target name="package-ha" description="package jboss-portal-ha.sar">
+ <mkdir dir="${portal.build.ha.bin}"/>
+ <antcall target="package-bin">
+ <param name="todir" value="${portal.build.ha.bin}"/>
+ </antcall>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
<fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
+ </copy>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
<fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-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/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
- </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">
+ </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>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/>
+ </target>
<!--
| JBoss Portal bundled distribution
-->
+ <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with jboss AS ">
<mkdir dir="${portal.build.normal.bundled}"/>
- <package-bundled todir="${portal.build.normal.bundled}"/>
+ <antcall target="package-bundled">
+ <param name="todir" value="${portal.build.normal.bundled}"/>
+ </antcall>
<copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar">
<fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/>
</copy>
@@ -226,13 +256,17 @@
<include name="server/default/**"/>
</fileset>
</copy>
+ </target>
<!--
| JBoss Portal ha bundled distribution
-->
+ <target name="package-ha-bundled" depends="package-ha" if="jboss.home" description="package jboss-portal-ha bundled with jboss AS ">
<mkdir dir="${portal.build.ha.bundled}"/>
- <package-bundled todir="${portal.build.ha.bundled}"/>
+ <antcall target="package-bundled">
+ <param name="todir" value="${portal.build.ha.bundled}"/>
+ </antcall>
<copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar">
<fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/>
</copy>
@@ -246,8 +280,7 @@
</fileset>
</copy>
<copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/>
-
- </target>
+ </target>
<!-- Create packages -->
<target name="zip">
@@ -290,6 +323,6 @@
</target>
<!-- Build and compress everything -->
- <target name="main" depends="licenses,build,package,zip">
+ <target name="main" depends="licenses,build,package,zip" description="do the whole shebang - build source, doc, distro">
</target>
</project>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6324 - trunk/build.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2007-02-16 16:16:53 -0500 (Fri, 16 Feb 2007)
New Revision: 6324
Modified:
trunk/build/build.xml
Log:
accidentally changed build.xml instead of distrib.xml
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-02-16 20:14:38 UTC (rev 6323)
+++ trunk/build/build.xml 2007-02-16 21:16:53 UTC (rev 6324)
@@ -1,328 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
+
+
+ ]>
+
+<!-- $Id$ -->
+
+<!--+======================================================================+-->
+<!--| JBoss Portal: The OpenSource Portal |-->
+<!--| |-->
+<!--| Distributable under GPL license. |-->
+<!--| See terms of license at http://www.gnu.org. |-->
+<!--| |-->
+<!--| This file has been designed to work with the 'tools' module and |-->
+<!--| Buildmagic extentions. |-->
+<!--+======================================================================+-->
+
<project default="main" name="JBoss Portal">
- <property name="source.dir" value="../../jboss-portal-2.6"/>
- <property name="release.version" value="2.6-ALPHA2"/>
+ <!--+====================================================================+-->
+ <!--| Setup |-->
+ <!--| |-->
+ <!--| Include the common build elements. |-->
+ <!--| |-->
+ <!--| This defines several different targets, properties and paths. |-->
+ <!--| It also sets up the basic extention tasks amoung other things. |-->
+ <!--+====================================================================+-->
- <!-- -->
- <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
- <property name="portal.release.ha.name" value="jboss-portal-ha-${release.version}"/>
+ &buildmagic;
+ &modules;
+ &defaults;
- <!-- -->
- <property name="portal.build.src" value="output/${portal.release.normal.name}-src"/>
- <property name="portal.build.normal.bin" value="output/${portal.release.normal.name}"/>
- <property name="portal.build.ha.bin" value="output/${portal.release.ha.name}"/>
- <property name="portal.build.normal.bundled" value="output/${portal.release.normal.name}-bundled"/>
- <property name="portal.build.ha.bundled" value="output/${portal.release.ha.name}-bundled"/>
+ <!--+====================================================================+-->
+ <!--| Initialization |-->
+ <!--| |-->
+ <!--| Initialize the build system. Other targets should depend on |-->
+ <!--| 'init'. |-->
+ <!--+====================================================================+-->
-<!--
- <property name="forums.release.name" value="jboss-forums-${release.version}"/>
- <property name="forums.build.bin" value="output/${forums.release.name}"/>
- <property name="forums.build.src" value="output/${forums.release.name}-src"/>
--->
-<!-- Licenses -->
-<target name="licenses">
- <fileset id="thirdparty-licenses" dir="../thirdparty/licenses">
- <include name="antlr.txt"/>
- <include name="apache-2.0.txt"/>
- <include name="bsd.txt"/>
- <include name="cddl.txt"/>
- <include name="cpl-1.0/txt"/>
- <include name="day-jcr.txt"/>
- <include name="dom4j.txt"/>
- <include name="ehcache.txt"/>
- <include name="gpl.txt"/>
- <include name="hsqldb.txt"/>
- <include name="httpunit.txt"/>
- <include name="ironsmith.txt"/>
- <include name="lgpl.txt"/>
- <include name="nekohtml.txt"/>
- <include name="oswego.txt"/>
- <include name="public-domain.txt"/>
- <include name="slf4j.txt"/>
- <include name="sun-jaf.txt"/>
- <include name="sun-javamail.txt"/>
- <include name="xdoclet.txt"/>
- </fileset>
- <mkdir dir="output/docs/licenses"/>
- <concat destfile="output/docs/licenses/thirdparty-licenses.txt">
- <fileset refid="thirdparty-licenses"/>
- </concat>
- <copy todir="output/docs/licenses">
- <fileset refid="thirdparty-licenses"/>
- <fileset dir="licences" includes="JBossEULA.txt"/>
- </copy>
+ <target name="init" unless="init.disable" depends="_buildmagic:init">
</target>
-
- <!-- Build JBoss Portal artifacts -->
- <target name="source.build">
- <!-- Normal build -->
- <ant dir="${source.dir}/build" antfile="build.xml"/>
+ <!--+====================================================================+-->
+ <!--| Configuration |-->
+ <!--| |-->
+ <!--| This target is invoked by the Buildmagic initialization logic |-->
+ <!--| and should contain module specific configuration elements. |-->
+ <!--+====================================================================+-->
- <!-- HA specific targets -->
- <ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/>
- <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>
+ <target name="configure" unless="configure.disable">
- <ant dir="${source.dir}/wsrp" antfile="build.xml" target="output"/>
- <ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/>
- </target>
+ <!--+==============================+-->
+ <!--| Project version information. |-->
+ <!--+==============================+-->
- <!-- Build JBoss Portal documentation -->
- <target name="doc.build">
- <ant dir="${source.dir}-docs/referenceGuide" antfile="build.xml"/>
- <ant dir="${source.dir}-docs/userGuide" antfile="build.xml"/>
- <ant dir="${source.dir}-docs/quickstartuser" antfile="build.xml"/>
- </target>
+ <property name="version.major" value="2"/>
+ <property name="version.minor" value="6"/>
+ <property name="version.revision" value="0"/>
+ <property name="version.tag" value="A"/>
+ <property name="version.name" value="Ninja"/>
- <!-- Build JBoss Portal -->
- <target name="build" depends="source.build,doc.build">
- </target>
+ <!-- This must be set to the CVS tag for any release -->
+ <property name="version.cvstag" value="HEAD"/>
- <target name="package-doc">
- <sequential>
- <mkdir dir="${todir}"/>
- <mkdir dir="${todir}/referenceGuide"/>
- <copy todir="${todir}/referenceGuide">
- <fileset dir="${source.dir}-docs/referenceGuide/build/en/"/>
- </copy>
- <mkdir dir="${todir}/userGuide"/>
- <copy todir="${todir}/userGuide">
- <fileset dir="${source.dir}-docs/userGuide/build/en/"/>
- </copy>
- <mkdir dir="${todir}/quickstartuser"/>
- <copy todir="${todir}/quickstartuser">
- <fileset dir="${source.dir}-docs/quickstartuser/build/en/"/>
- </copy>
- </sequential>
- </target>
+ <!-- Module name(s) & version -->
+ <property name="module.version"
+ value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
- <target name="package-ds">
- <sequential>
- <mkdir dir="${todir}"/>
- <copy todir="${todir}">
- <fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/>
- </copy>
- </sequential>
- </target>
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
- <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
- <target name="package-bin" unless="no-doc">
- <sequential>
- <mkdir dir="${todir}"/>
- <antcall target="package-doc">
- <param name="todir" value="${todir}/docs"/>
- </antcall>
- <antcall target="package-ds">
- <param name="todir" value="${todir}/setup"/>
- </antcall>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
- <copy todir="${todir}/docs/portal/licenses">
- <fileset dir="output/docs/licenses"/>
- </copy>
- </sequential>
+ <!-- The combined library classpath -->
+
+ <path id="library.classpath">
+ </path>
+
+ <!-- Configure modules -->
+ <call target="configure-modules"/>
+ <path id="dependentmodule.classpath">
+ <!-- Add dependent module classpath elements here. -->
+ </path>
+
+ <!--+=======================================+-->
+ <!--| Override any default properties here. |-->
+ <!--+=======================================+-->
+
+ <!-- Configure defaults & build tools -->
+
+ <call target="configure-defaults"/>
+
+ <!--+=======================================+-->
+ <!--| Define module specific elements here. |-->
+ <!--+=======================================+-->
+
+ <!--+================================+-->
+ <!--| Define project structure here. |-->
+ <!--+================================+-->
+
+ <!-- The group to use by default -->
+ <property name="groups" value="default"/>
+
+ <!-- Sets up the module configuration. -->
+ <moduleconfig property="modules" selected="${groups}">
+
+ <!-- Modules -->
+
+ <module name="common"/>
+ <module name="test"/>
+ <module name="jems"/>
+ <module name="security"/>
+ <module name="faces"/>
+ <module name="api"/>
+ <module name="server"/>
+ <module name="identity"/>
+ <module name="portlet"/>
+ <module name="portlet-federation"/>
+ <module name="theme"/>
+ <module name="bridge"/>
+ <module name="cms"/>
+ <module name="format"/>
+ <module name="samples"/>
+ <module name="core"/>
+ <module name="core-cms"/>
+ <module name="core-management"/>
+ <module name="core-admin"/>
+ <module name="search"/>
+ <module name="core-samples"/>
+ <module name="wsrp"/>
+ <module name="registration"/>
+ <module name="workflow"/>
+ <!--<module name="core-admin"/>-->
+
+ <!-- Module groups -->
+
+ <group name="portal">
+ <include
+ modules="common, test, api, faces, jems, server, security, identity, search, format, portlet, portlet-federation, theme, workflow, cms, bridge, samples, registration, wsrp, core, core-admin, core-cms, core-management, core-samples"/>
+ </group>
+
+ <group name="cms">
+ <include modules="common, test, jems, workflow, cms"/>
+ </group>
+
+ <group name="security">
+ <include modules="common, test, jems, security"/>
+ </group>
+
+ <group name="faces">
+ <include modules="common, test, faces"/>
+ </group>
+
+ <group name="default">
+ <include groups="portal"/>
+ </group>
+
+ </moduleconfig>
+
+ <!-- Configure project defaults -->
+ <call target="configure-project"/>
+
</target>
+ <target name="modules-all" depends="_buildmagic:modules:all"/>
+ <target name="modules-most" depends="_buildmagic:modules:most"/>
+ <target name="modules-main" depends="_buildmagic:modules:main"/>
+ <target name="modules-release" depends="_buildmagic:modules:release"/>
+ <target name="modules-tests" depends="_buildmagic:modules:tests"/>
+ <target name="modules-clean" depends="_buildmagic:modules:clean"/>
+ <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
- <target name="package-bundled" unless="no-doc">
- <sequential>
- <mkdir dir="${todir}"/>
- <antcall target="package-doc">
- <param name="todir" value="${todir}/docs/portal"/>
- </antcall>
- <antcall target="package-ds">
- <param name="todir" value="${todir}/setup"/>
- </antcall>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
- <copy todir="${todir}/docs/portal/licenses">
- <fileset dir="output/docs/licenses"/>
- </copy>
- </sequential>
+
+ <!--+====================================================================+-->
+ <!--| Module Pass-through Hooks |-->
+ <!--| |-->
+ <!--| These hooks are executed after the above pass-through targets have |-->
+ <!--| finished with a given module. |-->
+ <!--+====================================================================+-->
+
+ <!-- Add module pass-through hooks here. -->
+
+
+ <!--+====================================================================+-->
+ <!--| Compile |-->
+ <!--| |-->
+ <!--| This target should depend on other compile-* targets for each |-->
+ <!--| different type of compile that needs to be performed, short of |-->
+ <!--| documentation compiles. |-->
+ <!--+====================================================================+-->
+
+ <target name="compile"/>
+
+ <!--+====================================================================+-->
+ <!--| Generate Output |-->
+ <!--| |-->
+ <!--| Generates the target output for this module. Target output is |-->
+ <!--| the output which is ment to be released or used by external |-->
+ <!--| modules. |-->
+ <!--+====================================================================+-->
+
+ <target name="output"
+ description="Generate all target output."
+ depends="init">
+ <!-- Add module specific elements here. -->
</target>
- <!-- -->
- <target name="package" if="jboss.home">
+ <!--+====================================================================+-->
+ <!--| Documents |-->
+ <!--| |-->
+ <!--| Generate all documentation for this module. |-->
+ <!--+====================================================================+-->
- <!-- Create the output directory -->
- <mkdir dir="output"/>
+ <target name="docs">
+ <ant antfile="build-targets.xml" target="_default:docs"/>
+ <!-- Add module specific elements here. -->
+ </target>
- <!--
- | JBoss Portal source distribution
- -->
+ <!--+====================================================================+-->
+ <!--| Install & Release |-->
+ <!--+====================================================================+-->
- <mkdir dir="${portal.build.src}"/>
- <antcall target="package-doc">
- <param name="todir" value="${portal.build.src}/docs"/>
- </antcall>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/>
- <copy todir="${portal.build.src}">
- <fileset dir="${source.dir}" includes="**/*" 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>
- <fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/>
- <fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/>
+ <target name="release"
+ description="Builds the default release structure."
+ depends="modules-most, output"/>
- <!--
- | JBoss Portal binaries distribution
- -->
-
- <antcall target="package-normal"/>
- <antcall target="package-ha"/>
- <antcall target="package-normal-bundled"/>
- <antcall target="package-ha-bundled"/>
-
- </target>
-
- <!--
- | JBoss Portal binary distribution
- -->
-
- <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}"/>
- </antcall>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar">
- <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
- </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-management/output/resources" includes="portal-management.sar/**"/>
- <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
- </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"/>
- </copy>
+ <target name="release-full"
+ description="Builds the full release structure."
+ depends="modules-all, release"/>
- </target>
+ <!--+====================================================================+-->
+ <!--| Misc. |-->
+ <!--| |-->
+ <!--| Standard targets and pseudo-targets. |-->
+ <!--+====================================================================+-->
- <!--
- | JBoss Portal ha binaries distribution
- -->
- <target name="package-ha" description="package jboss-portal-ha.sar">
- <mkdir dir="${portal.build.ha.bin}"/>
- <antcall target="package-bin">
- <param name="todir" value="${portal.build.ha.bin}"/>
- </antcall>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
- <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/>
- </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/**"/>
- <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
- </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}"/>
+ <target name="clean" depends="createthirdparty, modules-clean, _buildmagic:clean"
+ description="Cleans up most generated files.">
+ <!-- Add module specific elements here. -->
</target>
- <!--
- | JBoss Portal bundled distribution
- -->
- <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with jboss AS ">
- <mkdir dir="${portal.build.normal.bundled}"/>
- <antcall target="package-bundled">
- <param name="todir" value="${portal.build.normal.bundled}"/>
- </antcall>
- <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar">
- <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/>
- </copy>
- <copy todir="${portal.build.normal.bundled}/server/default/deploy">
- <fileset dir="${portal.build.normal.bin}/setup" includes="portal-hsqldb-ds.xml"/>
- </copy>
- <copy todir="${portal.build.normal.bundled}">
- <fileset dir="${jboss.home}">
- <include name="bin/**"/>
- <include name="client/**"/>
- <include name="docs/**"/>
- <include name="lib/**"/>
- <include name="server/default/**"/>
- </fileset>
- </copy>
- </target>
+ <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
+ description="Cleans up all generated files.">
+ <!-- Add module specific elements here. -->
+ </target>
- <!--
- | JBoss Portal ha bundled distribution
- -->
+ <target name="main" depends="most"
+ description="Executes the default target (most)."/>
- <target name="package-ha-bundled" depends="package-ha" if="jboss.home" description="package jboss-portal-ha bundled with jboss AS ">
- <mkdir dir="${portal.build.ha.bundled}"/>
- <antcall target="package-bundled">
- <param name="todir" value="${portal.build.ha.bundled}"/>
- </antcall>
- <copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar">
- <fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bundled}">
- <fileset dir="${jboss.home}">
- <include name="bin/**"/>
- <include name="clients/**"/>
- <include name="docs/**"/>
- <include name="lib/**"/>
- <include name="server/all/**"/>
- </fileset>
- </copy>
- <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/>
- </target>
-
- <!-- Create packages -->
- <target name="zip">
+ <target name="all" depends="createthirdparty, modules-all"
+ description="Executes all modules and builds everything."/>
- <tar destfile="${portal.build.src}.tar.gz"
- compression="gzip">
- <tarfileset prefix="${portal.release.normal.name}-src" dir="${portal.build.src}"/>
- </tar>
- <checksum file="${portal.build.src}.tar.gz"/>
+ <target name="most" depends="createthirdparty, modules-most"
+ description="Executes all modules and builds most everything."/>
- <zip destfile="${portal.build.normal.bin}.zip">
- <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bin}"/>
- </zip>
- <checksum file="${portal.build.normal.bin}.zip"/>
+ <target name="help" depends="_buildmagic:help:build"
+ description="Show this help message."/>
- <zip destfile="${portal.build.ha.bin}.zip">
- <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bin}"/>
- </zip>
- <checksum file="${portal.build.ha.bin}.zip"/>
- <zip destfile="${portal.build.normal.bundled}.zip">
- <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bundled}"/>
- </zip>
- <checksum file="${portal.build.normal.bin}.zip"/>
+ <!--
+ | Deploy the application
+ -->
- <zip destfile="${portal.build.ha.bundled}.zip">
- <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bundled}"/>
- </zip>
- <checksum file="${portal.build.ha.bundled}.zip"/>
+ <!--<target name="initsetup">-->
+ <!--<available property="cmsdata" file="${jboss.home}/server/${portal.deploy.dir}/data/portal"/> -->
+ <!--</target>-->
- <!--
- <tar destfile="${forums.build.src}.tar.gz"
- compression="gzip">
- <tarfileset dir="output/${forums.release.name}-src"
- prefix="${forums.release.name}-src"/>
- </tar>
- <zip destfile="${forums.build.bin}.zip"
- basedir="output/${forums.release.name}"/>
- -->
+ <!--<target name="setup" depends="initsetup" unless="cmsdata">-->
+ <!--<unzip src="../core/src/bin/setup/cms-content.zip" dest="${jboss.home}/server/${portal.deploy.dir}/data"/>-->
+ <!--</target>-->
+
+ <target name="deploy"
+ description="Deploy."
+ depends="main">
+ <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"/>
</target>
- <!-- Build and compress everything -->
- <target name="main" depends="licenses,build,package,zip" description="do the whole shebang - build source, doc, distro">
+ <target name="undeploy"
+ description="Undeploy."
+ depends="init">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
</target>
+
+ <target name="exploded-deploy"
+ description="Deploy exploded sar."
+ depends="main">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/>
+ <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar">
+ <fileset dir="../core/output/resources/jboss-portal.sar"/>
+ </copy>
+ </target>
+
+ <target name="javadoc">
+ <mkdir dir="javadoc"/>
+ <javadoc destdir="javadoc">
+ <classpath>
+ <fileset dir="../thirdparty" includes="**/*.jar"/>
+ </classpath>
+ <packageset dir="../common/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../server/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../api/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../portlet/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../jems/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../identity/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../bridge/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../faces/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../portlet-federation/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../format/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../theme/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../cms/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../core/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../security/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../wsrp/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../wsrp/src/generated">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../registration/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ </javadoc>
+ </target>
+
+ <!-- create the thirdparty folder from items in the repository -->
+ <!-- then generate a new libraries.ent file and include it in -->
+ <!-- the build -->
+ <target name="createthirdparty" unless="inhibit.downloads"
+ depends="check.inhibit.downloads">
+ <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+ </target>
+
+ <!-- check if thirdparty libraries are to be downloaded -->
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="../thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
+
</project>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6323 - trunk/build.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2007-02-16 15:14:38 -0500 (Fri, 16 Feb 2007)
New Revision: 6323
Modified:
trunk/build/build.xml
Log:
break package target into four subtargets for packaging 4 distros
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-02-16 18:19:04 UTC (rev 6322)
+++ trunk/build/build.xml 2007-02-16 20:14:38 UTC (rev 6323)
@@ -1,382 +1,328 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
-
-
- ]>
-
-<!-- $Id$ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal: The OpenSource Portal |-->
-<!--| |-->
-<!--| Distributable under GPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
<project default="main" name="JBoss Portal">
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
+ <property name="source.dir" value="../../jboss-portal-2.6"/>
+ <property name="release.version" value="2.6-ALPHA2"/>
- &buildmagic;
- &modules;
- &defaults;
+ <!-- -->
+ <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
+ <property name="portal.release.ha.name" value="jboss-portal-ha-${release.version}"/>
- <!--+====================================================================+-->
- <!--| Initialization |-->
- <!--| |-->
- <!--| Initialize the build system. Other targets should depend on |-->
- <!--| 'init'. |-->
- <!--+====================================================================+-->
+ <!-- -->
+ <property name="portal.build.src" value="output/${portal.release.normal.name}-src"/>
+ <property name="portal.build.normal.bin" value="output/${portal.release.normal.name}"/>
+ <property name="portal.build.ha.bin" value="output/${portal.release.ha.name}"/>
+ <property name="portal.build.normal.bundled" value="output/${portal.release.normal.name}-bundled"/>
+ <property name="portal.build.ha.bundled" value="output/${portal.release.ha.name}-bundled"/>
- <target name="init" unless="init.disable" depends="_buildmagic:init">
+<!--
+ <property name="forums.release.name" value="jboss-forums-${release.version}"/>
+ <property name="forums.build.bin" value="output/${forums.release.name}"/>
+ <property name="forums.build.src" value="output/${forums.release.name}-src"/>
+-->
+<!-- Licenses -->
+<target name="licenses">
+ <fileset id="thirdparty-licenses" dir="../thirdparty/licenses">
+ <include name="antlr.txt"/>
+ <include name="apache-2.0.txt"/>
+ <include name="bsd.txt"/>
+ <include name="cddl.txt"/>
+ <include name="cpl-1.0/txt"/>
+ <include name="day-jcr.txt"/>
+ <include name="dom4j.txt"/>
+ <include name="ehcache.txt"/>
+ <include name="gpl.txt"/>
+ <include name="hsqldb.txt"/>
+ <include name="httpunit.txt"/>
+ <include name="ironsmith.txt"/>
+ <include name="lgpl.txt"/>
+ <include name="nekohtml.txt"/>
+ <include name="oswego.txt"/>
+ <include name="public-domain.txt"/>
+ <include name="slf4j.txt"/>
+ <include name="sun-jaf.txt"/>
+ <include name="sun-javamail.txt"/>
+ <include name="xdoclet.txt"/>
+ </fileset>
+ <mkdir dir="output/docs/licenses"/>
+ <concat destfile="output/docs/licenses/thirdparty-licenses.txt">
+ <fileset refid="thirdparty-licenses"/>
+ </concat>
+ <copy todir="output/docs/licenses">
+ <fileset refid="thirdparty-licenses"/>
+ <fileset dir="licences" includes="JBossEULA.txt"/>
+ </copy>
</target>
+
+ <!-- Build JBoss Portal artifacts -->
+ <target name="source.build">
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
+ <!-- Normal build -->
+ <ant dir="${source.dir}/build" antfile="build.xml"/>
- <target name="configure" unless="configure.disable">
+ <!-- HA specific targets -->
+ <ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/>
+ <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>
- <!--+==============================+-->
- <!--| Project version information. |-->
- <!--+==============================+-->
+ <ant dir="${source.dir}/wsrp" antfile="build.xml" target="output"/>
+ <ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/>
+ </target>
- <property name="version.major" value="2"/>
- <property name="version.minor" value="6"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="A"/>
- <property name="version.name" value="Ninja"/>
+ <!-- Build JBoss Portal documentation -->
+ <target name="doc.build">
+ <ant dir="${source.dir}-docs/referenceGuide" antfile="build.xml"/>
+ <ant dir="${source.dir}-docs/userGuide" antfile="build.xml"/>
+ <ant dir="${source.dir}-docs/quickstartuser" antfile="build.xml"/>
+ </target>
- <!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="HEAD"/>
+ <!-- Build JBoss Portal -->
+ <target name="build" depends="source.build,doc.build">
+ </target>
- <!-- Module name(s) & version -->
- <property name="module.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
+ <target name="package-doc">
+ <sequential>
+ <mkdir dir="${todir}"/>
+ <mkdir dir="${todir}/referenceGuide"/>
+ <copy todir="${todir}/referenceGuide">
+ <fileset dir="${source.dir}-docs/referenceGuide/build/en/"/>
+ </copy>
+ <mkdir dir="${todir}/userGuide"/>
+ <copy todir="${todir}/userGuide">
+ <fileset dir="${source.dir}-docs/userGuide/build/en/"/>
+ </copy>
+ <mkdir dir="${todir}/quickstartuser"/>
+ <copy todir="${todir}/quickstartuser">
+ <fileset dir="${source.dir}-docs/quickstartuser/build/en/"/>
+ </copy>
+ </sequential>
+ </target>
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
+ <target name="package-ds">
+ <sequential>
+ <mkdir dir="${todir}"/>
+ <copy todir="${todir}">
+ <fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/>
+ </copy>
+ </sequential>
+ </target>
- <!-- The combined library classpath -->
-
- <path id="library.classpath">
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <!-- Add dependent module classpath elements here. -->
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!-- Configure defaults & build tools -->
-
- <call target="configure-defaults"/>
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
-
- <!--+================================+-->
- <!--| Define project structure here. |-->
- <!--+================================+-->
-
- <!-- The group to use by default -->
- <property name="groups" value="default"/>
-
- <!-- Sets up the module configuration. -->
- <moduleconfig property="modules" selected="${groups}">
-
- <!-- Modules -->
-
- <module name="common"/>
- <module name="test"/>
- <module name="jems"/>
- <module name="security"/>
- <module name="faces"/>
- <module name="api"/>
- <module name="server"/>
- <module name="identity"/>
- <module name="portlet"/>
- <module name="portlet-federation"/>
- <module name="theme"/>
- <module name="bridge"/>
- <module name="cms"/>
- <module name="format"/>
- <module name="samples"/>
- <module name="core"/>
- <module name="core-cms"/>
- <module name="core-management"/>
- <module name="core-admin"/>
- <module name="search"/>
- <module name="core-samples"/>
- <module name="wsrp"/>
- <module name="registration"/>
- <module name="workflow"/>
- <!--<module name="core-admin"/>-->
-
- <!-- Module groups -->
-
- <group name="portal">
- <include
- modules="common, test, api, faces, jems, server, security, identity, search, format, portlet, portlet-federation, theme, workflow, cms, bridge, samples, registration, wsrp, core, core-admin, core-cms, core-management, core-samples"/>
- </group>
-
- <group name="cms">
- <include modules="common, test, jems, workflow, cms"/>
- </group>
-
- <group name="security">
- <include modules="common, test, jems, security"/>
- </group>
-
- <group name="faces">
- <include modules="common, test, faces"/>
- </group>
-
- <group name="default">
- <include groups="portal"/>
- </group>
-
- </moduleconfig>
-
- <!-- Configure project defaults -->
- <call target="configure-project"/>
-
+ <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
+ <target name="package-bin" unless="no-doc">
+ <sequential>
+ <mkdir dir="${todir}"/>
+ <antcall target="package-doc">
+ <param name="todir" value="${todir}/docs"/>
+ </antcall>
+ <antcall target="package-ds">
+ <param name="todir" value="${todir}/setup"/>
+ </antcall>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
+ <copy todir="${todir}/docs/portal/licenses">
+ <fileset dir="output/docs/licenses"/>
+ </copy>
+ </sequential>
</target>
- <target name="modules-all" depends="_buildmagic:modules:all"/>
- <target name="modules-most" depends="_buildmagic:modules:most"/>
- <target name="modules-main" depends="_buildmagic:modules:main"/>
- <target name="modules-release" depends="_buildmagic:modules:release"/>
- <target name="modules-tests" depends="_buildmagic:modules:tests"/>
- <target name="modules-clean" depends="_buildmagic:modules:clean"/>
- <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
-
- <!--+====================================================================+-->
- <!--| Module Pass-through Hooks |-->
- <!--| |-->
- <!--| These hooks are executed after the above pass-through targets have |-->
- <!--| finished with a given module. |-->
- <!--+====================================================================+-->
-
- <!-- Add module pass-through hooks here. -->
-
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"/>
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="init">
- <!-- Add module specific elements here. -->
+ <target name="package-bundled" unless="no-doc">
+ <sequential>
+ <mkdir dir="${todir}"/>
+ <antcall target="package-doc">
+ <param name="todir" value="${todir}/docs/portal"/>
+ </antcall>
+ <antcall target="package-ds">
+ <param name="todir" value="${todir}/setup"/>
+ </antcall>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
+ <copy todir="${todir}/docs/portal/licenses">
+ <fileset dir="output/docs/licenses"/>
+ </copy>
+ </sequential>
</target>
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
+ <!-- -->
+ <target name="package" if="jboss.home">
- <target name="docs">
- <ant antfile="build-targets.xml" target="_default:docs"/>
- <!-- Add module specific elements here. -->
- </target>
+ <!-- Create the output directory -->
+ <mkdir dir="output"/>
- <!--+====================================================================+-->
- <!--| Install & Release |-->
- <!--+====================================================================+-->
+ <!--
+ | JBoss Portal source distribution
+ -->
- <target name="release"
- description="Builds the default release structure."
- depends="modules-most, output"/>
+ <mkdir dir="${portal.build.src}"/>
+ <antcall target="package-doc">
+ <param name="todir" value="${portal.build.src}/docs"/>
+ </antcall>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/>
+ <copy todir="${portal.build.src}">
+ <fileset dir="${source.dir}" includes="**/*" 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>
+ <fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/>
+ <fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/>
- <target name="release-full"
- description="Builds the full release structure."
- depends="modules-all, release"/>
+ <!--
+ | JBoss Portal binaries distribution
+ -->
+
+ <antcall target="package-normal"/>
+ <antcall target="package-ha"/>
+ <antcall target="package-normal-bundled"/>
+ <antcall target="package-ha-bundled"/>
+
+ </target>
+
+ <!--
+ | JBoss Portal binary distribution
+ -->
+
+ <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}"/>
+ </antcall>
+ <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
+ <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
+ </copy>
+ <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar">
+ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
+ </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-management/output/resources" includes="portal-management.sar/**"/>
+ <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
+ </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"/>
+ </copy>
- <!--+====================================================================+-->
- <!--| Misc. |-->
- <!--| |-->
- <!--| Standard targets and pseudo-targets. |-->
- <!--+====================================================================+-->
+ </target>
- <target name="clean" depends="createthirdparty, modules-clean, _buildmagic:clean"
- description="Cleans up most generated files.">
- <!-- Add module specific elements here. -->
+ <!--
+ | JBoss Portal ha binaries distribution
+ -->
+ <target name="package-ha" description="package jboss-portal-ha.sar">
+ <mkdir dir="${portal.build.ha.bin}"/>
+ <antcall target="package-bin">
+ <param name="todir" value="${portal.build.ha.bin}"/>
+ </antcall>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
+ <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/>
+ </copy>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
+ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/>
+ </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/**"/>
+ <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
+ </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}"/>
</target>
- <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
- description="Cleans up all generated files.">
- <!-- Add module specific elements here. -->
- </target>
+ <!--
+ | JBoss Portal bundled distribution
+ -->
+ <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with jboss AS ">
+ <mkdir dir="${portal.build.normal.bundled}"/>
+ <antcall target="package-bundled">
+ <param name="todir" value="${portal.build.normal.bundled}"/>
+ </antcall>
+ <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar">
+ <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/>
+ </copy>
+ <copy todir="${portal.build.normal.bundled}/server/default/deploy">
+ <fileset dir="${portal.build.normal.bin}/setup" includes="portal-hsqldb-ds.xml"/>
+ </copy>
+ <copy todir="${portal.build.normal.bundled}">
+ <fileset dir="${jboss.home}">
+ <include name="bin/**"/>
+ <include name="client/**"/>
+ <include name="docs/**"/>
+ <include name="lib/**"/>
+ <include name="server/default/**"/>
+ </fileset>
+ </copy>
+ </target>
- <target name="main" depends="most"
- description="Executes the default target (most)."/>
+ <!--
+ | JBoss Portal ha bundled distribution
+ -->
- <target name="all" depends="createthirdparty, modules-all"
- description="Executes all modules and builds everything."/>
+ <target name="package-ha-bundled" depends="package-ha" if="jboss.home" description="package jboss-portal-ha bundled with jboss AS ">
+ <mkdir dir="${portal.build.ha.bundled}"/>
+ <antcall target="package-bundled">
+ <param name="todir" value="${portal.build.ha.bundled}"/>
+ </antcall>
+ <copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar">
+ <fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/>
+ </copy>
+ <copy todir="${portal.build.ha.bundled}">
+ <fileset dir="${jboss.home}">
+ <include name="bin/**"/>
+ <include name="clients/**"/>
+ <include name="docs/**"/>
+ <include name="lib/**"/>
+ <include name="server/all/**"/>
+ </fileset>
+ </copy>
+ <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/>
+ </target>
+
+ <!-- Create packages -->
+ <target name="zip">
- <target name="most" depends="createthirdparty, modules-most"
- description="Executes all modules and builds most everything."/>
+ <tar destfile="${portal.build.src}.tar.gz"
+ compression="gzip">
+ <tarfileset prefix="${portal.release.normal.name}-src" dir="${portal.build.src}"/>
+ </tar>
+ <checksum file="${portal.build.src}.tar.gz"/>
- <target name="help" depends="_buildmagic:help:build"
- description="Show this help message."/>
+ <zip destfile="${portal.build.normal.bin}.zip">
+ <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bin}"/>
+ </zip>
+ <checksum file="${portal.build.normal.bin}.zip"/>
+ <zip destfile="${portal.build.ha.bin}.zip">
+ <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bin}"/>
+ </zip>
+ <checksum file="${portal.build.ha.bin}.zip"/>
- <!--
- | Deploy the application
- -->
+ <zip destfile="${portal.build.normal.bundled}.zip">
+ <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bundled}"/>
+ </zip>
+ <checksum file="${portal.build.normal.bin}.zip"/>
- <!--<target name="initsetup">-->
- <!--<available property="cmsdata" file="${jboss.home}/server/${portal.deploy.dir}/data/portal"/> -->
- <!--</target>-->
+ <zip destfile="${portal.build.ha.bundled}.zip">
+ <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bundled}"/>
+ </zip>
+ <checksum file="${portal.build.ha.bundled}.zip"/>
- <!--<target name="setup" depends="initsetup" unless="cmsdata">-->
- <!--<unzip src="../core/src/bin/setup/cms-content.zip" dest="${jboss.home}/server/${portal.deploy.dir}/data"/>-->
- <!--</target>-->
-
- <target name="deploy"
- description="Deploy."
- depends="main">
- <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"/>
+ <!--
+ <tar destfile="${forums.build.src}.tar.gz"
+ compression="gzip">
+ <tarfileset dir="output/${forums.release.name}-src"
+ prefix="${forums.release.name}-src"/>
+ </tar>
+ <zip destfile="${forums.build.bin}.zip"
+ basedir="output/${forums.release.name}"/>
+ -->
</target>
- <target name="undeploy"
- description="Undeploy."
- depends="init">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
+ <!-- Build and compress everything -->
+ <target name="main" depends="licenses,build,package,zip" description="do the whole shebang - build source, doc, distro">
</target>
-
- <target name="exploded-deploy"
- description="Deploy exploded sar."
- depends="main">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/>
- <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/>
- <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar">
- <fileset dir="../core/output/resources/jboss-portal.sar"/>
- </copy>
- </target>
-
- <target name="javadoc">
- <mkdir dir="javadoc"/>
- <javadoc destdir="javadoc">
- <classpath>
- <fileset dir="../thirdparty" includes="**/*.jar"/>
- </classpath>
- <packageset dir="../common/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../server/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../api/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../portlet/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../jems/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../identity/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../bridge/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../faces/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../portlet-federation/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../format/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../theme/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../cms/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../core/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../security/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../wsrp/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../wsrp/src/generated">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../registration/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- </javadoc>
- </target>
-
- <!-- create the thirdparty folder from items in the repository -->
- <!-- then generate a new libraries.ent file and include it in -->
- <!-- the build -->
- <target name="createthirdparty" unless="inhibit.downloads"
- depends="check.inhibit.downloads">
- <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
- </target>
-
- <!-- check if thirdparty libraries are to be downloaded -->
- <target name="check.inhibit.downloads">
- <condition property="inhibit.downloads">
- <or>
- <uptodate property="dependencies.current"
- srcfile="build-thirdparty.xml"
- targetfile="../thirdparty/libraries.ent"/>
- <istrue value="${nodownload}"/>
- </or>
- </condition>
- </target>
-
</project>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6322 - trunk/core/src/resources/portal-core-sar/conf.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-02-16 13:19:04 -0500 (Fri, 16 Feb 2007)
New Revision: 6322
Modified:
trunk/core/src/resources/portal-core-sar/conf/login-config.xml
Log:
- clean up credentials
Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-16 16:21:24 UTC (rev 6321)
+++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-16 18:19:04 UTC (rev 6322)
@@ -70,10 +70,10 @@
<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
<module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
<module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
- <module-option name="java.naming.provider.url">ldap://dev39.qa.atl.jboss.com:10389/</module-option>
+ <module-option name="java.naming.provider.url">ldap://example.com:10389/</module-option>
<module-option name="java.naming.security.authentication">simple</module-option>
<module-option name="bindDN">cn=Directory Manager</module-option>
- <module-option name="bindCredential">qpq123qpq</module-option>
+ <module-option name="bindCredential">lolo</module-option>
<module-option name="baseCtxDN">ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
<module-option name="baseFilter">(uid={0})</module-option>
<module-option name="rolesCtxDN">ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6321 - in trunk: core/src/resources/portal-core-sar/conf/identity and 1 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-02-16 11:21:24 -0500 (Fri, 16 Feb 2007)
New Revision: 6321
Added:
trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapExtLoginModule.java
trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapLoginModule.java
Modified:
trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml
trunk/core/src/resources/portal-core-sar/conf/login-config.xml
Log:
- login modules that synchronize ldap users into db after successfull authentication
Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-02-16 15:31:35 UTC (rev 6320)
+++ trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-02-16 16:21:24 UTC (rev 6321)
@@ -33,7 +33,7 @@
<config>
<option>
<name>host</name>
- <value>localhost</value>
+ <value>example.com</value>
</option>
<option>
<name>port</name>
@@ -45,7 +45,7 @@
</option>
<option>
<name>adminPassword</name>
- <value>password</value>
+ <value>lolo</value>
</option>
<!--<option>
<name>protocol</name>
Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-16 15:31:35 UTC (rev 6320)
+++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-16 16:21:24 UTC (rev 6321)
@@ -48,8 +48,45 @@
<module-option name="hashAlgorithm">MD5</module-option>
<module-option name="hashEncoding">HEX</module-option>
<module-option name="additionalRole">Authenticated</module-option>
- </login-module>
--->
+ </login-module>-->
+
+
+ <!--Use can use this module instead of IdentityLoginModule to bind to LDAP. It simply extends JBossSX LdapExtLoginModule so
+ all configuration that can be applied to LdapExtLoginModule also can be applied here. For user that
+ was authenticated successfully it will try to take identity modules from portal, check if such user (and roles it belongs to)
+ is present, and if not it will try to create them. Then for all roles assigned to this authenticated principal it will
+ try to check and create them using identity modules. This behaviour can be disabled using "synchronizeRoles". You can also
+ define one "defaultAssignRole" that will be always assigned to synchronized user.
+ It is also possible to set option "synchronizeIdentity" to "false" so this module will act exactly like LdapExtLoginModule
+ but it will inject role defined in "additionalRole". For obvious reasons
+ this is designed to use with portal identity modules configured with DB and not LDAP-->
+ <!--There is also SynchronizingLdapLoginModule which provide the same set of options on top of JBossSX LdapLoginModule-->
+ <!--<login-module code="org.jboss.portal.identity.auth.SynchronizingLdapExtLoginModule" flag="required">
+ <module-option name="synchronizeIdentity">true</module-option>
+ <module-option name="synchronizeRoles">false</module-option>
+ <module-option name="additionalRole">Authenticated</module-option>
+ <module-option name="defaultAssignedRole">User</module-option>
+ <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+ <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
+ <module-option name="java.naming.provider.url">ldap://dev39.qa.atl.jboss.com:10389/</module-option>
+ <module-option name="java.naming.security.authentication">simple</module-option>
+ <module-option name="bindDN">cn=Directory Manager</module-option>
+ <module-option name="bindCredential">qpq123qpq</module-option>
+ <module-option name="baseCtxDN">ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
+ <module-option name="baseFilter">(uid={0})</module-option>
+ <module-option name="rolesCtxDN">ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
+ <module-option name="roleFilter">(member={1})</module-option>
+ <module-option name="roleAttributeID">cn</module-option>
+ <module-option name="roleRecursion">-1</module-option>
+ <module-option name="searchTimeLimit">10000</module-option>
+ <module-option name="searchScope">SUBTREE_SCOPE</module-option>
+ </login-module>-->
+
+
+ <!--To configure LDAP support with IdentityLoginModule please check documentation on how to
+ configure portal identity modules for this-->
<login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
<module-option name="unauthenticatedIdentity">guest</module-option>
<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
Added: trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapExtLoginModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapExtLoginModule.java (rev 0)
+++ trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapExtLoginModule.java 2007-02-16 16:21:24 UTC (rev 6321)
@@ -0,0 +1,335 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, 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.
+*/
+
+package org.jboss.portal.identity.auth;
+
+import org.jboss.security.auth.spi.LdapExtLoginModule;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.common.transaction.Transactions;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.callback.CallbackHandler;
+import javax.naming.InitialContext;
+import javax.transaction.TransactionManager;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Enumeration;
+import java.security.acl.Group;
+import java.security.Principal;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 0.1 $
+ */
+public class SynchronizingLdapExtLoginModule extends LdapExtLoginModule
+{
+ protected String additionalRole;
+ protected String defaultAssignedRole;
+ protected String synchronizeIdentity;
+ protected String synchronizeRoles;
+ protected String userModuleJNDIName;
+ protected String roleModuleJNDIName;
+ protected String membershipModuleJNDIName;
+
+
+ private UserModule userModule;
+ private RoleModule roleModule;
+ private MembershipModule membershipModule;
+
+ public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options)
+ {
+ super.initialize(subject, callbackHandler, sharedState, options);
+
+
+ // Get data
+ userModuleJNDIName = (String)options.get("userModuleJNDIName");
+ roleModuleJNDIName = (String)options.get("roleModuleJNDIName");
+ membershipModuleJNDIName = (String)options.get("membershipModuleJNDIName");
+ additionalRole = (String)options.get("additionalRole");
+ synchronizeIdentity = (String)options.get("synchronizeIdentity");
+ synchronizeRoles = (String)options.get("synchronizeRoles");
+ defaultAssignedRole = (String)options.get("defaultAssignedRole");
+
+ // Some info
+ log.trace("additionalRole = " + additionalRole);
+ log.trace("userModuleJNDIName = " + userModuleJNDIName);
+ log.trace("roleModuleJNDIName = " + roleModuleJNDIName);
+ log.trace("membershipModuleJNDIName = " + membershipModuleJNDIName);
+ log.trace("synchronizeIdentity = " + synchronizeIdentity);
+ log.trace("synchronizeRoles = " + synchronizeRoles);
+ log.trace("defaultAssignedRole = " + defaultAssignedRole);
+ }
+
+ protected UserModule getUserModule() throws Exception
+ {
+ if (userModule == null)
+ {
+ userModule = (UserModule)new InitialContext().lookup(userModuleJNDIName);
+ }
+ if (userModule == null)
+ {
+ throw new IdentityException("Cannot obtain UserModule using JNDI name:" + userModuleJNDIName);
+ }
+
+ return userModule;
+ }
+
+ protected RoleModule getRoleModule() throws Exception
+ {
+
+ if (roleModule == null)
+ {
+ roleModule = (RoleModule)new InitialContext().lookup(roleModuleJNDIName);
+ }
+ if (roleModule == null)
+ {
+ throw new IdentityException("Cannot obtain RoleModule using JNDI name:" + roleModuleJNDIName);
+ }
+ return roleModule;
+ }
+
+ protected MembershipModule getMembershipModule() throws Exception
+ {
+
+ if (membershipModule == null)
+ {
+ membershipModule = (MembershipModule)new InitialContext().lookup(membershipModuleJNDIName);
+ }
+ if (membershipModule == null)
+ {
+ throw new IdentityException("Cannot obtain MembershipModule using JNDI name:" + membershipModuleJNDIName);
+ }
+ return membershipModule;
+ }
+
+
+ protected boolean validatePassword(String string, String string1)
+ {
+ boolean validate = super.validatePassword(string, string1);
+
+ if (validate && isSynchronizeIdentity())
+ {
+ try
+ {
+ performSynchronization(getUsername(), string);
+ }
+ catch (Throwable e)
+ {
+ log.warn("Failed to sychronize identity of user: " + string, e);
+ }
+ }
+
+ return validate;
+ }
+
+ protected Group[] getRoleSets() throws LoginException
+ {
+ Group[] rolesGroup = super.getRoleSets();
+ if (additionalRole != null)
+ {
+ try
+ {
+ for (int i = 0; i < rolesGroup.length; i++)
+ {
+ Group group = rolesGroup[i];
+ if (group.getName().equals("Roles"))
+ {
+ group.addMember(createIdentity(additionalRole));
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ //just a try
+ log.error("Error when adding additional role: ", e);
+ }
+ }
+ return rolesGroup;
+ }
+
+ /** Subclass to use the PortalPrincipal to make the username easier to retrieve by the portal. */
+ protected Principal createIdentity(String username) throws Exception
+ {
+ return new UserPrincipal(username);
+ }
+
+ private void performSynchronization(final String name, final String password) throws Exception
+ {
+ final Group[] group = super.getRoleSets();
+
+ log.debug("$$Synchronizing user: " + name);
+
+ if (log.isDebugEnabled())
+ {
+ for (int i = 0; i < group.length; i++)
+ {
+ Group group1 = group[i];
+ log.debug("$$Role Group: " + group1.getName());
+ Enumeration xx = group1.members();
+ while (xx.hasMoreElements())
+ {
+ Principal o = (Principal)xx.nextElement();
+ log.debug("$$Principal in group: " + o.getName() + "; " + o.toString());
+
+ }
+ }
+ }
+ try
+ {
+ TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
+ Transactions.required(tm, new Transactions.Runnable()
+ {
+ public Object run() throws Exception
+ {
+ try
+ {
+
+
+ User user = null;
+ //check if user exist
+ try
+ {
+
+ user = getUserModule().findUserByUserName(name);
+
+ //synchronize password from LDAP to DB
+ if (!user.validatePassword(password))
+ {
+ user.updatePassword(password);
+ }
+ }
+ catch (Exception e)
+ {
+ // nothing as user can simply not exist
+ }
+
+ //if not try to synchronize it
+ if (user == null)
+ {
+ user = getUserModule().createUser(name, password);
+ }
+
+ Set rolesToAssign = new HashSet();
+
+ //now check and try synchronize all the roles
+ if (isSynchronizeRoles())
+ {
+
+ //based on code implementation its just one SimpleGroup called "Roles"
+ Group roleGroup = group[0];
+ Enumeration en = roleGroup.members();
+ while (en.hasMoreElements())
+ {
+ Principal p = (Principal)en.nextElement();
+ String roleName = p.getName();
+ log.debug("$$Processing role principal object related to current user: " + roleName);
+ //check if such role is present
+
+ Role role = null;
+ try
+ {
+ role = getRoleModule().findRoleByName(roleName);
+ }
+ catch (Exception e)
+ {
+ //
+ }
+
+ if (role == null)
+ {
+ try
+ {
+ role = getRoleModule().createRole(roleName, roleName);
+ }
+ catch (Throwable e)
+ {
+ log.warn("Error when trying to synchronize role: " + roleName, e);
+ continue;
+ }
+ }
+
+ rolesToAssign.add(role);
+ }
+ }
+
+ if (defaultAssignedRole != null)
+ {
+ try
+ {
+ rolesToAssign.add(getRoleModule().findRoleByName(defaultAssignedRole));
+ }
+ catch(Exception e)
+ {
+ //
+ log.warn("Cannot find defaultAssignedRole: " + defaultAssignedRole, e);
+ }
+ }
+
+ if (rolesToAssign.size() > 0)
+ {
+ getMembershipModule().assignRoles(user, rolesToAssign);
+ }
+
+ return null;
+
+ }
+ catch (Exception e)
+ {
+ throw new LoginException(e.toString());
+ }
+ }
+ });
+ }
+ catch (Exception e)
+ {
+ Throwable cause = e.getCause();
+ throw new LoginException(cause.toString());
+ }
+ }
+
+ protected boolean isSynchronizeIdentity()
+ {
+ if (synchronizeIdentity != null && synchronizeIdentity.equalsIgnoreCase("false"))
+ {
+ return Boolean.FALSE.booleanValue();
+ }
+ return Boolean.TRUE.booleanValue();
+ }
+
+ protected boolean isSynchronizeRoles()
+ {
+ if (synchronizeRoles != null && synchronizeRoles.equalsIgnoreCase("false"))
+ {
+ return Boolean.FALSE.booleanValue();
+ }
+ return Boolean.TRUE.booleanValue();
+ }
+
+
+}
Added: trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapLoginModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapLoginModule.java (rev 0)
+++ trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLdapLoginModule.java 2007-02-16 16:21:24 UTC (rev 6321)
@@ -0,0 +1,335 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, 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.
+*/
+
+package org.jboss.portal.identity.auth;
+
+import org.jboss.security.auth.spi.LdapLoginModule;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.common.transaction.Transactions;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.callback.CallbackHandler;
+import javax.naming.InitialContext;
+import javax.transaction.TransactionManager;
+import java.util.Map;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.HashSet;
+import java.security.acl.Group;
+import java.security.Principal;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 0.1 $
+ */
+public class SynchronizingLdapLoginModule extends LdapLoginModule
+{
+ protected String additionalRole;
+ protected String defaultAssignedRole;
+ protected String synchronizeIdentity;
+ protected String synchronizeRoles;
+ protected String userModuleJNDIName;
+ protected String roleModuleJNDIName;
+ protected String membershipModuleJNDIName;
+
+
+ private UserModule userModule;
+ private RoleModule roleModule;
+ private MembershipModule membershipModule;
+
+ public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options)
+ {
+ super.initialize(subject, callbackHandler, sharedState, options);
+
+
+ // Get data
+ userModuleJNDIName = (String)options.get("userModuleJNDIName");
+ roleModuleJNDIName = (String)options.get("roleModuleJNDIName");
+ membershipModuleJNDIName = (String)options.get("membershipModuleJNDIName");
+ additionalRole = (String)options.get("additionalRole");
+ synchronizeIdentity = (String)options.get("synchronizeIdentity");
+ synchronizeRoles = (String)options.get("synchronizeRoles");
+ defaultAssignedRole = (String)options.get("defaultAssignedRole");
+
+ // Some info
+ log.trace("additionalRole = " + additionalRole);
+ log.trace("userModuleJNDIName = " + userModuleJNDIName);
+ log.trace("roleModuleJNDIName = " + roleModuleJNDIName);
+ log.trace("membershipModuleJNDIName = " + membershipModuleJNDIName);
+ log.trace("synchronizeIdentity = " + synchronizeIdentity);
+ log.trace("synchronizeRoles = " + synchronizeRoles);
+ log.trace("defaultAssignedRole = " + defaultAssignedRole);
+ }
+
+ protected UserModule getUserModule() throws Exception
+ {
+ if (userModule == null)
+ {
+ userModule = (UserModule)new InitialContext().lookup(userModuleJNDIName);
+ }
+ if (userModule == null)
+ {
+ throw new IdentityException("Cannot obtain UserModule using JNDI name:" + userModuleJNDIName);
+ }
+
+ return userModule;
+ }
+
+ protected RoleModule getRoleModule() throws Exception
+ {
+
+ if (roleModule == null)
+ {
+ roleModule = (RoleModule)new InitialContext().lookup(roleModuleJNDIName);
+ }
+ if (roleModule == null)
+ {
+ throw new IdentityException("Cannot obtain RoleModule using JNDI name:" + roleModuleJNDIName);
+ }
+ return roleModule;
+ }
+
+ protected MembershipModule getMembershipModule() throws Exception
+ {
+
+ if (membershipModule == null)
+ {
+ membershipModule = (MembershipModule)new InitialContext().lookup(membershipModuleJNDIName);
+ }
+ if (membershipModule == null)
+ {
+ throw new IdentityException("Cannot obtain MembershipModule using JNDI name:" + membershipModuleJNDIName);
+ }
+ return membershipModule;
+ }
+
+
+ protected boolean validatePassword(String string, String string1)
+ {
+ boolean validate = super.validatePassword(string, string1);
+
+ if (validate && isSynchronizeIdentity())
+ {
+ try
+ {
+ performSynchronization(getUsername(), string);
+ }
+ catch (Throwable e)
+ {
+ log.warn("Failed to sychronize identity of user: " + string, e);
+ }
+ }
+
+ return validate;
+ }
+
+ protected Group[] getRoleSets() throws LoginException
+ {
+ Group[] rolesGroup = super.getRoleSets();
+ if (additionalRole != null)
+ {
+ try
+ {
+ for (int i = 0; i < rolesGroup.length; i++)
+ {
+ Group group = rolesGroup[i];
+ if (group.getName().equals("Roles"))
+ {
+ group.addMember(createIdentity(additionalRole));
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ //just a try
+ log.error("Error when adding additional role: ", e);
+ }
+ }
+ return rolesGroup;
+ }
+
+ /** Subclass to use the PortalPrincipal to make the username easier to retrieve by the portal. */
+ protected Principal createIdentity(String username) throws Exception
+ {
+ return new UserPrincipal(username);
+ }
+
+ private void performSynchronization(final String name, final String password) throws Exception
+ {
+ final Group[] group = super.getRoleSets();
+
+ log.debug("$$Synchronizing user: " + name);
+
+ if (log.isDebugEnabled())
+ {
+ for (int i = 0; i < group.length; i++)
+ {
+ Group group1 = group[i];
+ log.debug("$$Role Group: " + group1.getName());
+ Enumeration xx = group1.members();
+ while (xx.hasMoreElements())
+ {
+ Principal o = (Principal)xx.nextElement();
+ log.debug("$$Principal in group: " + o.getName() + "; " + o.toString());
+
+ }
+ }
+ }
+ try
+ {
+ TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
+ Transactions.required(tm, new Transactions.Runnable()
+ {
+ public Object run() throws Exception
+ {
+ try
+ {
+
+
+ User user = null;
+ //check if user exist
+ try
+ {
+
+ user = getUserModule().findUserByUserName(name);
+
+ //synchronize password from LDAP to DB
+ if (!user.validatePassword(password))
+ {
+ user.updatePassword(password);
+ }
+ }
+ catch (Exception e)
+ {
+ // nothing as user can simply not exist
+ }
+
+ //if not try to synchronize it
+ if (user == null)
+ {
+ user = getUserModule().createUser(name, password);
+ }
+
+ Set rolesToAssign = new HashSet();
+
+ //now check and try synchronize all the roles
+ if (isSynchronizeRoles())
+ {
+
+ //based on code implementation its just one SimpleGroup called "Roles"
+ Group roleGroup = group[0];
+ Enumeration en = roleGroup.members();
+ while (en.hasMoreElements())
+ {
+ Principal p = (Principal)en.nextElement();
+ String roleName = p.getName();
+ log.debug("$$Processing role principal object related to current user: " + roleName);
+ //check if such role is present
+
+ Role role = null;
+ try
+ {
+ role = getRoleModule().findRoleByName(roleName);
+ }
+ catch (Exception e)
+ {
+ //
+ }
+
+ if (role == null)
+ {
+ try
+ {
+ role = getRoleModule().createRole(roleName, roleName);
+ }
+ catch (Throwable e)
+ {
+ log.warn("Error when trying to synchronize role: " + roleName, e);
+ continue;
+ }
+ }
+
+ rolesToAssign.add(role);
+ }
+ }
+
+ if (defaultAssignedRole != null)
+ {
+ try
+ {
+ rolesToAssign.add(getRoleModule().findRoleByName(defaultAssignedRole));
+ }
+ catch(Exception e)
+ {
+ //
+ log.warn("Cannot find defaultAssignedRole: " + defaultAssignedRole, e);
+ }
+ }
+
+ if (rolesToAssign.size() > 0)
+ {
+ getMembershipModule().assignRoles(user, rolesToAssign);
+ }
+
+ return null;
+
+ }
+ catch (Exception e)
+ {
+ throw new LoginException(e.toString());
+ }
+ }
+ });
+ }
+ catch (Exception e)
+ {
+ Throwable cause = e.getCause();
+ throw new LoginException(cause.toString());
+ }
+ }
+
+ protected boolean isSynchronizeIdentity()
+ {
+ if (synchronizeIdentity != null && synchronizeIdentity.equalsIgnoreCase("false"))
+ {
+ return Boolean.FALSE.booleanValue();
+ }
+ return Boolean.TRUE.booleanValue();
+ }
+
+ protected boolean isSynchronizeRoles()
+ {
+ if (synchronizeRoles != null && synchronizeRoles.equalsIgnoreCase("false"))
+ {
+ return Boolean.FALSE.booleanValue();
+ }
+ return Boolean.TRUE.booleanValue();
+ }
+
+
+}
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6320 - trunk/build/ide/eclipse/3.2/team.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-16 10:31:35 -0500 (Fri, 16 Feb 2007)
New Revision: 6320
Modified:
trunk/build/ide/eclipse/3.2/team/anonymous-projectSet.psf
trunk/build/ide/eclipse/3.2/team/commiter-projectSet.psf
Log:
Eclipse project sets
Modified: trunk/build/ide/eclipse/3.2/team/anonymous-projectSet.psf
===================================================================
--- trunk/build/ide/eclipse/3.2/team/anonymous-projectSet.psf 2007-02-16 15:15:08 UTC (rev 6319)
+++ trunk/build/ide/eclipse/3.2/team/anonymous-projectSet.psf 2007-02-16 15:31:35 UTC (rev 6320)
@@ -3,28 +3,31 @@
<provider id="org.tigris.subversion.subclipse.core.svnnature">
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/api,api"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/bridge,bridge"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/build,build"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/cms,cms"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/common,common"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core,core"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-admin,core-admin"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-cms,core-cms"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-management,core-ma..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-samples,core-samples"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-search,core-search"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/faces,faces"/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/federation,federation"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/format,format"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/identity,identity"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/jems,jems"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/portlet,portlet"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/portlet-federation,port..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/registration,registration"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/samples,samples"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/search,search"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/security,security"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/server,server"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/test,test"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/testsuite,testsuite"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/theme,theme"/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/tools,tools"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/workflow,workflow"/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/wsrp,wsrp"/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/build,build"/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-cms,core-cms"/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/core-management,core-ma..."/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/testsuite,testsuite"/>
- <project reference="0.9.3,http://anonsvn.jboss.org/repos/portal/trunk/tools,tools"/>
</provider>
-</psf>
+</psf>
\ No newline at end of file
Modified: trunk/build/ide/eclipse/3.2/team/commiter-projectSet.psf
===================================================================
--- trunk/build/ide/eclipse/3.2/team/commiter-projectSet.psf 2007-02-16 15:15:08 UTC (rev 6319)
+++ trunk/build/ide/eclipse/3.2/team/commiter-projectSet.psf 2007-02-16 15:31:35 UTC (rev 6320)
@@ -3,28 +3,31 @@
<provider id="org.tigris.subversion.subclipse.core.svnnature">
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/api,api"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/bridge,bridge"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/build,build"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/cms,cms"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/common,common"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core,core"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-admin,core-admin"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-cms,core-cms"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-management,core-manag..."/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-samples,core-samples"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-search,core-search"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/faces,faces"/>
- <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/federation,federation"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/format,format"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/identity,identity"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/jems,jems"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/portlet,portlet"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/portlet-federation,portlet..."/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/registration,registration"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/samples,samples"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/search,search"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/security,security"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/server,server"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/test,test"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/testsuite,testsuite"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/theme,theme"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/tools,tools"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/workflow,workflow"/>
<project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/wsrp,wsrp"/>
- <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/build,build"/>
- <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-cms,core-cms"/>
- <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/core-management,core-manag..."/>
- <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/testsuite,testsuite"/>
- <project reference="0.9.3,https://svn.jboss.org/repos/portal/trunk/tools,tools"/>
</provider>
</psf>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6319 - trunk/core-admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-16 10:15:08 -0500 (Fri, 16 Feb 2007)
New Revision: 6319
Modified:
trunk/core-admin/
trunk/core-admin/.classpath
Log:
minor
Property changes on: trunk/core-admin
___________________________________________________________________
Name: svn:ignore
+ output
Modified: trunk/core-admin/.classpath
===================================================================
--- trunk/core-admin/.classpath 2007-02-16 15:09:04 UTC (rev 6318)
+++ trunk/core-admin/.classpath 2007-02-16 15:15:08 UTC (rev 6319)
@@ -14,5 +14,5 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="output/classes"/>
</classpath>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6318 - trunk/core/src/bin/portal-core-war/layouts/generic.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-16 10:09:04 -0500 (Fri, 16 Feb 2007)
New Revision: 6318
Modified:
trunk/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
Log:
minor
Modified: trunk/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2007-02-16 15:04:45 UTC (rev 6317)
+++ trunk/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2007-02-16 15:09:04 UTC (rev 6318)
@@ -4,12 +4,11 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title><%= PortalConstants.VERSION.toString() %>
- </title>
+ <title><%= PortalConstants.VERSION.toString() %></title>
<meta http-equiv="Content-Type" content="text/html;"/>
<!-- to correct the unsightly Flash of Unstyled Content. -->
<script type="text/javascript"></script>
- <!-- use the Nphalanx theme if nothing else was defined for the portal or the page -->
+ <!-- use the renaissance theme if nothing else was defined for the portal or the page -->
<p:theme themeName='renaissance'/>
<!-- inject header content that was generated by the portlets on the requested page -->
<p:headerContent/>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6317 - in trunk/core-admin: src/main/org/jboss/portal/core/portlet/management and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-16 10:04:45 -0500 (Fri, 16 Feb 2007)
New Revision: 6317
Added:
trunk/core-admin/.classpath
trunk/core-admin/.project
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java
Log:
- Dillonism
- Eclipse files
Added: trunk/core-admin/.classpath
===================================================================
--- trunk/core-admin/.classpath (rev 0)
+++ trunk/core-admin/.classpath 2007-02-16 15:04:45 UTC (rev 6317)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/faces"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/security"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/identity"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-tomahawk/lib/tomahawk.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/api"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/theme"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/core-admin/.project
===================================================================
--- trunk/core-admin/.project (rev 0)
+++ trunk/core-admin/.project 2007-02-16 15:04:45 UTC (rev 6317)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>core-admin</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-16 14:37:51 UTC (rev 6316)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-16 15:04:45 UTC (rev 6317)
@@ -22,9 +22,21 @@
******************************************************************************/
package org.jboss.portal.core.portlet.management;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+
import org.jboss.logging.Logger;
import org.jboss.portal.common.util.LocalizedString;
-import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
@@ -32,8 +44,6 @@
import org.jboss.portal.faces.matrix.Cell;
import org.jboss.portal.faces.matrix.Row;
import org.jboss.portal.faces.matrix.RowSetModel;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
@@ -41,22 +51,8 @@
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.security.AuthorizationDomainRegistry;
-import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-16 14:37:51 UTC (rev 6316)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-16 15:04:45 UTC (rev 6317)
@@ -22,6 +22,28 @@
******************************************************************************/
package org.jboss.portal.core.portlet.management;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+import javax.faces.validator.ValidatorException;
+
import org.apache.myfaces.custom.tree2.HtmlTree;
import org.apache.myfaces.custom.tree2.TreeModel;
import org.apache.myfaces.custom.tree2.TreeModelBase;
@@ -30,7 +52,6 @@
import org.jboss.portal.api.node.PortalNode;
import org.jboss.portal.common.MediaType;
import org.jboss.portal.common.util.LocalizedString;
-import org.jboss.portal.common.util.Tools;
import org.jboss.portal.core.aspects.controller.node.Navigation;
import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
import org.jboss.portal.core.model.instance.Instance;
@@ -44,13 +65,11 @@
import org.jboss.portal.faces.el.PropertyDef;
import org.jboss.portal.faces.el.TypeDef;
import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.security.AuthorizationDomainRegistry;
-import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
import org.jboss.portal.theme.LayoutService;
@@ -63,27 +82,6 @@
import org.jboss.portal.theme.strategy.LayoutStrategy;
import org.jboss.portlet.JBossRenderResponse;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import javax.faces.validator.ValidatorException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
/** The portal object manager bean. */
public class PortalObjectManagerBean implements Serializable
{
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-16 14:37:51 UTC (rev 6316)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-16 15:04:45 UTC (rev 6317)
@@ -22,42 +22,38 @@
******************************************************************************/
package org.jboss.portal.core.portlet.management;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+
import org.jboss.logging.Logger;
import org.jboss.portal.common.util.LocalizedString;
-import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.faces.matrix.Cell;
import org.jboss.portal.faces.matrix.Row;
import org.jboss.portal.faces.matrix.RowSetModel;
-import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
-import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
+import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.security.AuthorizationDomainRegistry;
-import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java 2007-02-16 14:37:51 UTC (rev 6316)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java 2007-02-16 15:04:45 UTC (rev 6317)
@@ -33,7 +33,6 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.SimplePropertyMap;
import java.util.ArrayList;
import java.util.Arrays;
@@ -156,8 +155,6 @@
{
//
Instance instance = manager.getSelectedInstance();
- PropertyMap prefs = instance.getProperties();
- PropertyMap newPrefs = new SimplePropertyMap(prefs);
//
String key = row.getHandback();
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java 2007-02-16 14:37:51 UTC (rev 6316)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java 2007-02-16 15:04:45 UTC (rev 6317)
@@ -23,7 +23,6 @@
package org.jboss.portal.core.portlet.management.actions;
import org.apache.myfaces.component.html.ext.HtmlDataTable;
-import org.jboss.logging.Logger;
import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
import javax.faces.application.FacesMessage;
@@ -37,8 +36,6 @@
*/
public class PropertyAction
{
- private Logger log = Logger.getLogger(getClass());
-
/** . */
private PortalObjectManagerBean pomgr;
@@ -48,8 +45,6 @@
private String propertyValue;
- private static final String ERROR_WRONG_NAME = "Wrong property name!";
-
private static final String ERROR_EMPTY_NAME = "Property name cannot be blank!";
public PortalObjectManagerBean getPortalObjectManager()
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6316 - trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-16 09:37:51 -0500 (Fri, 16 Feb 2007)
New Revision: 6316
Modified:
trunk/build/distrib.xml
Log:
updated distrib.xml to bundle portal-admin
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-02-16 14:34:37 UTC (rev 6315)
+++ trunk/build/distrib.xml 2007-02-16 14:37:51 UTC (rev 6316)
@@ -171,10 +171,13 @@
<copy todir="${portal.build.normal.bin}/jboss-portal.sar">
<fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
</copy>
+ <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar">
+ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
+ </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/**"/>
+ <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
</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">
@@ -195,6 +198,7 @@
<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/**"/>
+ <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/>
</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">
19 years, 2 months
- 1
- 0