JBoss Portal SVN: r8061 - in branches/JBoss_Portal_Branch_2_6: build and 10 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-27 19:16:46 -0400 (Mon, 27 Aug 2007)
New Revision: 8061
Removed:
branches/JBoss_Portal_Branch_2_6/identity/
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_6/build/build.xml
branches/JBoss_Portal_Branch_2_6/cms/build.xml
branches/JBoss_Portal_Branch_2_6/core-admin/build.xml
branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
branches/JBoss_Portal_Branch_2_6/core-management/build.xml
branches/JBoss_Portal_Branch_2_6/core-samples/build.xml
branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/search/build.xml
branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent
branches/JBoss_Portal_Branch_2_6/workflow/build.xml
Log:
detach identity module from the build
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -50,6 +50,7 @@
<componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/web" version="1.0.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0.0-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.1.1"/>
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -116,7 +116,6 @@
<module name="faces"/>
<module name="api"/>
<module name="server"/>
- <module name="identity"/>
<module name="portlet"/>
<module name="portlet-server"/>
<module name="portlet-federation"/>
@@ -141,7 +140,7 @@
<group name="portal">
<include
- modules="api, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
+ modules="api, jems, server, security, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
</group>
<group name="cms">
@@ -351,9 +350,6 @@
<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>
Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -131,7 +131,7 @@
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-search.classpath"/>
<!-- fine grained security integration -->
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<!-- clustered testcases related -->
<path refid="jboss.portal-portlet.classpath"/>
@@ -251,7 +251,7 @@
<fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/>
-->
<fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/>
- <fileset dir="${jboss.portal-identity.lib}" includes="portal-identity-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/>
<fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-testframework-lib.jar"/>
</jar>
@@ -488,7 +488,7 @@
<path refid="jboss.cache.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
<!-- fine grained security integration -->
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jjboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<!-- workflow integration -->
<path refid="jbpm.jaronly.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -132,7 +132,7 @@
<path refid="jboss.portal-portlet-server.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-portlet-federation.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
@@ -236,7 +236,7 @@
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portal-portlet-server.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
@@ -316,7 +316,7 @@
</copy>
<!-- hibernate configuration for identity -->
<copy todir="${build.resources}/jboss-portal/conf/hibernate/user">
- <fileset dir="${jboss.portal-identity.root}/resources/hibernate" includes="domain.hbm.xml"/>
+ <fileset dir="${jboss.portal/modules/identity.root}/resources/" includes="domain.hbm.xml"/>
</copy>
<copy todir="${build.resources}/jboss-portal/lib">
<fileset dir="${build.lib}" includes="portal-core-lib.jar"/>
@@ -335,7 +335,7 @@
<fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/>
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
<fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/>
- <fileset dir="${jboss.portal-identity.root}/lib" includes="portal-identity-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/>
<fileset dir="${ehcache.ehcache.lib}" includes="ehcache.jar"/>
<fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
@@ -349,7 +349,7 @@
<!--dtd-->
<copy todir="${build.resources}/jboss-portal/dtd">
- <fileset dir="${jboss.portal-identity.root}/resources/dtd" includes="*.dtd"/>
+ <fileset dir="${jboss.portal/modules/identity.root}/resources/dtd" includes="*.dtd"/>
</copy>
</target>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -112,7 +112,7 @@
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-portlet-federation.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-security.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -127,7 +127,7 @@
<path refid="jboss.portal-search.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-management/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/core-management/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -125,7 +125,7 @@
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-portlet-federation.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-core.classpath"/>
</path>
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -121,7 +121,7 @@
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-core.classpath"/>
<path refid="jboss.portal-format.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
</path>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -113,7 +113,7 @@
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-portlet-federation.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-security.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/search/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/search/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/search/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -76,7 +76,7 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
</path>
Modified: branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent
===================================================================
--- branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-27 23:16:46 UTC (rev 8061)
@@ -157,13 +157,6 @@
<pathelement path="${jboss.portal-security.lib}/portal-security-test-lib.jar"/>
</path>
- <!-- identity -->
- <property name="jboss.portal-identity.root" value="${project.root}/identity/output"/>
- <property name="jboss.portal-identity.lib" value="${jboss.portal-identity.root}/lib"/>
- <path id="jboss.portal-identity.classpath">
- <pathelement path="${jboss.portal-identity.lib}/portal-identity-lib.jar"/>
- </path>
-
<!-- workflow -->
<property name="jboss.portal-workflow.root" value="${project.root}/workflow/output"/>
<property name="jboss.portal-workflow.lib" value="${jboss.portal-workflow.root}/lib"/>
Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-08-27 22:08:13 UTC (rev 8060)
+++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-08-27 23:16:46 UTC (rev 8061)
@@ -118,7 +118,7 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
</path>
18 years, 8 months
JBoss Portal SVN: r8060 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-27 18:08:13 -0400 (Mon, 27 Aug 2007)
New Revision: 8060
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
Log:
Fixed incorrect last commit (not sure what happened...)
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-08-27 21:28:58 UTC (rev 8059)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-08-27 22:08:13 UTC (rev 8060)
@@ -37,6 +37,9 @@
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
18 years, 8 months
JBoss Portal SVN: r8059 - modules/identity/trunk/build.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-27 17:28:58 -0400 (Mon, 27 Aug 2007)
New Revision: 8059
Modified:
modules/identity/trunk/build/build-thirdparty.xml
Log:
some cleaning
Modified: modules/identity/trunk/build/build-thirdparty.xml
===================================================================
--- modules/identity/trunk/build/build-thirdparty.xml 2007-08-27 21:18:46 UTC (rev 8058)
+++ modules/identity/trunk/build/build-thirdparty.xml 2007-08-27 21:28:58 UTC (rev 8059)
@@ -47,61 +47,6 @@
are pushed to the http://repository.jboss.com site.
-->
-
- <!--
- <componentref name="apache-ant" version="1.6.5"/>
- <componentref name="jackrabbit" version="1.1.1"/>
- <componentref name="apache-myfaces" version="1.1.5"/>
- <componentref name="apache-beanutils" version="1.7.0"/>
- <componentref name="apache-codec" version="1.3.0"/>
-
- <componentref name="apache-digester" version="1.6"/>
- <componentref name="apache-fileupload" version="1.1.1"/>
- <componentref name="apache-httpclient" version="3.0.1"/>
- <componentref name="apache-lang" version="2.1"/>
-
-
- <componentref name="apache-lucene" version="1.4.3"/>
- <componentref name="apache-net" version="1.4.1"/>
-
-
-
- <componentref name="commons-el" version="1.0"/>
- <componentref name="dbunit" version="2.1"/>
- <componentref name="dom4j" version="1.6.1jboss"/>
- <componentref name="ehcache" version="1.2.2"/>
- <componentref name="el" version="1.0"/>
- <componentref name="facelets" version="1.1.1-patched-jboss4.2"/>
-
- <componentref name="httpunit" version="1.6"/>
- <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
- <componentref name="jakarta-cactus" version="1.7.2"/>
- <componentref name="jakarta-io" version="1.0"/>
-
- <componentref name="jboss/aop" version="1.5.2.GA"/>
-
- <componentref name="jboss/cache" version="1.4.0.SP1"/>
- <componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/>
- <componentref name="jboss/jbossws14" version="1.0.0.GA"/>
-
-
- <componentref name="jboss/remoting" version="1.4.3.GA"/>
- <componentref name="jboss/serialization" version="1.0.1.GA"/>
-
- <componentref name="jflex" version="1.4.0"/>
- <componentref name="jwebunit" version="1.2"/>
- <componentref name="jcr" version="1.0"/>
- <componentref name="jetty" version="6.0"/>
- <componentref name="jgroups" version="2.2.8"/>
- <componentref name="jsunit" version="2.1"/>
-
- <componentref name="odmg" version="3.0"/>
- <componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="qdox" version="1.4"/>
- <componentref name="trove" version="1.0.2"/>
- <componentref name="sleepycat" version="3.0.12"/>
- <componentref name="slf4j" version="1.0.2"/>-->
-
<componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/>
<componentref name="apache-log4j" version="1.2.8"/>
@@ -123,7 +68,6 @@
<componentref name="apache-collections" version="3.1"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="asm" version="1.5.3"/>
- <!--<componentref name="beanshell" version="1.3.0"/>-->
<componentref name="cglib" version="2.1.3"/>
<componentref name="hsqldb" version="1.8.0.2"/>
18 years, 8 months
JBoss Portal SVN: r8058 - modules/identity/trunk/build.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-27 17:18:46 -0400 (Mon, 27 Aug 2007)
New Revision: 8058
Modified:
modules/identity/trunk/build/build-thirdparty.xml
Log:
correct thirdparty libs
Modified: modules/identity/trunk/build/build-thirdparty.xml
===================================================================
--- modules/identity/trunk/build/build-thirdparty.xml 2007-08-27 21:18:22 UTC (rev 8057)
+++ modules/identity/trunk/build/build-thirdparty.xml 2007-08-27 21:18:46 UTC (rev 8058)
@@ -74,7 +74,6 @@
<componentref name="facelets" version="1.1.1-patched-jboss4.2"/>
<componentref name="httpunit" version="1.6"/>
- <componentref name="hsqldb" version="1.8.0.2"/>
<componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
<componentref name="jakarta-cactus" version="1.7.2"/>
<componentref name="jakarta-io" version="1.0"/>
@@ -118,14 +117,15 @@
<componentref name="hibernate" version="3.2.0.CR2"/>
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
- <!--<componentref name="sun-jaf" version="1.0.2"/>-->
+ <componentref name="sun-jaf" version="1.0.2"/>
- <!--<componentref name="apache-collections" version="3.1"/>-->
+ <componentref name="apache-collections" version="3.1"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="asm" version="1.5.3"/>
<!--<componentref name="beanshell" version="1.3.0"/>-->
<componentref name="cglib" version="2.1.3"/>
+ <componentref name="hsqldb" version="1.8.0.2"/>
</build>
18 years, 8 months
JBoss Portal SVN: r8057 - modules/identity/trunk/testsuite.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-27 17:18:22 -0400 (Mon, 27 Aug 2007)
New Revision: 8057
Modified:
modules/identity/trunk/testsuite/build.xml
Log:
correct testsuite settings
Modified: modules/identity/trunk/testsuite/build.xml
===================================================================
--- modules/identity/trunk/testsuite/build.xml 2007-08-27 20:45:30 UTC (rev 8056)
+++ modules/identity/trunk/testsuite/build.xml 2007-08-27 21:18:22 UTC (rev 8057)
@@ -119,46 +119,8 @@
<sequential>
<antcall target="agent-deploy"/>
<antcall target="internal-test-module">
- <param name="module" value="cms"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="faces"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="format"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="security"/>
- </antcall>
- <antcall target="internal-test-module">
<param name="module" value="identity"/>
</antcall>
- <antcall target="internal-test-module">
- <param name="module" value="server"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="portlet"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="portlet-server"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="portlet-federation"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="wsrp"/>
- </antcall>
-<!--
- <antcall target="internal-test-module">
- <param name="module" value="theme"/>
- </antcall>
--->
- <antcall target="internal-test-module">
- <param name="module" value="core"/>
- </antcall>
- <antcall target="internal-test-module">
- <param name="module" value="widget"/>
- </antcall>
<antcall target="agent-undeploy"/>
</sequential>
<server:stop name="default"/>
18 years, 8 months
JBoss Portal SVN: r8056 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-27 16:45:30 -0400 (Mon, 27 Aug 2007)
New Revision: 8056
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
- JBPORTAL-1644:
+ Removed drop down action.
+ Mistakenly added Make Default to windows list.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-27 20:44:47 UTC (rev 8055)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-27 20:45:30 UTC (rev 8056)
@@ -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="objectTemplate.xhtml">
@@ -21,27 +21,13 @@
<tr>
<h:form id="portal_form">
<td><span class="portlet-font">Create a portal:</span></td>
- <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/></td>
- <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/></td>
+ <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field"
+ required="true"/></td>
+ <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal"
+ styleClass="portlet-form-button"/></td>
<td><h:message for="name" errorClass="portlet-msg-error"/></td>
</h:form>
</tr>
- <!-- Default portal -->
- <tr>
- <h:form>
- <td>
- <span class="portlet-font">Default portal:</span>
- </td>
- <td>
- <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultObjectName}">
- <f:selectItems value="#{portalobjectmgr.portalItems}" />
- </h:selectOneMenu>
- </td>
- <td colspan="2">
- <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
- </td>
- </h:form>
- </tr>
</table>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-27 20:44:47 UTC (rev 8055)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-27 20:45:30 UTC (rev 8056)
@@ -56,25 +56,6 @@
</td>
</h:form>
</tr>
- <!-- Default page -->
- <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}">
- <tr>
- <h:form>
- <td>
- <span class="portlet-font">Default page:</span>
- </td>
- <td>
- <h:selectOneMenu id="name" styleClass="portlet-form-field"
- value="#{portalAction.defaultObjectName}">
- <f:selectItems value="#{portalobjectmgr.portalPageItems}"/>
- </h:selectOneMenu>
- </td>
- <td colspan="2">
- <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
- </td>
- </h:form>
- </tr>
- </h:panelGroup>
</table>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 20:44:47 UTC (rev 8055)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 20:45:30 UTC (rev 8056)
@@ -48,15 +48,6 @@
<h:outputText value="Delete"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- <c:choose>
- <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
- <h:outputText value="Make Default"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </c:when>
- <c:otherwise> | <h:outputText value="Default"/>
- </c:otherwise>
- </c:choose>
</td>
</tr>
</c:forEach>
18 years, 8 months
JBoss Portal SVN: r8055 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-27 16:44:47 -0400 (Mon, 27 Aug 2007)
New Revision: 8055
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
- JBPORTAL-1644:
+ Removed drop down action.
+ Mistakenly added Make Default to windows list.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-27 20:38:05 UTC (rev 8054)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-27 20:44:47 UTC (rev 8055)
@@ -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="objectTemplate.xhtml">
@@ -21,27 +21,13 @@
<tr>
<h:form id="portal_form">
<td><span class="portlet-font">Create a portal:</span></td>
- <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/></td>
- <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/></td>
+ <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field"
+ required="true"/></td>
+ <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal"
+ styleClass="portlet-form-button"/></td>
<td><h:message for="name" errorClass="portlet-msg-error"/></td>
</h:form>
</tr>
- <!-- Default portal -->
- <tr>
- <h:form>
- <td>
- <span class="portlet-font">Default portal:</span>
- </td>
- <td>
- <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultObjectName}">
- <f:selectItems value="#{portalobjectmgr.portalItems}" />
- </h:selectOneMenu>
- </td>
- <td colspan="2">
- <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
- </td>
- </h:form>
- </tr>
</table>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-27 20:38:05 UTC (rev 8054)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-27 20:44:47 UTC (rev 8055)
@@ -56,25 +56,6 @@
</td>
</h:form>
</tr>
- <!-- Default page -->
- <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}">
- <tr>
- <h:form>
- <td>
- <span class="portlet-font">Default page:</span>
- </td>
- <td>
- <h:selectOneMenu id="name" styleClass="portlet-form-field"
- value="#{portalAction.defaultObjectName}">
- <f:selectItems value="#{portalobjectmgr.portalPageItems}"/>
- </h:selectOneMenu>
- </td>
- <td colspan="2">
- <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
- </td>
- </h:form>
- </tr>
- </h:panelGroup>
</table>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 20:38:05 UTC (rev 8054)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 20:44:47 UTC (rev 8055)
@@ -146,15 +146,6 @@
<h:outputText value="Delete"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- <c:choose>
- <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
- <h:outputText value="Make Default"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </c:when>
- <c:otherwise> | <h:outputText value="Default"/>
- </c:otherwise>
- </c:choose>
</td>
</tr>
</c:forEach>
18 years, 8 months
JBoss Portal SVN: r8054 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/model/portal and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-27 16:38:05 -0400 (Mon, 27 Aug 2007)
New Revision: 8054
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
Log:
- JBPORTAL-1644: Works only partially as I haven't been able to refresh the current page without causing instability in the functionality (i.e. after a while, clicking on Make default links results in seemingly random behavior with the id request parameter passed to PortalObjectManagerBean not corresponding to the clicked link).
- Added default property on PortalObject via AdminPropertyResolver.
- Made PortalObject comparable to support for children ordering.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-08-27 19:59:05 UTC (rev 8053)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-08-27 20:38:05 UTC (rev 8054)
@@ -33,7 +33,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -71,7 +70,7 @@
private Map childrenMap;
private Map properties;
private Map unmodifiableProperties;
- private Set accessedChildren;
+ private SortedSet accessedChildren;
public PortalObjectImpl()
{
@@ -117,6 +116,13 @@
return objectNode.getPath();
}
+ public int compareTo(Object o)
+ {
+ PortalObject po = (PortalObject)o;
+
+ return getId().compareTo(po.getId());
+ }
+
public void destroyChild(String name) throws NoSuchPortalObjectException
{
objectNode.removeChild(name);
@@ -262,7 +268,8 @@
public ChildrenIterator()
{
- Map childrenMap = objectNode.getChildren();
+ // Make sure the children are sorted for consistent ordering downstream
+ Map childrenMap = new TreeMap(objectNode.getChildren());
Collection children = childrenMap.values();
iterator = children.iterator();
}
@@ -390,7 +397,7 @@
{
if (accessedChildren == null)
{
- accessedChildren = new HashSet();
+ accessedChildren = new TreeSet();
}
return accessedChildren;
}
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-08-27 19:59:05 UTC (rev 8053)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-08-27 20:38:05 UTC (rev 8054)
@@ -31,7 +31,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public interface PortalObject
+public interface PortalObject extends Comparable
{
/** Portal property name that indicates the name of the default portal to lookup. */
@@ -95,7 +95,7 @@
/**
* Set a listener id.
*
- * @param listener the listener id
+ * @param listener the listener id
*/
void setListener(String listener);
@@ -132,7 +132,7 @@
*
* @param name the child name
* @throws NoSuchPortalObjectException if the child does not exist
- * @throws IllegalArgumentException if the name argument is null
+ * @throws IllegalArgumentException if the name argument is null
*/
void destroyChild(String name) throws NoSuchPortalObjectException, IllegalArgumentException;
@@ -140,11 +140,11 @@
* Copy the portal object as a child of the specified object.
*
* @param parent the parent of the copy
- * @param name the name of the child
- * @param deep true copies recursively children
+ * @param name the name of the child
+ * @param deep true copies recursively children
* @return the newly created node child of the specified parent
* @throws DuplicatePortalObjectException if the specified parent has already a node with such a name
- * @throws IllegalArgumentException if the specified parent is null
+ * @throws IllegalArgumentException if the specified parent is null
*/
PortalObject copy(PortalObject parent, String name, boolean deep) throws DuplicatePortalObjectException, IllegalArgumentException;
@@ -159,7 +159,7 @@
/**
* Returns a read only map that contains the object properties.
*
- * @return a map of the object properties
+ * @return a map of the object properties
*/
Map getProperties();
@@ -174,7 +174,7 @@
/**
* Update a property declared on that object.
*
- * @param name the property name
+ * @param name the property name
* @param value the property value
* @throws IllegalArgumentException if the name argument is null
*/
@@ -183,7 +183,7 @@
/**
* Return a map that contains the object declared properties.
*
- * @return a map of the properties declared by the object
+ * @return a map of the properties declared by the object
*/
Map getDeclaredProperties();
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-08-27 19:59:05 UTC (rev 8053)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-08-27 20:38:05 UTC (rev 8054)
@@ -22,48 +22,48 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
-import org.jboss.portal.faces.el.decorator.SimpleBeanDecorator;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.common.util.IteratorStatus;
+import org.jboss.portal.common.util.MediaType;
+import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService;
+import org.jboss.portal.core.model.content.ContentType;
+import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.portal.core.model.portal.PortalObjectPath;
+import org.jboss.portal.faces.el.DelegatingPropertyResolver;
+import org.jboss.portal.faces.el.decorator.AbstractBeanDecorator;
import org.jboss.portal.faces.el.decorator.AbstractPropertyDecorator;
-import org.jboss.portal.faces.el.decorator.AbstractBeanDecorator;
import org.jboss.portal.faces.el.decorator.PropertyDecorator;
-import org.jboss.portal.faces.el.DelegatingPropertyResolver;
+import org.jboss.portal.faces.el.decorator.SimpleBeanDecorator;
+import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.util.IteratorStatus;
-import org.jboss.portal.common.util.MediaType;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.core.model.instance.Instance;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.PortalObjectPath;
-import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
-import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService;
import org.jboss.portal.security.AuthorizationDomainRegistry;
import org.jboss.portal.security.spi.provider.AuthorizationDomain;
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.theme.PortalLayout;
-import org.jboss.portal.theme.ThemeService;
+import org.jboss.portal.theme.PortalRenderSet;
import org.jboss.portal.theme.PortalTheme;
import org.jboss.portal.theme.ServerRegistrationID;
-import org.jboss.portal.theme.PortalRenderSet;
+import org.jboss.portal.theme.ThemeService;
import javax.faces.context.FacesContext;
+import javax.faces.el.PropertyResolver;
import javax.faces.model.SelectItem;
-import javax.faces.el.PropertyResolver;
-import java.util.Set;
-import java.util.Locale;
import java.util.ArrayList;
-import java.util.List;
import java.util.Collection;
-import java.util.Map;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Collections;
+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>
@@ -216,6 +216,7 @@
{
return new ArrayList(object.getChildren(mask));
}
+
{
setProperty("portals", new AbstractPropertyDecorator(PortalObject.class)
{
@@ -262,6 +263,22 @@
return id.toString(PortalObjectPath.LEGACY_BASE64_FORMAT);
}
});
+ portalObjectDecorator.setProperty("default", new AbstractPropertyDecorator(PortalObject.class)
+ {
+ public Object getValue(Object bean)
+ {
+ PortalObject object = (PortalObject)bean;
+
+ // get the parent, if parent doesn't exist, consider the object as its own parent
+ PortalObject portalObject = object.getParent();
+ if (portalObject == null)
+ {
+ portalObject = object;
+ }
+
+ return Boolean.valueOf(object.getName().equals(portalObject.getDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME)));
+ }
+ });
registerDecorator(PortalObject.class, portalObjectDecorator);
//
@@ -305,7 +322,7 @@
LayoutService layoutService = (LayoutService)bean;
Collection layouts = layoutService.getLayouts();
SelectItem[] items = new SelectItem[layouts.size() + 1];
- for (IteratorStatus i = new IteratorStatus(layouts.iterator());i.hasNext();)
+ for (IteratorStatus i = new IteratorStatus(layouts.iterator()); i.hasNext();)
{
PortalLayout layout = (PortalLayout)i.next();
SelectItem item = new SelectItem();
@@ -355,7 +372,7 @@
ThemeService layoutService = (ThemeService)bean;
Collection themes = layoutService.getThemes();
SelectItem[] items = new SelectItem[themes.size() + 1];
- for (IteratorStatus i = new IteratorStatus(themes.iterator());i.hasNext();)
+ for (IteratorStatus i = new IteratorStatus(themes.iterator()); i.hasNext();)
{
PortalTheme name = (PortalTheme)i.next();
SelectItem item = new SelectItem();
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-08-27 19:59:05 UTC (rev 8053)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-08-27 20:38:05 UTC (rev 8054)
@@ -22,22 +22,6 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.model.SelectItem;
-
import org.jboss.portal.core.admin.ui.actions.AddPageAction;
import org.jboss.portal.core.admin.ui.actions.PropertyAction;
import org.jboss.portal.core.admin.ui.common.PageManagerBean;
@@ -64,13 +48,28 @@
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.theme.ThemeService;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/** The portal object manager bean. */
public class PortalObjectManagerBean implements Serializable, AddPageAction.Listener
{
/** The serialVersionUID */
private static final long serialVersionUID = -8923517554726982622L;
-
+
/** . */
private static final String CONTENT_URI = "content.uri";
@@ -363,7 +362,14 @@
public void selectObject(PortalObject po)
{
- selectObject(po.getId());
+ if (po != null)
+ {
+ selectObject(po.getId());
+ }
+ else
+ {
+ selectObject((PortalObjectId)null);
+ }
}
private void selectObject(PortalObjectId id)
@@ -389,16 +395,54 @@
selectObject();
}
+ public String makeObjectDefault()
+ {
+ PortalObjectId poid = getSelectedPortalObjectId();
+ PortalObject object = portalObjectContainer.getObject(poid);
+ if (object != null)
+ {
+ String typeName;
+ int type = object.getType();
+ if (type == PortalObject.TYPE_PORTAL || type == PortalObject.TYPE_CONTEXT)
+ {
+ typeName = "portal";
+ }
+ else if (type == PortalObject.TYPE_PAGE)
+ {
+ typeName = "page";
+ }
+ else
+ {
+ throw new IllegalArgumentException("Invalid object type to set as default");
+ }
+
+ // select the object for now as trying to re-display the page results in apparently random behavior
+ // i.e. id parameter don't correspond to what they should be based on the clicked link
+ // comment the next line to try it out for yourself...
+ selectObject(poid);
+
+ PortalObject parent = object.getParent();
+ if (parent != null)
+ {
+ String name = object.getName();
+ parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, name);
+
+
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Success",
+ "'" + name + "'" + typeName + " was successfully set as default " + typeName);
+ FacesContext.getCurrentInstance().addMessage("status", message);
+ }
+ }
+
+ return null;
+ }
+
public String selectObject()
{
try
{
- // Get id
- Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
- String id = (String)pmap.get("id");
+ PortalObjectId poid = getSelectedPortalObjectId();
- // Set the state from the id
- PortalObjectId poid = PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT);
PortalObject object = portalObjectContainer.getObject(poid);
// Update state if possible
@@ -437,10 +481,20 @@
return "objects";
}
- public void selectPlugin()
+ private PortalObjectId getSelectedPortalObjectId()
{
// Get id
Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+ String id = (String)pmap.get("id");
+
+ // Set the state from the id
+ return PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT);
+ }
+
+ public void selectPlugin()
+ {
+ // Get plugin
+ Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
selectedPlugin = (String)pmap.get("plugin");
}
@@ -709,6 +763,7 @@
/**
* Helper method to recognize object type in EL easily
+ *
* @return
*/
public String getSelectedObjectType()
@@ -716,7 +771,7 @@
PortalObject object = getSelectedObject();
if (object != null)
{
- switch(object.getType())
+ switch (object.getType())
{
case PortalObject.TYPE_CONTEXT:
return "context";
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-08-27 19:59:05 UTC (rev 8053)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-08-27 20:38:05 UTC (rev 8054)
@@ -47,58 +47,47 @@
public void beforePhase(PhaseEvent phaseEvent)
{
+ FacesContext ctx = phaseEvent.getFacesContext();
+
if (phaseEvent.getPhaseId() == PhaseId.RESTORE_VIEW)
{
- FacesContext ctx = phaseEvent.getFacesContext();
+ refreshFrom(ctx);
//
- PortalObjectManagerBean pomgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{portalobjectmgr}").getValue(ctx);
- pomgr.refresh();
-
- //
- PortalObjectManagerBean dashboardmgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{dashboardmgr}").getValue(ctx);
- dashboardmgr.refresh();
-
- //
- InstanceManagerBean instancemgr = (InstanceManagerBean)ctx.getApplication().createValueBinding("#{instancemgr}").getValue(ctx);
- instancemgr.refresh();
-
- //
- PortletManagerBean portletmgr = (PortletManagerBean)ctx.getApplication().createValueBinding("#{portletmgr}").getValue(ctx);
- portletmgr.refresh();
-
- //
DashboardBean dashboard = (DashboardBean)ctx.getApplication().createValueBinding("#{dashboard}").getValue(ctx);
dashboard.actionRefresh();
}
else if (phaseEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)
{
- FacesContext ctx = phaseEvent.getFacesContext();
+ refreshFrom(ctx);
//
- PortalObjectManagerBean pomgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{portalobjectmgr}").getValue(ctx);
- pomgr.refresh();
+ DashboardBean dashboard = (DashboardBean)ctx.getApplication().createValueBinding("#{dashboard}").getValue(ctx);
+ dashboard.renderRefresh();
+ }
+ }
- //
- PortalObjectManagerBean dashboardmgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{dashboardmgr}").getValue(ctx);
- dashboardmgr.refresh();
+ private void refreshFrom(FacesContext ctx)
+ {
+ //
+ PortalObjectManagerBean pomgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{portalobjectmgr}").getValue(ctx);
+ pomgr.refresh();
- //
- InstanceManagerBean instancemgr = (InstanceManagerBean)ctx.getApplication().createValueBinding("#{instancemgr}").getValue(ctx);
- instancemgr.refresh();
+ //
+ PortalObjectManagerBean dashboardmgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{dashboardmgr}").getValue(ctx);
+ dashboardmgr.refresh();
- //
- PortletManagerBean portletmgr = (PortletManagerBean)ctx.getApplication().createValueBinding("#{portletmgr}").getValue(ctx);
- portletmgr.refresh();
+ //
+ InstanceManagerBean instancemgr = (InstanceManagerBean)ctx.getApplication().createValueBinding("#{instancemgr}").getValue(ctx);
+ instancemgr.refresh();
- //
- DashboardBean dashboard = (DashboardBean)ctx.getApplication().createValueBinding("#{dashboard}").getValue(ctx);
- dashboard.renderRefresh();
- }
+ //
+ PortletManagerBean portletmgr = (PortletManagerBean)ctx.getApplication().createValueBinding("#{portletmgr}").getValue(ctx);
+ portletmgr.refresh();
}
public PhaseId getPhaseId()
{
return PhaseId.ANY_PHASE;
}
-}
\ No newline at end of file
+}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 19:59:05 UTC (rev 8053)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 20:38:05 UTC (rev 8054)
@@ -34,20 +34,29 @@
actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Properties"/>
<f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editPortalTheme"
- actionListener="#{portalobjectmgr.selectObject}">
+ </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{object.id}"/>
- </h:commandLink><h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> |
- <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ </h:commandLink>
+ <h:panelGroup
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
+ | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Rename"/>
<f:param name="id" value="#{object.id}"/>
- </h:commandLink></h:panelGroup> | <h:commandLink action="confirm"
- actionListener="#{portalobjectmgr.selectObject}">
+ </h:commandLink>
+ </h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Delete"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
+ <c:choose>
+ <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </c:when>
+ <c:otherwise> | <h:outputText value="Default"/>
+ </c:otherwise>
+ </c:choose>
</td>
</tr>
</c:forEach>
@@ -91,6 +100,15 @@
<h:outputText value="Delete"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
+ <c:choose>
+ <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </c:when>
+ <c:otherwise> | <h:outputText value="Default"/>
+ </c:otherwise>
+ </c:choose>
</td>
</tr>
</c:forEach>
@@ -128,6 +146,15 @@
<h:outputText value="Delete"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
+ <c:choose>
+ <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </c:when>
+ <c:otherwise> | <h:outputText value="Default"/>
+ </c:otherwise>
+ </c:choose>
</td>
</tr>
</c:forEach>
18 years, 8 months
JBoss Portal SVN: r8053 - in docs: trunk/referenceGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-27 15:59:05 -0400 (Mon, 27 Aug 2007)
New Revision: 8053
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
docs/trunk/referenceGuide/en/modules/errorhandling.xml
Log:
- Clarified how error handling is configured.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2007-08-27 19:21:57 UTC (rev 8052)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2007-08-27 19:59:05 UTC (rev 8053)
@@ -74,7 +74,8 @@
<sect1>
<title>Configuration using the XML descriptors</title>
<para>Since the different policies are configured using portal object properties it is possible to configure
- the error handling policy in the XML descriptors of those objects.</para>
+ the error handling policy in the XML descriptors of those objects (the <literal>*-object.xml</literal> files for
+ your Portal deployment).</para>
<sect2>
<title>Portal policy properties</title>
<para>A set of properties configure the the behavior of the portal policy. Those properties will only be
@@ -303,8 +304,11 @@
<sect1>
<title>Configuration using the Portal Management Application</title>
<para>
- The Error handling policy can also be configured via the Portal Management Application. The functionality is available through the "Dashboards" tab
- in the application
+ The Error handling policy can also be configured via the portal management application. The functionality is
+ available as part of the properties for each configuration level where it makes sense: you can specify the
+ default error handling policy (at the root of the portal object hierachy), for each portal or each page by
+ clicking on the Properties link on each of these pages. You can also specify how dashboards should behave with
+ respect to error handling by clicking on the Dashboards tab of the Portal management application.
</para>
<para>Screenshot:</para>
<para>
Modified: docs/trunk/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/errorhandling.xml 2007-08-27 19:21:57 UTC (rev 8052)
+++ docs/trunk/referenceGuide/en/modules/errorhandling.xml 2007-08-27 19:59:05 UTC (rev 8053)
@@ -74,7 +74,8 @@
<sect1>
<title>Configuration using the XML descriptors</title>
<para>Since the different policies are configured using portal object properties it is possible to configure
- the error handling policy in the XML descriptors of those objects.</para>
+ the error handling policy in the XML descriptors of those objects (the <literal>*-object.xml</literal> files for
+ your Portal deployment).</para>
<sect2>
<title>Portal policy properties</title>
<para>A set of properties configure the the behavior of the portal policy. Those properties will only be
@@ -303,8 +304,11 @@
<sect1>
<title>Configuration using the Portal Management Application</title>
<para>
- The Error handling policy can also be configured via the Portal Management Application. The functionality is available through the "Dashboards" tab
- in the application
+ The Error handling policy can also be configured via the portal management application. The functionality is
+ available as part of the properties for each configuration level where it makes sense: you can specify the
+ default error handling policy (at the root of the portal object hierachy), for each portal or each page by
+ clicking on the Properties link on each of these pages. You can also specify how dashboards should behave with
+ respect to error handling by clicking on the Dashboards tab of the Portal management application.
</para>
<para>Screenshot:</para>
<para>
18 years, 8 months
JBoss Portal SVN: r8052 - modules/identity.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-27 15:21:57 -0400 (Mon, 27 Aug 2007)
New Revision: 8052
Added:
modules/identity/branches/
modules/identity/tags/
Log:
followup
18 years, 8 months