Author: thomas.heute(a)jboss.com Date: 2007-07-06 08:39:42 -0400 (Fri, 06 Jul 2007) New Revision: 7679 Added: branches/JBoss_Portal_Branch_2_6/demo/build.properties branches/JBoss_Portal_Branch_2_6/demo/conf/ branches/JBoss_Portal_Branch_2_6/demo/conf/default-object.xml branches/JBoss_Portal_Branch_2_6/demo/conf/jboss-web.xml branches/JBoss_Portal_Branch_2_6/demo/portlets/ trunk/demo/.project trunk/demo/bin/ trunk/demo/bin/jbossws-1.2.1.GA.zip trunk/demo/build.properties trunk/demo/conf/jbossws/ Removed: branches/JBoss_Portal_Branch_2_6/demo/build.bat branches/JBoss_Portal_Branch_2_6/demo/build.sh branches/JBoss_Portal_Branch_2_6/demo/src/ Modified: branches/JBoss_Portal_Branch_2_6/demo/build.xml trunk/demo/build.xml Log: * Make the script update WS * Sync between Branch_2_6 and trunk Deleted: branches/JBoss_Portal_Branch_2_6/demo/build.bat =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/build.bat 2007-07-06 10:20:08 UTC (rev 7678) +++ branches/JBoss_Portal_Branch_2_6/demo/build.bat 2007-07-06 12:39:42 UTC (rev 7679) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 2 2005-01-14 23:01:32Z vietj $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Added: branches/JBoss_Portal_Branch_2_6/demo/build.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/build.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_6/demo/build.properties 2007-07-06 12:39:42 UTC (rev 7679) @@ -0,0 +1,10 @@ +# Location of the JBoss Portal + 4.0.5 AS bundle +portal.bundle.url=/home/theute/Portal/Demo/jboss-portal-2.6/build/output/jboss-portal-2.6-bundled.zip +# Name used as top directory in the bundle +portal.name.dir=jboss-portal-2.6 +# Where to create the demo website and associated tgz file +destination.dir=/home/theute/Portal/demoWebsite +# Which WS to use. (keep this to use the one embedded here) +jbossws.location=./bin/jbossws-1.2.1.GA.zip +# Where to put temporary files during the construction of the portal demo +tmp.dir=/tmp Deleted: branches/JBoss_Portal_Branch_2_6/demo/build.sh =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/build.sh 2007-07-06 10:20:08 UTC (rev 7678) +++ branches/JBoss_Portal_Branch_2_6/demo/build.sh 2007-07-06 12:39:42 UTC (rev 7679) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com&gt; -## - -# $Id: build.sh 2 2005-01-14 23:01:32Z vietj $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Modified: branches/JBoss_Portal_Branch_2_6/demo/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/build.xml 2007-07-06 10:20:08 UTC (rev 7678) +++ branches/JBoss_Portal_Branch_2_6/demo/build.xml 2007-07-06 12:39:42 UTC (rev 7679) @@ -1,162 +1,83 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> - -<!-- $Id: build.xml 7200 2007-05-06 16:33:54Z julien(a)jboss.com $ --> - -<!--+======================================================================+--> -<!--| JBoss Portal (The OpenSource Portal) Build File |--> -<!--| |--> -<!--| Distributable under LGPL 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 file="build.properties"/> + + <target name="init"> + <mkdir dir="${destination.dir}"/> + </target> + + <target name="unzip-bundle" depends="init"> + <unzip src="${portal.bundle.url}" dest="${destination.dir}"/> + </target> + + <target name="delete-jmxconsole"> + <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jmx-console.war"/> + </target> - &buildmagic; - &modules; - &defaults; - &tools; - &targets; + <target name="delete-docs"> + <delete dir="${destination.dir}/${portal.name.dir}/docs"/> + </target> - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> + <target name="delete-objectsdescriptors"> + <delete> + <fileset dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar" includes="**/*-object.xml"/> + </delete> + </target> - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> + <target name="install-objectsdescriptor"> + <copy file="conf/default-object.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/conf/data"/> + </target> + + <target name="clean"> + <delete dir="${destination.dir}/${portal.name.dir}"/> + <delete dir="${tmp.dir}/flickrportlet"/> + <delete dir="${tmp.dir}/jbossws"/> + <delete file="${destination.dir}/${portal.name.dir}.tgz"/> + </target> + + <target name="update-context"> + <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war"/> + <copy overwrite="true" file="conf/jboss-web.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF"/> + </target> + + <target name="install-flickrportlet"> + <unwar src="portlets/flickrportlet/flickrportlet.war" dest="${tmp.dir}/flickrportlet"/> + <delete file="${tmp.dir}/flickrportlet/WEB-INF/sun-web.xml"/> + <delete file="${tmp.dir}/flickrportlet/WEB-INF/lib/log4j-1.2.13.jar"/> + <copy todir="${tmp.dir}/flickrportlet"> + <fileset dir="portlets/flickrportlet/resources"/> + </copy> + <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy/jboss-portal.sar/flickrportlet.war"> + <fileset dir="${tmp.dir}/flickrportlet"/> + </copy> + </target> - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> + <target name="install-jbossforums"> + <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy"> + <fileset dir="portlets/jbossforums"/> + </copy> + </target> + + <!-- Fix WS issues on JBoss 4.0.x --> + <target name="update-ws"> + <unzip src="${jbossws.location}" dest="${tmp.dir}/jbossws"/> + <ant inheritAll="false" dir="${tmp.dir}/jbossws" antfile="build.xml" target="deploy-jboss40-jdk14"> + <property name="jboss40.home" value="${destination.dir}/${portal.name.dir}"/> + <property name="jboss.server.instance" value="default"/> + </ant> + </target> - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> - - <target name="configure" unless="configure.disable"> - - <!-- Configure some properties --> - <property name="jboss-junit-configuration" value=""/> - <property name="junit.formatter.usefile" value="true"/> - - <!-- Configure thirdparty libraries --> - &libraries; - - <path id="library.classpath"> - </path> - - <!-- Configure modules --> - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - </path> - - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> - - <!-- Configure defaults & build tools --> - <call target="configure-defaults"/> - <call target="configure-tools"/> - - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> - <property name="javadoc.private" value="true"/> - <property name="javadoc.protected" value="false"/> - - </target> - - - <!--+====================================================================+--> - <!--| 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" - description="Compile all source files." - depends="generate-parsers, - _default:compile-classes, - _default:compile-etc, - _default:compile-resources"> - <!-- Add module specific elements here. --> - </target> - - <target name="generate-parsers" depends="init"> - </target> - - <!--+====================================================================+--> - <!--| 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="compile"> - </target> - - <!-- generates artifacts used for tests, requires output to be previously run --> - <target name="package-tests" depends="init"> - </target> - - - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> - <target name="clean" depends="_default:clean"> - <!-- Add module specific elements here. --> - </target> - - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> - - <target name="docs" depends="_default:docs"> - <!-- Add module specific elements here. --> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - <target name="tests" depends="init"> - </target> - -</project> + <target name="activate-workflow"> + <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy/jboss-portal.sar/portal-cms.sar/META-INF"> + <fileset file="conf/core-cms/jboss-service.xml"/> + </copy> + </target> + + <target name="main" depends="unzip-bundle, delete-docs, delete-jmxconsole, delete-objectsdescriptors, update-context, update-ws, install-objectsdescriptor, install-jbossforums, activate-workflow, install-flickrportlet"> + <tar destfile="${destination.dir}/${portal.name.dir}.tar" basedir="${destination.dir}/${portal.name.dir}" longfile="gnu"/> + <gzip zipfile="${destination.dir}/${portal.name.dir}.tgz" src="${destination.dir}/${portal.name.dir}.tar"/> + <delete file="${destination.dir}/${portal.name.dir}.tar"/> + </target> + +</project> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_6/demo/conf/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/conf/default-object.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/demo/conf/default-object.xml 2007-07-06 12:39:42 UTC (rev 7679) @@ -0,0 +1,397 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE deployments PUBLIC + "-//JBoss Portal//DTD Portal Object 2.6//EN" + "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> + +<deployments> + <deployment> + <context> + <context-name/> + <properties> + <!-- + | Set the layout for the default portal, see also portal-layouts.xml. + --> + <property> + <name>layout.id</name> + <value>generic</value> + </property> + <!-- + | Set the theme for the default portal, see also portal-themes.xml. + --> + <property> + <name>theme.id</name> + <value>renaissance</value> + </property> + <!-- + | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml + --> + <property> + <name>theme.renderSetId</name> + <value>divRenderer</value> + </property> + <!-- + | The default page name, if the property is not explicited then the default page name is "default" + --> + <property> + <name>portal.defaultObjectName</name> + <value>default</value> + </property> + + <!-- Control policy config --> + <property> + <name>control.portal.access_denied</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.unavailable</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.not_found</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.resource_uri</name> + <value>/WEB-INF/jsp/error/portal.jsp</value> + </property> + <property> + <name>control.page.access_denied</name> + <value>hide</value> + </property> + <property> + <name>control.page.unavailable</name> + <value>hide</value> + </property> + <property> + <name>control.page.not_found</name> + <value>hide</value> + </property> + <property> + <name>control.page.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.resource_uri</name> + <value>/WEB-INF/jsp/error/page.jsp</value> + </property> + </properties> + </context> + </deployment> + <deployment> + <parent-ref/> + <if-exists>keep</if-exists> + <portal> + <portal-name>default</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <security-constraint> + <policy-permission> + <action-name>viewrecursive</action-name> + <action-name>personalizerecursive</action-name> + <unchecked/> + </policy-permission> + </security-constraint> + <page> + <page-name>default</page-name> + <properties> + <property> + <name>order</name> + <value>1</value> + </property> + </properties> + <window> + <window-name>JSPPortletWindow</window-name> + <instance-ref>JSPPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>CMSWindow</window-name> + <content> + <content-type>cms</content-type> + <content-uri>/default/index.html</content-uri> + </content> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>UserPortletWindow</window-name> + <instance-ref>UserPortletInstance</instance-ref> + <region>left</region> + <height>1</height> + </window> + </page> + <page> + <page-name>Samples</page-name> + <properties> + <property> + <name>order</name> + <value>2</value> + </property> + </properties> + <window> + <window-name>FlickrPortletWindow</window-name> + <instance-ref>FlickrPortletInstance</instance-ref> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>NewsPortletWindow</window-name> + <instance-ref>NewsPortletInstance</instance-ref> + <region>center</region> + <height>1</height> + </window> + <window> + <window-name>WeatherPortletWindow</window-name> + <instance-ref>WeatherPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + </page> + </portal> + </deployment> + <deployment> + <if-exists>keep</if-exists> + <context> + <context-name>dashboard</context-name> + <properties> + + <!-- + | Set the layout for the default portal, see also portal-layouts.xml. + --> + <property> + <name>layout.id</name> + <value>generic</value> + </property> + + <!-- + | Set the theme for the default portal, see also portal-themes.xml. + --> + <property> + <name>theme.id</name> + <value>renaissance</value> + </property> + + <!-- + | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml + --> + <property> + <name>theme.renderSetId</name> + <value>divRenderer</value> + </property> + + <!-- + | Set the dnd property + --> + <property> + <name>theme.dyna.dnd_enabled</name> + <value>true</value> + </property> + + <!-- + | Set the partial refresh property + --> + <property> + <name>theme.dyna.partial_refresh_enabled</name> + <value>false</value> + </property> + + <!-- Control policy config --> + <property> + <name>control.portal.access_denied</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.unavailable</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.not_found</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.resource_uri</name> + <value>/WEB-INF/jsp/error/portal.jsp</value> + </property> + <property> + <name>control.page.access_denied</name> + <value>hide</value> + </property> + <property> + <name>control.page.unavailable</name> + <value>hide</value> + </property> + <property> + <name>control.page.not_found</name> + <value>hide</value> + </property> + <property> + <name>control.page.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.resource_uri</name> + <value>/WEB-INF/jsp/error/page.jsp</value> + </property> + </properties> + </context> + </deployment> + <deployment> + <parent-ref/> + <if-exists>keep</if-exists> + <portal> + <portal-name>template</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <page> + <page-name>default</page-name> + <properties> + <property> + <name>order</name> + <value>1</value> + </property> + </properties> + <window> + <window-name>JSPPortletWindow</window-name> + <instance-ref>JSPPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>CMSWindow</window-name> + <content> + <content-type>cms</content-type> + <content-uri>/default/index.html</content-uri> + </content> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>UserPortletWindow</window-name> + <instance-ref>UserPortletInstance</instance-ref> + <region>left</region> + <height>1</height> + </window> + </page> + </portal> + </deployment> + <deployment> + <parent-ref/> + <if-exists>keep</if-exists> + <portal> + <portal-name>admin</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <security-constraint> + <policy-permission> + <action-name>viewrecursive</action-name> + <role-name>Admin</role-name> + </policy-permission> + </security-constraint> + <page> + <page-name>default</page-name> + <window> + <window-name>AdminPortletWindow</window-name> + <instance-ref>AdminPortletInstance</instance-ref> + <region>center</region> + <height>0</height> + </window> + </page> + <page> + <page-name>Members</page-name> + <window> + <window-name>UserPortletWindow</window-name> + <instance-ref>UserPortletInstance</instance-ref> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>RolePortletWindow</window-name> + <instance-ref>RolePortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + </page> + <page> + <page-name>CMS</page-name> + <window> + <window-name>CMSAdminPortletWindow</window-name> + <instance-ref>CMSAdminPortletInstance</instance-ref> + <region>center</region> + <height>0</height> + </window> + </page> + </portal> + </deployment> +</deployments> Property changes on: branches/JBoss_Portal_Branch_2_6/demo/conf/default-object.xml ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_6/demo/conf/jboss-web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/demo/conf/jboss-web.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/demo/conf/jboss-web.xml 2007-07-06 12:39:42 UTC (rev 7679) @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<jboss-web> + <security-domain>java:jaas/portal</security-domain> + <context-root>/</context-root> + <replication-config> + <replication-trigger>SET</replication-trigger> + </replication-config> + <resource-ref> + <res-ref-name>jdbc/PortalDS</res-ref-name> + <jndi-name>java:PortalDS</jndi-name> + </resource-ref> +</jboss-web> Added: trunk/demo/.project =================================================================== --- trunk/demo/.project (rev 0) +++ trunk/demo/.project 2007-07-06 12:39:42 UTC (rev 7679) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>demo</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Added: trunk/demo/bin/jbossws-1.2.1.GA.zip =================================================================== (Binary files differ) Property changes on: trunk/demo/bin/jbossws-1.2.1.GA.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/demo/build.properties =================================================================== --- trunk/demo/build.properties (rev 0) +++ trunk/demo/build.properties 2007-07-06 12:39:42 UTC (rev 7679) @@ -0,0 +1,10 @@ +# Location of the JBoss Portal + 4.0.5 AS bundle +portal.bundle.url=/home/theute/Portal/Demo/jboss-portal-2.6/build/output/jboss-portal-2.6-bundled.zip +# Name used as top directory in the bundle +portal.name.dir=jboss-portal-2.6 +# Where to create the demo website and associated tgz file +destination.dir=/home/theute/Portal/demoWebsite +# Which WS to use. (keep this to use the one embedded here) +jbossws.location=./bin/jbossws-1.2.1.GA.zip +# Where to put temporary files during the construction of the portal demo +tmp.dir=/tmp Modified: trunk/demo/build.xml =================================================================== --- trunk/demo/build.xml 2007-07-06 10:20:08 UTC (rev 7678) +++ trunk/demo/build.xml 2007-07-06 12:39:42 UTC (rev 7679) @@ -1,13 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project default="main" name="JBoss Portal"> - - <property name="portal.bundle.url" value="/home/theute/Downloads/jboss-portal-2.6-bundled.zip"/> - - <property name="portal.name.dir" value="jboss-portal-2.6"/> - <property name="destination.dir" value="/home/theute/Portal/demoWebsite"/> - <property name="tmp.dir" value="/tmp"/> - + <property file="build.properties"/> + <target name="init"> <mkdir dir="${destination.dir}"/> </target> @@ -37,12 +32,13 @@ <target name="clean"> <delete dir="${destination.dir}/${portal.name.dir}"/> <delete dir="${tmp.dir}/flickrportlet"/> + <delete dir="${tmp.dir}/jbossws"/> <delete file="${destination.dir}/${portal.name.dir}.tgz"/> </target> - <target name="change-context"> + <target name="update-context"> <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war"/> - <copy file="conf/jboss-web.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF"/> + <copy overwrite="true" file="conf/jboss-web.xml" todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF"/> </target> <target name="install-flickrportlet"> @@ -62,6 +58,15 @@ <fileset dir="portlets/jbossforums"/> </copy> </target> + + <!-- Fix WS issues on JBoss 4.0.x --> + <target name="update-ws"> + <unzip src="${jbossws.location}" dest="${tmp.dir}/jbossws"/> + <ant inheritAll="false" dir="${tmp.dir}/jbossws" antfile="build.xml" target="deploy-jboss40-jdk14"> + <property name="jboss40.home" value="${destination.dir}/${portal.name.dir}"/> + <property name="jboss.server.instance" value="default"/> + </ant> + </target> <target name="activate-workflow"> <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy/jboss-portal.sar/portal-cms.sar/META-INF"> @@ -69,7 +74,7 @@ </copy> </target> - <target name="main" depends="unzip-bundle, delete-docs, delete-jmxconsole, delete-objectsdescriptors, change-context, install-objectsdescriptor, install-jbossforums, activate-workflow, install-flickrportlet"> + <target name="main" depends="unzip-bundle, delete-docs, delete-jmxconsole, delete-objectsdescriptors, update-context, update-ws, install-objectsdescriptor, install-jbossforums, activate-workflow, install-flickrportlet"> <tar destfile="${destination.dir}/${portal.name.dir}.tar" basedir="${destination.dir}/${portal.name.dir}" longfile="gnu"/> <gzip zipfile="${destination.dir}/${portal.name.dir}.tgz" src="${destination.dir}/${portal.name.dir}.tar"/> <delete file="${destination.dir}/${portal.name.dir}.tar"/>