Author: thomas.heute(a)jboss.com
Date: 2007-07-16 17:20:54 -0400 (Mon, 16 Jul 2007)
New Revision: 7788
Modified:
trunk/build/
trunk/build/build.xml
trunk/build/distrib.xml
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
trunk/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
trunk/wsrp/build.xml
Log:
* Fix wsrp build
* Remove core-admin sar isolation
* Samples missing
* Fix deploy-all/undeploy-all for portal-admin-wsrp.sar
* JBPORTAL-1509: Window name set the previously defined value when content-type has
changed
* JBPORTAL-1584: Hide the CMS Content-type selector portlets definitions and instances
* Removed unused former portlet (need some cleanup here)
* Ignore build/output for SVN
Property changes on: trunk/build
___________________________________________________________________
Name: svn:ignore
- build.log
local.properties
build.iml
+ build.log
local.properties
build.iml
output
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-07-16 16:27:26 UTC (rev 7787)
+++ trunk/build/build.xml 2007-07-16 21:20:54 UTC (rev 7788)
@@ -301,7 +301,6 @@
<!--<copy file="../core-search/output/lib/portal-search.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>-->
<copy file="../widget/output/lib/widget.war"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
<copy file="../wsrp/output/lib/portal-wsrp.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- <copy file="../core-wsrp/output/lib/portal-wsrp-admin.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
</target>
<target name="undeploy-all"
@@ -319,7 +318,6 @@
<!--<delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>-->
<delete
file="${jboss.home}/server/${portal.deploy.dir}/widget.war"/>
<delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
- <delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp-admin.sar"/>
</target>
<target name="exploded-deploy"
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-07-16 16:27:26 UTC (rev 7787)
+++ trunk/build/distrib.xml 2007-07-16 21:20:54 UTC (rev 7788)
@@ -146,7 +146,7 @@
<sequential>
<mkdir dir="${todir}"/>
<copy todir="${todir}">
- <fileset dir="${source.dir}/core-samples/output/resources"
includes="portal-basic-samples.sar"/>
+ <fileset dir="${source.dir}/core-samples/output/resources"
includes="portal-basic-samples.sar/**"/>
</copy>
<copy file="${docs.dir}/readmeFiles/samples-readme.txt"
tofile="${todir}/readme.txt"/>
</sequential>
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-07-16
16:27:26 UTC (rev 7787)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-07-16
21:20:54 UTC (rev 7788)
@@ -37,14 +37,19 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
+import javax.portlet.PortletMode;
+import org.jboss.portal.Mode;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.instance.InstanceDefinition;
import org.jboss.portal.core.model.instance.NoSuchInstanceException;
import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.portlet.state.PropertyChange;
@@ -58,6 +63,9 @@
*/
public class InstanceManagerBean
{
+
+ /** . */
+ private final Mode INTERNAL_EDIT_CONTENT = Mode.create("edit_content");
// Wired services
@@ -238,10 +246,37 @@
{
if (instances == null)
{
- instances = new ArrayList(instanceContainer.getDefinitions());
- Collections.sort(instances, INSTANCE_COMPARATOR);
+ // Remove content editors
+ List tmpInstances = new ArrayList();
+ nextInstance:
+ for (Iterator i = instanceContainer.getDefinitions().iterator();i.hasNext();)
+ {
+ Instance instance = (Instance)i.next();
+
+ //
+ try
+ {
+ // Filter portlets that are editors
+ Portlet portlet = instance.getPortlet();
+ PortletInfo info = portlet.getInfo();
+ for (Iterator j =
info.getCapabilities().getAllModes().iterator();j.hasNext();)
+ {
+ ModeInfo modeInfo = (ModeInfo)j.next();
+ if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT))
+ {
+ continue nextInstance;
+ }
+ }
+ //
+ tmpInstances.add(instance);
+ }
+ catch (PortletInvokerException ignore)
+ {
+ }
+ }
+ Collections.sort(tmpInstances, INSTANCE_COMPARATOR);
+ instances = tmpInstances;
}
-
//
return instances;
}
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-07-16
16:27:26 UTC (rev 7787)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-07-16
21:20:54 UTC (rev 7788)
@@ -23,6 +23,8 @@
package org.jboss.portal.core.admin.ui;
import org.jboss.logging.Logger;
+import org.jboss.portal.Mode;
+import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.Portlet;
@@ -32,6 +34,8 @@
import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.federation.impl.FederatedPortlet;
+import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.security.AuthorizationDomainRegistry;
@@ -57,6 +61,9 @@
/** . */
private static final Logger log = Logger.getLogger(PortletManagerBean.class);
+
+ /** . */
+ private final Mode INTERNAL_EDIT_CONTENT = Mode.create("edit_content");
static
{
@@ -269,7 +276,27 @@
{
if (portlets == null)
{
- portlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
+ portlets = new ArrayList();
+ List tmpPortlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
+
+ // Remove content editors
+ nextPortlet:
+ for (Iterator i = tmpPortlets.iterator();i.hasNext();)
+ {
+ Portlet portlet = (Portlet)i.next();
+
+ PortletInfo info = portlet.getInfo();
+ for (Iterator j =
info.getCapabilities().getAllModes().iterator();j.hasNext();)
+ {
+ ModeInfo modeInfo = (ModeInfo)j.next();
+ if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT))
+ {
+ continue nextPortlet;
+ }
+ }
+ //
+ portlets.add(portlet);
+ }
Collections.sort(portlets, comparator);
}
return portlets;
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-07-16
16:27:26 UTC (rev 7787)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-07-16
21:20:54 UTC (rev 7788)
@@ -273,6 +273,8 @@
Window tmp = (Window)windows.get(i);
tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, ""
+ i);
}
+
+ this.windowName = "";
}
catch (DuplicatePortalObjectException unexpected)
{
Modified: trunk/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-16
16:27:26 UTC (rev 7787)
+++ trunk/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-16
21:20:54 UTC (rev 7788)
@@ -23,10 +23,6 @@
<server>
- <loader-repository>
- org.jboss.portal:loader=core-admin
- </loader-repository>
-
<mbean
code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
name="portal:commandFactory=Configurator"
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-16
16:27:26 UTC (rev 7787)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-16
21:20:54 UTC (rev 7788)
@@ -42,11 +42,13 @@
</td>
<td>
<h:form id="abc">
+ <h:inputHidden id="windowNameCopy"
value="#{pageManager.windowName}"/>
<h:selectOneMenu
id="instanceId"
value="#{pageManager.selectedContentType}"
styleClass="portlet-form-field contentType"
-
onchange="document.getElementById('abc').submit()">
+
onchange="document.getElementById('abc:windowNameCopy').value =
document.getElementById('windowForm:windowName').value;
+ document.getElementById('abc').submit();
">
<f:selectItems
value="#{pageManager.contentTypeItems}"/>
</h:selectOneMenu>
<h:message for="instanceId"
errorClass="portlet-msg-error"/>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2007-07-16 16:27:26
UTC (rev 7787)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2007-07-16 21:20:54
UTC (rev 7788)
@@ -70,7 +70,7 @@
</portlet-info>
</portlet>
- <portlet>
+ <!-- portlet>
<description>CMS Content Editor</description>
<portlet-name>CMSContentEditorPortlet</portlet-name>
<display-name>CMS Content Editor</display-name>
@@ -87,6 +87,6 @@
<portlet-info>
<title>CMS Content Type</title>
</portlet-info>
- </portlet>
+ </portlet-->
</portlet-app>
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-07-16 16:27:26 UTC (rev 7787)
+++ trunk/wsrp/build.xml 2007-07-16 21:20:54 UTC (rev 7788)
@@ -295,7 +295,10 @@
</jar>
<!-- Build Admin GUI... -->
- <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="output"/>
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="output">
+ <property name="build.lib" value="${build.lib}"/>
+ <property name="build.resources"
value="${build.resources}"/>
+ </ant>
<copy todir="${build.resources}/portal-wsrp-sar"
overwrite="true">
<fileset dir="${build.lib}"
includes="portal-wsrp-client.jar"/>
<fileset dir="${build.lib}"
includes="portal-wsrp.jse"/>
@@ -321,6 +324,7 @@
<!-- Clean up all build output -->
<target name="clean" depends="_default:clean">
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml"
output="output.log" dir="../core-wsrp" target="clean"/>
<!-- Add module specific elements here. -->
</target>
Show replies by date