July 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r7665 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-07-04 11:57:35 -0400 (Wed, 04 Jul 2007) New Revision: 7665 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml Log: JBPORTAL-1526: Force a width because of IE Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-04 13:06:28 UTC (rev 7664) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-04 15:57:35 UTC (rev 7665) @@ -114,11 +114,11 @@ value="#{pageManager.windowItemsMap[regionName]}"/> </h:selectManyListbox> </td> - <td valign="top"> + <td valign="top" width="250"> <h:commandButton value="Up" id="u_#{regionName}" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button layout-button"/> + styleClass="portlet-form-button layout-button"/><br/> <h:commandButton value="Down" id="d_#{regionName}" actionListener="#{pageManager.assignWindows}"

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7664 - in trunk: server/src/main/org/jboss/portal/server and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-07-04 09:06:28 -0400 (Wed, 04 Jul 2007) New Revision: 7664 Modified: trunk/build/distrib.xml trunk/server/src/main/org/jboss/portal/server/PortalConstants.java Log: 2.8 (will probably change) onward Modified: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-07-04 12:49:53 UTC (rev 7663) +++ trunk/build/distrib.xml 2007-07-04 13:06:28 UTC (rev 7664) @@ -1,8 +1,8 @@ <project default="main" name="JBoss Portal"> - <property name="source.dir" value="../../jboss-portal-2.6"/> + <property name="source.dir" value="../../jboss-portal-2.8"/> <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6"/> + <property name="release.version" value="2.8"/>  <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java =================================================================== --- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-07-04 12:49:53 UTC (rev 7663) +++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-07-04 13:06:28 UTC (rev 7664) @@ -36,7 +36,7 @@ { /** Current version. */ - public static final Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja"); + public static final Version VERSION = new Version("JBoss Portal", 2, 8, 0, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Lucifer"); /** The default portal name. */ public static final String DEFAULT_PORTAL_NAME = "default";

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7663 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-07-04 08:49:53 -0400 (Wed, 04 Jul 2007) New Revision: 7663 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml Log: JBPORTAL-1527:On the dashboard editor, changing the page to edit is not possible on IE6 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-07-04 12:35:36 UTC (rev 7662) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-07-04 12:49:53 UTC (rev 7663) @@ -53,7 +53,7 @@ id="pageNameSelector" value="#{dashboard.selectedPageName}" styleClass="portlet-form-field" - onclick="document.getElementById('page_selector_form').submit()"> + onchange="document.getElementById('page_selector_form').submit()"> <f:selectItems value="#{dashboard.pageItems}"/> </h:selectOneMenu> </h:form>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7662 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-07-04 08:35:36 -0400 (Wed, 04 Jul 2007) New Revision: 7662 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml Log: JBPORTAL-1527: On the dashboard editor, changing the page to edit is not possible on IE6 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-07-03 08:07:38 UTC (rev 7661) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-07-04 12:35:36 UTC (rev 7662) @@ -53,7 +53,7 @@ id="pageNameSelector" value="#{dashboard.selectedPageName}" styleClass="portlet-form-field" - onclick="document.getElementById('page_selector_form').submit()"> + onchange="document.getElementById('page_selector_form').submit()"> <f:selectItems value="#{dashboard.pageItems}"/> </h:selectOneMenu> </h:form>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7661 - in trunk/demo: conf and 6 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-07-03 04:07:38 -0400 (Tue, 03 Jul 2007) New Revision: 7661 Added: trunk/demo/conf/ trunk/demo/conf/core-cms/ trunk/demo/conf/core-cms/jboss-service.xml trunk/demo/conf/default-object.xml trunk/demo/conf/jboss-web.xml trunk/demo/portlets/ trunk/demo/portlets/flickrportlet/ trunk/demo/portlets/flickrportlet/flickrportlet.war trunk/demo/portlets/flickrportlet/resources/ trunk/demo/portlets/flickrportlet/resources/WEB-INF/ trunk/demo/portlets/flickrportlet/resources/WEB-INF/portlet-instances.xml trunk/demo/portlets/jbossforums/ trunk/demo/portlets/jbossforums/jboss-forums.ear Removed: trunk/demo/build.bat trunk/demo/build.sh trunk/demo/src/ Modified: trunk/demo/build.xml Log: Tools to create the demo portal (portal.demo.jboss.com) Deleted: trunk/demo/build.bat =================================================================== --- trunk/demo/build.bat 2007-07-02 01:53:03 UTC (rev 7660) +++ trunk/demo/build.bat 2007-07-03 08:07:38 UTC (rev 7661) @@ -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> -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 Deleted: trunk/demo/build.sh =================================================================== --- trunk/demo/build.sh 2007-07-02 01:53:03 UTC (rev 7660) +++ trunk/demo/build.sh 2007-07-03 08:07:38 UTC (rev 7661) @@ -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> -## - -# $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: trunk/demo/build.xml =================================================================== --- trunk/demo/build.xml 2007-07-02 01:53:03 UTC (rev 7660) +++ trunk/demo/build.xml 2007-07-03 08:07:38 UTC (rev 7661) @@ -1,162 +1,78 @@ <?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"> - ]> - - - - - - - - - - - - - <project default="main" name="JBoss Portal"> -  -  -  -  -  -  -  -  - &buildmagic; - &modules; - &defaults; - &tools; - &targets; + <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"/> + + <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> -  -  -  + <target name="delete-docs"> + <delete dir="${destination.dir}/${portal.name.dir}/docs"/> + </target> -  + <target name="delete-objectsdescriptors"> + <delete> + <fileset dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar" includes="**/*-object.xml"/> + </delete> + </target> - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> + <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 file="${destination.dir}/${portal.name.dir}.tgz"/> + </target> + + <target name="change-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"/> + </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="install-jbossforums"> + <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy"> + <fileset dir="portlets/jbossforums"/> + </copy> + </target> - <target name="configure" unless="configure.disable"> - -  - <property name="jboss-junit-configuration" value=""/> - <property name="junit.formatter.usefile" value="true"/> - -  - &libraries; - - <path id="library.classpath"> - </path> - -  - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - </path> - -  -  -  - -  - <call target="configure-defaults"/> - <call target="configure-tools"/> - -  -  -  - <property name="javadoc.private" value="true"/> - <property name="javadoc.protected" value="false"/> - - </target> - - -  -  -  -  -  -  -  - - <target name="compile" - description="Compile all source files." - depends="generate-parsers, - _default:compile-classes, - _default:compile-etc, - _default:compile-resources"> -  - </target> - - <target name="generate-parsers" depends="init"> - </target> - -  -  -  -  -  -  -  - - <target name="output" - description="Generate all target output." - depends="compile"> - </target> - -  - <target name="package-tests" depends="init"> - </target> - - -  -  -  - -  - <target name="clean" depends="_default:clean"> -  - </target> - -  -  -  -  -  - - <target name="docs" depends="_default:docs"> -  - </target> - -  -  -  - - <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, change-context, 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: trunk/demo/conf/core-cms/jboss-service.xml =================================================================== --- trunk/demo/conf/core-cms/jboss-service.xml (rev 0) +++ trunk/demo/conf/core-cms/jboss-service.xml 2007-07-03 08:07:38 UTC (rev 7661) @@ -0,0 +1,570 @@ + + +<server> + +  + <mbean + code="org.jboss.portal.cms.management.CMSImpl" + name="portal:service=Management,type=CMS,name=Default" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <depends + optional-attribute-name="CMS" + proxy-type="attribute">portal:service=CMS</depends> + <xmbean/> + </mbean> + + <mbean + code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" + name="portal:service=Hibernate,type=CMS" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends> + <attribute name="DoChecking">true</attribute> + <attribute name="ConfigLocation">conf/hibernate/cms/hibernate.cfg.xml</attribute> + <attribute name="JNDIName">java:/portal/cms/CMSSessionFactory</attribute> + </mbean> + + <mbean + code="org.jboss.portal.cms.impl.jcr.JCRCMS" + name="portal:service=CMS" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> +  + <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends> + <depends>portal:service=JAASLoginModule</depends> + <depends>portal:service=Hibernate,type=CMS</depends> + <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> + +  + <depends optional-attribute-name="ApprovePublishWorkflow" proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> + + <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends> + <attribute name="DoChecking">true</attribute> + <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute> + <attribute name="DefaultLocale">en</attribute> + <attribute name="RepositoryName">PortalRepository</attribute> + <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute> + <attribute name="IdentitySessionFactory">java:/portal/IdentitySessionFactory</attribute> + <attribute name="Config"> + <Repository> +  + +  + <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore"> + <param name="schemaObjectPrefix" value="RepositoryEntry"/> + <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/> + </FileSystem> + +  +  + <Security appName="Jackrabbit"> + <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"/> + <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule"> +  + <param name="anonid" value="anonymous"/> + </LoginModule> + </Security> + <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/> + <Workspace name="${wsp.name}"> +  + +  + <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore"> + <param name="schemaObjectPrefix" value="CMSEntry"/> + <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/> + </FileSystem> +  +  + +  + +  + <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager"> + <param name="schemaObjectPrefix" value="WSP"/> + <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/> + <param name="externalBLOBs" value="false"/> + </PersistenceManager> + +  +  + + <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> + <param name="path" value="${wsp.home}/index"/> + <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter" /> + <param name="useCompoundFile" value="true"/> + <param name="minMergeDocs" value="100"/> + <param name="volatileIdleTime" value="3"/> + <param name="maxMergeDocs" value="100000"/> + <param name="mergeFactor" value="10"/> + <param name="bufferSize" value="10"/> + <param name="cacheSize" value="1000"/> + <param name="forceConsistencyCheck" value="false"/> + <param name="autoRepair" value="true"/> + </SearchIndex> + </Workspace> + <Versioning rootPath="${rep.home}/versions"> +  + +  + <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore"> + <param name="schemaObjectPrefix" value="VersionEntry"/> + <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/> + </FileSystem> + +  +  + +  + +  + <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager"> + <param name="schemaObjectPrefix" value="Version"/> + <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/> + <param name="externalBLOBs" value="false"/> + </PersistenceManager> + +  +  + </Versioning> + </Repository> + </attribute> + <attribute name="JNDIName">java:portal/CMS</attribute> + </mbean> + +  + + <mbean + code="org.jboss.portal.core.cms.CMSObjectCommandFactoryService" + name="portal:commandFactory=CMSObject" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="TargetWindowRef">default.default.CMSWindow</attribute> + <depends + optional-attribute-name="CMSService" + proxy-type="attribute">portal:service=CMS</depends> + <depends + optional-attribute-name="ServerConfig" + proxy-type="attribute">portal:service=ServerConfig</depends> + </mbean> + <mbean + code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" + name="portal:commandFactory=Delegate,path=content" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="Path">/content</attribute> + <depends + optional-attribute-name="DelegatingFactory" + proxy-type="attribute">portal:commandFactory=Delegating</depends> + <depends + optional-attribute-name="DelegateFactory" + proxy-type="attribute">portal:commandFactory=CMSObject</depends> + </mbean> + + <mbean + code="org.jboss.portal.core.cms.CMSObjectURLFactory" + name="portal:urlFactory=CMSObject" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="Path">/content</attribute> + <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends> + </mbean> + +  + <mbean code="org.jboss.cache.TreeCache" + name="cms.pm.cache:service=TreeCache"> + + <depends>jboss:service=Naming</depends> + <depends>jboss:service=TransactionManager</depends> + <depends>portal:service=Hibernate,type=CMS</depends> + <depends>portal:service=CMS</depends> + +  + <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute> + +  +  + +  + <attribute name="IsolationLevel">REPEATABLE_READ</attribute> + + +  +  +  +  + <attribute name="CacheMode">LOCAL</attribute> + +  + <attribute name="UseReplQueue">false</attribute> + +  + <attribute name="ReplQueueInterval">0</attribute> + +  + <attribute name="ReplQueueMaxElements">0</attribute> + +  + <attribute name="ClusterName">JCRPMCache</attribute> + +  + + <attribute name="ClusterConfig"> + <config> +  +  + <UDP mcast_addr="228.1.2.3" mcast_port="48866" + ip_ttl="64" ip_mcast="true" + receive_on_all_interfaces="true" + mcast_send_buf_size="150000" mcast_recv_buf_size="80000" + ucast_send_buf_size="150000" ucast_recv_buf_size="80000" + loopback="false"/> + <PING timeout="2000" num_initial_members="3" + up_thread="false" down_thread="false"/> + <MERGE2 min_interval="10000" max_interval="20000"/> +  + <FD_SOCK/> + <VERIFY_SUSPECT timeout="1500" + up_thread="false" down_thread="false"/> + <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800" + max_xmit_size="8192" up_thread="false" down_thread="false"/> + <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10" + down_thread="false"/> + <pbcast.STABLE desired_avg_gossip="20000" + up_thread="false" down_thread="false"/> + <FRAG frag_size="8192" + down_thread="false" up_thread="false"/> + <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" + shun="true" print_local_addr="true"/> + <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/> + </config> + </attribute> + +  +  + +  + <attribute name="InitialStateRetrievalTimeout">20000</attribute> + +  + <attribute name="SyncReplTimeout">20000</attribute> + +  + <attribute name="LockAcquisitionTimeout">15000</attribute> + + +  + <attribute name="EvictionPolicyClass"></attribute> + +  +  + +  + <attribute name="CacheLoaderConfiguration"> + <config> + <passivation>false</passivation> + <preload></preload> + <shared>false</shared> + <cacheloader> + <class>org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</class> + <properties></properties> + <async>false</async> + <fetchPersistentState>false</fetchPersistentState> + <ignoreModifications>false</ignoreModifications> + </cacheloader> + </config> + </attribute> +  +  + </mbean> + +  + <mbean + code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Cms" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends-list optional-attribute-name="InterceptorNames"> + <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> + </depends-list> + </mbean> + +  + <mbean + code="org.jboss.portal.cms.security.AuthorizationManagerImpl" + name="portal:service=AuthorizationManager,type=cms" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="JNDIName">java:portal/cms/AuthorizationManager</attribute> + <depends optional-attribute-name="Provider" proxy-type="attribute"> + portal:service=AuthorizationProvider,type=cms + </depends> + </mbean> + <mbean + code="org.jboss.portal.cms.security.AuthorizationProviderImpl" + name="portal:service=AuthorizationProvider,type=cms" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> + </mbean> + +  + <mbean + code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" + name="portal:service=Interceptor,type=Cms,name=ACL" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="JNDIName">java:/portal/cms/ACLInterceptor</attribute> + <attribute name="CmsSessionFactory">java:/portal/cms/CMSSessionFactory</attribute> + <attribute name="IdentitySessionFactory">java:/portal/IdentitySessionFactory</attribute> + <attribute name="DefaultPolicy"> + <![CDATA[ + <policy> +  + <criteria name="path" value="/"> + <permission name="cms" action="read"> + <role name="Anonymous"/> + </permission> + <permission name="cms" action="write"> + <role name="User"/> + </permission> + <permission name="cms" action="manage"> + <role name="Admin"/> + </permission> + </criteria> +  + <criteria name="path" value="/default"> + <permission name="cms" action="read"> + <role name="Anonymous"/> + </permission> + <permission name="cms" action="write"> + <role name="User"/> + </permission> + <permission name="cms" action="manage"> + <role name="Admin"/> + </permission> + </criteria> +  + <criteria name="path" value="/default/private"> + <permission name="cms" action="manage"> + <role name="Admin"/> + </permission> + </criteria> + </policy> + ]]> + </attribute> + <depends optional-attribute-name="AuthorizationManager" proxy-type="attribute"> + portal:service=AuthorizationManager,type=cms + </depends> + <depends>portal:service=Hibernate,type=CMS</depends> + <depends>portal:service=Module,type=IdentityServiceController</depends> + </mbean> + +  + <mbean + code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" + name="portal:service=Interceptor,type=Cms,name=ApprovalWorkflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="JNDIName">java:/portal/cms/ApprovalWorkflowInterceptor</attribute> + <depends>portal:service=Hibernate,type=CMS</depends> + </mbean> + + <mbean + code="org.jboss.portal.core.cms.aspect.IdentityBindingInterceptor" + name="portal:service=Interceptor,type=Server,name=CMSIdentityBinding" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> + + <mbean + code="org.jboss.portal.server.impl.invocation.JBossInterceptorRegistration" + name="portal:service=InterceptorRegistration,type=Server,name=CMSIdentityBinding" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends + optional-attribute-name="InterceptorName">portal:service=Interceptor,type=Server,name=CMSIdentityBinding</depends> + <depends + optional-attribute-name="StackFactory">portal:service=InterceptorStackFactory,type=Server</depends> + </mbean> + +  + <mbean + code="org.jboss.portal.core.cms.content.InternalCMSContentProvider" + name="portal:service=ContentRenderer,type=cms" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="ContentType">cms</attribute> + <attribute name="DecorateContent">false</attribute> + <attribute name="PortletInstanceName">CMSPortletInstance</attribute> + <depends + optional-attribute-name="Registry" + proxy-type="attribute">portal:service=ContentProviderRegistry</depends> + <depends + optional-attribute-name="CommandFactory" + proxy-type="attribute">portal:commandFactory=CMSObject</depends> + </mbean> +</server> Added: trunk/demo/conf/default-object.xml =================================================================== --- trunk/demo/conf/default-object.xml (rev 0) +++ trunk/demo/conf/default-object.xml 2007-07-03 08:07:38 UTC (rev 7661) @@ -0,0 +1,397 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!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> +  + <property> + <name>layout.id</name> + <value>generic</value> + </property> +  + <property> + <name>theme.id</name> + <value>renaissance</value> + </property> +  + <property> + <name>theme.renderSetId</name> + <value>divRenderer</value> + </property> +  + <property> + <name>portal.defaultObjectName</name> + <value>default</value> + </property> + +  + <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> + +  + <property> + <name>layout.id</name> + <value>generic</value> + </property> + +  + <property> + <name>theme.id</name> + <value>renaissance</value> + </property> + +  + <property> + <name>theme.renderSetId</name> + <value>divRenderer</value> + </property> + +  + <property> + <name>theme.dyna.dnd_enabled</name> + <value>true</value> + </property> + +  + <property> + <name>theme.dyna.partial_refresh_enabled</name> + <value>false</value> + </property> + +  + <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: trunk/demo/conf/default-object.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/demo/conf/jboss-web.xml =================================================================== --- trunk/demo/conf/jboss-web.xml (rev 0) +++ trunk/demo/conf/jboss-web.xml 2007-07-03 08:07:38 UTC (rev 7661) @@ -0,0 +1,35 @@ +<?xml version="1.0"?> + + +<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/portlets/flickrportlet/flickrportlet.war =================================================================== (Binary files differ) Property changes on: trunk/demo/portlets/flickrportlet/flickrportlet.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/demo/portlets/flickrportlet/resources/WEB-INF/portlet-instances.xml =================================================================== --- trunk/demo/portlets/flickrportlet/resources/WEB-INF/portlet-instances.xml (rev 0) +++ trunk/demo/portlets/flickrportlet/resources/WEB-INF/portlet-instances.xml 2007-07-03 08:07:38 UTC (rev 7661) @@ -0,0 +1,50 @@ +<?xml version="1.0" standalone="yes"?> + + +<!DOCTYPE deployments PUBLIC + "-//JBoss Portal//DTD Portlet Instances 2.6//EN" + "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd"> + +<deployments> + <deployment> + <instance> + <instance-id>FlickrPortletInstance</instance-id> + <portlet-ref>FlickrPortlet</portlet-ref> + <preferences> + <preference> + <name>userName</name> + <value>jbossportal</value> + </preference> + <preference> + <name>perPageMinimized</name> + <value>9</value> + </preference> + <preference> + <name>perPageMaximized</name> + <value>27</value> + </preference> + </preferences> + </instance> + </deployment> +</deployments> \ No newline at end of file Property changes on: trunk/demo/portlets/flickrportlet/resources/WEB-INF/portlet-instances.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/demo/portlets/jbossforums/jboss-forums.ear =================================================================== (Binary files differ) Property changes on: trunk/demo/portlets/jbossforums/jboss-forums.ear ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7660 - in docs/branches/JBoss_Portal_Branch_2_6/userGuide/en: modules and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-07-01 21:53:03 -0400 (Sun, 01 Jul 2007) New Revision: 7660 Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/images/intro/dashboard.png docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/intro.xml Log: - JBPORTAL-1516: updated documentation after rename. Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/images/intro/dashboard.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/intro.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/intro.xml 2007-07-02 01:25:13 UTC (rev 7659) +++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/intro.xml 2007-07-02 01:53:03 UTC (rev 7660) @@ -483,7 +483,7 @@ <sect1 id="dashboard"> <title>Personal Dashboard</title> <para>Once logged in, all users/administrations of the portal can access a personal dashboard by clicking the - <emphasis>Dashboard</emphasis> link at the top-right of the portal page. + <emphasis>Dashboard</emphasis> link at the top-right of the portal page. Note how the links changed. <mediaobject> <imageobject> <imagedata fileref="images/intro/dashboard.png" format="png" align="center" valign="middle"/> @@ -495,7 +495,7 @@ location, if the administrator allows this functionality. Changes made in this fashion will also be persisted. </para> <para> - It is also possible to copy the content of a shared page to your dashboard so you can customize it to your + It is also possible to copy the content of a shared page to your dashboard so you can customize it to your liking. Just click the <emphasis>'Copy to my dashboard'</emphasis> link at the top right of the page. This will clone the page and add it to your personal dashboard as a page with the same name. <mediaobject> @@ -507,7 +507,7 @@ <sect2 id="dashboard_configure"> <title>Configuring your personal dashboard</title> <para> - You can configure your dashboard by using the top-right menu item labeled <emphasis>'Edit Page'</emphasis>: + You can configure your dashboard by using the top-right menu item labeled <emphasis>'Configure dashboard'</emphasis>: <mediaobject> <imageobject> <imagedata fileref="images/intro/dashboard_configure.png" format="png" align="center"

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7659 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-war/WEB-INF/jsp/header and 3 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-07-01 21:25:13 -0400 (Sun, 01 Jul 2007) New Revision: 7659 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java Log: - JBPORTAL-1391: obsolete (line causing the exception has changed), however it was probably caused due to a null portletApp. - JBPORTAL-1394: Do not attempt to close the valve if the container didn't properly start. - JBPORTAL-1516: renamed 'Edit page' to 'Configure dashboard'. - JBPORTAL-1518: Updated theme section to look similar to the other sections. - JBPORTAL-1510: do not underline portlet-mode links on hover... Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-30 01:05:22 UTC (rev 7658) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-07-02 01:25:13 UTC (rev 7659) @@ -608,6 +608,10 @@ padding-left: 3px; } +.portlet-mode-maximized:hover { + text-decoration: none; +} + .portlet-mode-minimized { background-image: url( images/ico_16_minimize.gif ); background-repeat: no-repeat; @@ -619,6 +623,10 @@ padding-left: 3px; } +.portlet-mode-minimized:hover { + text-decoration: none; +} + .portlet-mode-normal { background-image: url( images/ico_16_normal.gif ); width: 16px; @@ -630,6 +638,10 @@ padding-left: 3px; } +.portlet-mode-normal:hover { + text-decoration: none; +} + .portlet-mode-help { background-image: url( images/ico_16_help.gif ); width: 16px; @@ -641,6 +653,10 @@ padding-left: 3px; } +.portlet-mode-help:hover { + text-decoration: none; +} + .portlet-mode-edit { background-image: url( images/ico_edit.gif ); background-repeat: no-repeat; @@ -652,6 +668,10 @@ padding-left: 3px; } +.portlet-mode-edit:hover { + text-decoration: none; +} + .portlet-mode-remove { background-image: url( images/ico_16_remove.gif ); background-repeat: no-repeat; @@ -663,6 +683,10 @@ padding-left: 3px; } +.portlet-mode-remove:hover { + text-decoration: none; +} + .portlet-mode-view { background-image: url( images/ico_cancel.gif ); background-repeat: no-repeat; @@ -675,6 +699,10 @@ padding-right: 20px; } +.portlet-mode-view:hover { + text-decoration: none; +} + .portlet-mode-reload { background-image: url( images/ico_16_reload.gif ); background-repeat: no-repeat; @@ -686,6 +714,10 @@ padding-left: 3px; } +.portlet-mode-reload:hover { + text-decoration: none; +} + .portlet-mode-hide { background-image: url( images/ico_16_swizzleclosed.gif ); background-repeat: no-repeat; @@ -696,6 +728,10 @@ cursor: pointer; } +.portlet-mode-hide:hover { + text-decoration: none; +} + /********************** * Copyright Selectors * ***********************/ Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-06-30 01:05:22 UTC (rev 7658) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-07-02 01:25:13 UTC (rev 7659) @@ -1,5 +1,5 @@ +<%@ page import="org.jboss.portal.api.PortalURL" %> <%@ page import="org.jboss.portal.identity.User" %> -<%@ page import="org.jboss.portal.api.PortalURL" %> <% User user = (User)request.getAttribute("org.jboss.portal.header.USER"); @@ -16,39 +16,39 @@ if (user == null) { %> - <a href="<%= loginURL %>">Login</a> +<a href="<%= loginURL %>">Login</a> <% - } - else - { +} +else +{ %> Logged in as: <%= user.getUserName() %><br/><br/> <% - if (dashboardURL != null) - { + if (dashboardURL != null) + { %>  <a href="<%= dashboardURL %>">Dashboard</a>  |<% - } + } - if (defaultPortalURL != null) - { + if (defaultPortalURL != null) + { %>  <a href="<%= defaultPortalURL %>">Portal</a>  |<% - } + } - if (adminPortalURL != null) - { + if (adminPortalURL != null) + { %>  <a href="<%= adminPortalURL %>">Admin</a>  |<% - } + } - if (editDashboardURL != null) - { -%>  <a href="<%= editDashboardURL %>">Edit page</a>  |<% - } - - if (copyToDashboardURL != null) - { + if (editDashboardURL != null) + { +%>  <a href="<%= editDashboardURL %>">Configure dashboard</a>  |<% + } + + if (copyToDashboardURL != null) + { %>  <a href="<%= copyToDashboardURL %>">Copy to my dashboard</a>  |<% - } + } %>  <a href="<%= signOutURL %>">Logout</a> <% } Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-30 01:05:22 UTC (rev 7658) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-07-02 01:25:13 UTC (rev 7659) @@ -1,8 +1,8 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="dashboardsTemplate.xhtml"> @@ -27,17 +27,22 @@  <br/> - <h3>Dashboard theme properties:</h3> - <p>The settings defined here will be applied to the dashboards including all the pages and windows unless they have been assigned with different settings</p> - <ui:decorate template="common/editTheme.xhtml"> - <ui:param name="theme" value="#{dashboardmgr.theme}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" styleClass="portlet-form-button"/> - </ui:define> - </ui:decorate> - </ui:define> + <div class="portlet-area-header">Dashboard theme properties</div> + <div class="portlet-area-body"> + The settings defined here will be applied to the dashboards including all the pages and windows unless they + have been assigned with different settings. + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + styleClass="portlet-form-button"/> + </ui:define> + </ui:decorate> + </div> + </ui:define> + </ui:composition> </div> Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-06-30 01:05:22 UTC (rev 7658) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-07-02 01:25:13 UTC (rev 7659) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.container; -import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; -import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory; +import org.jboss.portal.portlet.container.PortletApplicationContext; +import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext; +import org.jboss.portal.portlet.container.PortletApplicationRegistry; +import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; +import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; +import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory; import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; import org.jboss.portal.portlet.metadata.JBossPortletMetaData; -import org.jboss.portal.portlet.container.PortletApplicationContext; -import org.jboss.portal.portlet.container.PortletApplicationRegistry; -import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext; -import org.jboss.portal.portlet.container.PortletContainer; import javax.servlet.ServletContext; import java.util.Iterator; @@ -106,7 +106,7 @@ registrationContext = registry.registerPortletApplication(portletApp); // - for (Iterator i = portletAppMD.getPortlets().iterator();i.hasNext();) + for (Iterator i = portletAppMD.getPortlets().iterator(); i.hasNext();) { PortletMetaData portletMD = (PortletMetaData)i.next(); @@ -139,31 +139,35 @@ public void stopPortletApplication() { - for (Iterator i = portletApp.getPortletContainers().iterator();i.hasNext();) + // if the portlet application wasn't properly started, we shouldn't be trying to stop it + if (portletApp != null) { - PortletContainerImpl container = (PortletContainerImpl)i.next(); - try + for (Iterator i = portletApp.getPortletContainers().iterator(); i.hasNext();) { - registrationContext.unregisterPortlet(container); - container.stop(); + PortletContainerImpl container = (PortletContainerImpl)i.next(); + try + { + registrationContext.unregisterPortlet(container); + container.stop(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + // + portletApp.removeContainer(container); + container.setApplication(null); } - catch (Exception e) - { - e.printStackTrace(); - } // - portletApp.removeContainer(container); - container.setApplication(null); + registry.unregisterPortletApplication(portletApp); + portletApp.stop(); + + // + portletApp = null; + registrationContext = null; } - - // - registry.unregisterPortletApplication(portletApp); - portletApp.stop(); - - // - portletApp = null; - registrationContext = null; } public void startPortletContainer(String portletName) throws Exception Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-06-30 01:05:22 UTC (rev 7658) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-07-02 01:25:13 UTC (rev 7659) @@ -23,47 +23,47 @@ package org.jboss.portal.portlet.impl.jsr168; import org.jboss.logging.Logger; +import org.jboss.portal.common.concurrent.Valve; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor; +import org.jboss.portal.portlet.container.PortletApplication; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.container.PortletInitializationException; +import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl; +import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl; import org.jboss.portal.portlet.impl.jsr168.api.PortletConfigImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl; +import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; import org.jboss.portal.portlet.impl.jsr168.api.RenderResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl; -import org.jboss.portal.portlet.container.PortletInitializationException; -import org.jboss.portal.portlet.container.PortletApplication; -import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletPreferencesMetaData; import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData; import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; -import org.jboss.portal.portlet.metadata.JBossPortletMetaData; import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; +import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.SecurityErrorResponse; import org.jboss.portal.portlet.invocation.response.UnavailableResponse; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor; -import org.jboss.portal.common.concurrent.Valve; -import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.portlet.metadata.JBossPortletMetaData; +import javax.portlet.Portlet; import javax.portlet.PortletConfig; -import javax.portlet.Portlet; -import javax.portlet.PreferencesValidator; import javax.portlet.PortletException; import javax.portlet.PortletSecurityException; +import javax.portlet.PreferencesValidator; import javax.portlet.UnavailableException; import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Collections; -import java.io.IOException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -271,20 +271,20 @@ public void stop() { - // Wait at most 60 seconds before all invocations are done - log.debug("Trying to close the valve"); - boolean done = valve.closing(60000); - if (!done) + // if the portlet is not started, we shouldn't be trying to stop it... + if (started) { - log.warn("The valve is still holding invocations, continue anyway"); - } + // Wait at most 60 seconds before all invocations are done + log.debug("Trying to close the valve"); + boolean done = valve.closing(60000); + if (!done) + { + log.warn("The valve is still holding invocations, continue anyway"); + } - // - valve.closed(); + // + valve.closed(); - // - if (started) - { // started = false;

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits July 2007