[portal-commits] JBoss Portal SVN: r6672 - in trunk: core/src/resources/portal-core-sar/META-INF and 2 other directories.

Author: julien(a)jboss.com Date: 2007-03-14 20:55:48 -0400 (Wed, 14 Mar 2007) New Revision: 6672 Modified: trunk/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml Log: redone the dashboard editor using facelet Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-03-15 00:29:31 UTC (rev 6671) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-03-15 00:55:48 UTC (rev 6672) @@ -181,7 +181,7 @@ // Edit page PortletParametersStateString navState = new PortletParametersStateString(); navState.setValue("editPageSelect", pageName); - InvokePortletInstanceRenderCommand command = new InvokePortletInstanceRenderCommand("ConfiguratorPortletInstance", navState); + InvokePortletInstanceRenderCommand command = new InvokePortletInstanceRenderCommand("DashboardConfigPortletInstance", navState); dashboardActionURL = controllerCtx.renderURL(command, null, null); dashboardActionLabel = "Edit Content"; } Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-03-15 00:29:31 UTC (rev 6671) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-03-15 00:55:48 UTC (rev 6672) @@ -842,29 +842,6 @@ proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends> </mbean> - <!-- The content editor registry --> - <mbean - code="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistryService" - name="portal:service=ContentEditorRegistry" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - </mbean> - <mbean - code="org.jboss.portal.core.portlet.dashboard.PortletContentEditor" - name="portal:service=ContentEditor,type=portlet" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends - optional-attribute-name="Registry" - proxy-type="attribute">portal:service=ContentEditorRegistry</depends> - <depends - optional-attribute-name="InstanceContainer" - proxy-type="attribute">portal:container=Instance</depends> - <attribute name="ContentType">portlet</attribute> - </mbean> - <!-- The content renderer registry --> <mbean code="org.jboss.portal.core.impl.model.portal.content.ContentRendererRegistryService" Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-03-15 00:29:31 UTC (rev 6671) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-03-15 00:55:48 UTC (rev 6672) @@ -119,9 +119,4 @@ <service-class>org.jboss.portal.portlet.federation.FederatingPortletInvoker</service-class> <service-ref>:service=PortletInvoker,type=Federating</service-ref> </service> - <service> - <service-name>ContentEditorRegistry</service-name> - <service-class>org.jboss.portal.core.portlet.dashboard.ContentEditorRegistry</service-class> - <service-ref>:service=ContentEditorRegistry</service-ref> - </service> </portlet-app> 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-03-15 00:29:31 UTC (rev 6671) +++ trunk/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-03-15 00:55:48 UTC (rev 6672) @@ -29,7 +29,7 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <attribute name="InstanceId">ConfiguratorPortletInstance</attribute> + <attribute name="InstanceId">DashboardConfigPortletInstance</attribute> </mbean> <mbean @@ -53,7 +53,7 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <attribute name="InstanceId">ConfiguratorPortletInstance</attribute> + <attribute name="InstanceId">DashboardConfigPortletInstance</attribute> <attribute name="Path">/configure</attribute> <depends optional-attribute-name="Factory"