Author: thomas.heute(a)jboss.com Date: 2008-10-22 14:16:28 -0400 (Wed, 22 Oct 2008) New Revision: 12141 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/.classpath branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml Log: Minor fixings Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-10-22 16:04:07 UTC (rev 12140) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-10-22 18:16:28 UTC (rev 12141) @@ -41,11 +41,11 @@ are pushed to the http://repository.jboss.com site. --> - <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> - <componentref name="jboss-portal/modules/web" version="1.2.1"/> + <componentref name="jboss-portal/modules/common" version="1.2.2"/> + <componentref name="jboss-portal/modules/web" version="1.2.2"/> <componentref name="jboss-portal/modules/test" version="1.0.3"/> - <componentref name="jboss-portal/modules/portlet" version="2.0.3"/> - <componentref name="jboss-portal/modules/identity" version="1.0.4"/> + <componentref name="jboss-portal/modules/portlet" version="2.0.4"/> + <componentref name="jboss-portal/modules/identity" version="1.0.5"/> <componentref name="jboss-portal/modules/cms" version="1.2.0"/> <componentref name="antlr" version="2.7.6.ga"/> <componentref name="apache-ant" version="1.6.5"/> Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-10-22 16:04:07 UTC (rev 12140) +++ branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-10-22 18:16:28 UTC (rev 12141) @@ -33,7 +33,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> - <classpathentry combineaccessrules="false" kind="src" path="/cms"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> <classpathentry combineaccessrules="false" kind="src" path="/registration"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141) @@ -42,7 +42,7 @@ <title>Portlet Content Portlet</title> <keywords>management,admin</keywords> </portlet-info> - <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event> + <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">x:select</qname></supported-publishing-event> <supported-public-render-parameter>uri</supported-public-render-parameter> </portlet> <user-attribute> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141) @@ -75,7 +75,7 @@ <keywords>management,admin</keywords> </portlet-info> - <supported-processing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-processing-event> + <supported-processing-event><qname xmlns:x="urn:jboss:portal:content">x:select</qname></supported-processing-event> </portlet> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141) @@ -63,7 +63,6 @@ <value>false</value> </preference> </portlet-preferences> - <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event> <supported-public-render-parameter>uri</supported-public-render-parameter> </portlet> @@ -87,25 +86,6 @@ <title>CMS Administration</title> </portlet-info> </portlet> - - <!-- portlet> - <description>CMS Content Editor</description> - <portlet-name>CMSContentEditorPortlet</portlet-name> - <display-name>CMS Content Editor</display-name> - - <portlet-class>org.jboss.portal.core.cms.ui.admin.CMSContentEditorPortlet</portlet-class> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>es</supported-locale> - <resource-bundle>Resource</resource-bundle> - <portlet-info> - <title>CMS Content Type</title> - </portlet-info> - </portlet--> <filter> <filter-name>JBoss Portlet Filter</filter-name> @@ -120,11 +100,6 @@ <portlet-name>CMSAdminPortlet</portlet-name> </filter-mapping> - <event-definition> - <qname xmlns:x="urn:jboss:portal:content">x:select</qname> - <value-type>java.lang.String</value-type> - </event-definition> - <public-render-parameter> <identifier>uri</identifier> <qname xmlns:c="urn:jboss:portal:content">c:uri</qname> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141) @@ -325,7 +325,7 @@ <keywords>sample,test</keywords> </portlet-info> <supported-publishing-event> - <qname xmlns:x="urn:jboss:portal:content">select</qname> + <qname xmlns:x="urn:jboss:portal:content">x:select</qname> </supported-publishing-event> <supported-public-render-parameter>uri</supported-public-render-parameter> </portlet>