[jboss-svn-commits] JBL Code SVN: r14874 - in labs/jbosslabs/trunk/portal-extensions: binaries/portal/to-copy/jboss-portal.sar/conf/identity and 54 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 4 15:06:38 EDT 2007
Author: adamw
Date: 2007-09-04 15:06:38 -0400 (Tue, 04 Sep 2007)
New Revision: 14874
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-beanutils.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-digester.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-el.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-loader-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/el-api.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/el-ri.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-example.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-facelets.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-portlet.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jstl.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/myfaces-api.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/myfaces-impl.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-core-admin-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-faces-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/META-INF/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/META-INF/MANIFEST.MF
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/consumers.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/editConsumer.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib/portal-faces-loader-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-beanutils.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-digester.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-el.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/el-api.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/el-ri.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-example.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-facelets.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-portlet.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jstl.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/myfaces-api.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/myfaces-impl.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/portal-faces-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/portal-wsrp-admin-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/wsrp-object.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/jsp/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/jsp/jsp/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/jsp/jsp/view.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/lib/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/lib/portal-jsp-samples-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/accessorize.gif
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/dodemo.gif
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/getcode.gif
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/default-object.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/jsp/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/jsp/news/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/jsp/news/edit.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/lib/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/lib/portal-news-samples-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss1.xsl
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss2.xsl
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/default-object.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/jsp/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/jsp/weather/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/jsp/weather/edit.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/lib/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/lib/portal-weather-samples-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/xsl/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/xsl/weather/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/xsl/weather/Rss.xsl
Modified:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-federation-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-registration-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-search-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-web-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-cms-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-core-cms-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-workflow.sar/portal-workflow-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/3columns/index.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-management.sar/lib/portal-core-management-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/lib/widget-lib.jar
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
Log:
Portal 2.6.1
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/identity/profile-config.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -309,6 +309,20 @@
</mapping>
</property>
<property>
+ <name>portal.user.im.xmmp</name>
+ <type>java.lang.String</type>
+ <access-mode>read-write</access-mode>
+ <usage>optional</usage>
+ <display-name xml:lang="en">XMMP</display-name>
+ <description xml:lang="en">The user XMMP id</description>
+ <mapping>
+ <database>
+ <type>dynamic</type>
+ <value>portal.user.im.xmmp</value>
+ </database>
+ </mapping>
+ </property>
+ <property>
<name>portal.user.homepage</name>
<type>java.lang.String</type>
<access-mode>read-write</access-mode>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-federation-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-registration-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-search-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-web-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-el.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/commons-el.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-loader-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-loader-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.pageControlAccessDenied.inherit}"
value="#{properties.pageControlAccessDenied.inherited}"/>inherit action
from parent
@@ -51,7 +51,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.pageControlUnavailable.inherit}"
value="#{properties.pageControlUnavailable.inherited}"/>inherit action
from parent
@@ -69,7 +69,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.pageControlError.inherit}"
value="#{properties.pageControlError.inherited}"/>inherit action from
parent
@@ -87,7 +87,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.pageControlInternalError.inherit}"
value="#{properties.pageControlInternalError.inherited}"/>inherit action
from parent
@@ -105,7 +105,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.pageControlNotFound.inherit}"
value="#{properties.pageControlNotFound.inherited}"/>inherit action from
parent
@@ -123,7 +123,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.pageControlResourceURI.inherit}"
value="#{properties.pageControlResourceURI.inherited}"/>inherit action
from parent
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -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"/>
@@ -114,11 +116,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}"
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.portalControlAccessDenied.inherit}"
value="#{properties.portalControlAccessDenied.inherited}"/>inherit
action from parent
@@ -52,7 +52,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.portalControlUnavailable.inherit}"
value="#{properties.portalControlUnavailable.inherited}"/>inherit
action from parent
@@ -71,7 +71,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.portalControlError.inherit}"
value="#{properties.portalControlError.inherited}"/>inherit action from
parent
@@ -89,7 +89,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.portalControlInternalError.inherit}"
value="#{properties.portalControlInternalError.inherited}"/>inherit
action from parent
@@ -108,7 +108,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.portalControlNotFound.inherit}"
value="#{properties.portalControlNotFound.inherited}"/>inherit action
from parent
@@ -126,7 +126,7 @@
</td>
<td>
<h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}"
- styleClass="portlet-form-button" onchange="submit();"
+ onclick="submit();"
valueChangeListener="#{properties.portalControlResourceURI.inherit}"
value="#{properties.portalControlResourceURI.inherited}"/>inherit
action from parent
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -34,8 +34,7 @@
</tr>
<tr>
<td>
- <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field"
- value="#{properties.action.selectedProperty}">
+ <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
<f:selectItems value="#{properties.propertyItems}"/>
</h:selectOneMenu>
</td>
@@ -104,7 +103,7 @@
<td>
<c:choose>
<c:when test="#{prop.type == 'java.lang.Boolean'}">
- <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}"
+ <h:selectBooleanCheckbox value="#{prop.value}"
readonly="#{prop.readOnly}"/>
</c:when>
<c:otherwise>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -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>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -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 @@
<!-- Separation -->
<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: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -49,11 +49,11 @@
</table>
<ul class="pagination">
<c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
- <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}"
+ <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
var="index">
<li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}">
- <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText
- value="#{index}"/></h:commandLink>
+ <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index * instancemgr.paginationSize}"/><h:outputText
+ value="#{index * instancemgr.paginationSize}"/></h:commandLink>
</li>
</c:forEach>
</c:if>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -64,12 +64,12 @@
</table>
<ul class="pagination">
<c:if test="#{portletmgr.portletCount > portletmgr.paginationSize}">
- <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
+ <c:forEach begin="0" end="#{(portletmgr.portletCount - 1) / portletmgr.paginationSize}" step="1"
var="index">
<li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
<h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from"
- value="#{index}"/><h:outputText
- value="#{index}"/></h:commandLink>
+ value="#{index * portletmgr.paginationSize}"/><h:outputText
+ value="#{index * portletmgr.paginationSize}"/></h:commandLink>
</li>
</c:forEach>
</c:if>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -38,12 +38,12 @@
</tbody>
</table>
<ul class="pagination">
- <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
+ <c:forEach begin="0" end="#{(portletmgr.portletCount - 1)/portletmgr.paginationSize}" step="1"
var="index">
<li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
<h:commandLink action="#{portletmgr.selectFrom}">
- <f:param name="from" value="#{index}"/>
- <h:outputText value="#{index}"/>
+ <f:param name="from" value="#{index * portletmgr.paginationSize}"/>
+ <h:outputText value="#{index * portletmgr.paginationSize}"/>
</h:commandLink>
</li>
</c:forEach>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/el-api.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/el-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/el-ri.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/el-ri.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-example.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-example.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-facelets.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-facelets.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-portlet.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jsf-portlet.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jstl.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/myfaces-api.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/myfaces-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/myfaces-impl.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/myfaces-impl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-core-admin-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-core-admin-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-faces-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-faces-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -31,12 +31,11 @@
<description>Administration Portlet</description>
<portlet-name>AdminPortlet</portlet-name>
<display-name>Administration Portlet</display-name>
- <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class>
+ <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
<init-param>
- <name>VIEW</name>
+ <name>default-view</name>
<value>/WEB-INF/jsf/objects.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -50,9 +49,9 @@
<description>Dashboard Configurator Portlet</description>
<portlet-name>DashboardConfigPortlet</portlet-name>
<display-name>Dashboard Configurator Portlet</display-name>
- <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class>
+ <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
<init-param>
- <name>VIEW</name>
+ <name>default-view</name>
<value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value>
</init-param>
<expiration-cache>-1</expiration-cache>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/web.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -77,13 +77,8 @@
<!-- The JSF servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-
- <!-- The JSF meta bridge bootstrap -->
- <listener>
- <display-name> Faces Meta Bridge Bootstrap</display-name>
- <listener-class>org.jboss.portal.faces.portlet.JSFMetaBridgeBootstrap</listener-class>
- </listener>
+
</web-app>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css 2007-09-04 19:06:38 UTC (rev 14874)
@@ -94,7 +94,7 @@
/* Resize combo lists */
.admin-ui select {
- padding: 2px 4px;
+ padding: 2px 4px 2px 1px;
}
.admin-ui select.contentType {
@@ -111,17 +111,17 @@
}
/* Style a table for form layout */
-
-.admin-ui table.form {
+.admin-ui table form {
+ margin: 0;
}
-.admin-ui table.form td.label {
+.admin-ui table form td.label {
text-align: right;
vertical-align: top;
padding-top: 0.4em;
}
-.admin-ui table.form td.widget {
+.admin-ui table form td.widget {
text-align: left;
}
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js 2007-09-04 19:06:38 UTC (rev 14874)
@@ -1,6 +1,6 @@
function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) {
var options = {
- requestHeaders: ["ajax","true","bilto","toto"],
+ requestHeaders: ["ajax","true","bilto","toto"],
method: "post",
postBody: "action=" + action + "&windowId=" + windowId + "&fromPos=" + fromPos + "&fromRegion=" + fromRegionId + "&toPos=" + toPos + "&toRegion=" + toRegionId,
onSuccess: function(t)
@@ -171,9 +171,11 @@
// Create a temporary element and paste the innerHTML in it
var srcContainer = document.createElement("div");
- srcContainer.innerHTML = markup;
- //
+ // Insert the markup in the div
+ new Insertion.Bottom(srcContainer, markup);
+
+ // Copy the region content
copyInnerHTML(srcContainer, dstContainer, "dyna-portlet")
copyInnerHTML(srcContainer, dstContainer, "dyna-decoration")
}
@@ -227,8 +229,35 @@
{
var dst = dsts[0];
- // Copy markup
- dst.innerHTML = src.innerHTML;
+ // Remove existing non attribute children in destination
+ var dstChildren = dst.childNodes;
+ var copy = new Array();
+ for (var i = 0;i < dstChildren.length;i++)
+ {
+ var dstChild = dstChildren.item(i);
+ if (dstChild.nodeType != 2)
+ {
+ copy[i] = dstChildren.item(i);
+ }
+ }
+ for (var i = 0;i < copy.length;i++)
+ {
+ Element.remove(copy[i]);
+ }
+
+ // Move src non attribute children to the destination
+ while (src.hasChildNodes())
+ {
+ var srcChild = src.firstChild;
+ if (srcChild.nodeType != 2)
+ {
+ dst.appendChild(srcChild);
+ }
+ else
+ {
+ src.removeChild(srcChild);
+ }
+ }
}
else
{
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css 2007-09-04 19:06:38 UTC (rev 14874)
@@ -9,15 +9,9 @@
.dnd-handle {
cursor: move;
+ overflow: auto;
}
-.dnd-cleaner {
- clear:both;
- height:1px;
- margin: -1px 0 0 0; padding:0;
- border:none;
- visibility: hidden;
-}
.dnd-droppable {
border: red 1px dashed;
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-cms-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-core-cms-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -13,6 +13,28 @@
String[] langs = Locale.getISOLanguages();
String sDocBase = (String)request.getAttribute("document_base_url");
String sCSSURL = (String)request.getAttribute("css_url");
+
+ //validation handling related data
+ String sContent = (String)request.getAttribute("error:content");
+ String description = (String)request.getAttribute("error:description");
+ String title = (String)request.getAttribute("error:title");
+ String language = (String)request.getAttribute("error:language");
+ if(sContent == null)
+ {
+ sContent = "";
+ }
+ if(description == null)
+ {
+ description = "";
+ }
+ if(title == null)
+ {
+ title = "";
+ }
+ if(language == null)
+ {
+ language = "";
+ }
%>
<!-- tinyMCE -->
@@ -53,6 +75,21 @@
</script>
<!-- /tinyMCE -->
+<!-- data validation -->
+<script language="javascript" type="text/javascript">
+ function validateAndSubmit()
+ {
+ if(document.pickform.filename.value.length == 0)
+ {
+ alert("${n:i18n("CMS_FILENAME")} is required.");
+ }
+ else
+ {
+ document.pickform.submit();
+ }
+ }
+</script>
+
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/>
<portlet:param name="path" value=""/>
@@ -75,15 +112,17 @@
</tr>
<tr>
<td>${n:i18n("CMS_FILENAME")}:</td>
- <td><input
+ <td>
+ <input
type="text" name="filename"
- class="portlet-form-input-field">
+ class="portlet-form-input-field"/>
+ : Required
</td>
</tr>
<tr>
<td>${n:i18n("CMS_DESCRIPTION")}:</td>
<td><input type="text" size="40" maxlength="80"
- name="description" value=""
+ name="description" value="<%=description%>"
class="portlet-form-input-field"/></td>
</tr>
<tr>
@@ -91,8 +130,9 @@
${n:i18n("CMS_TITLE")}:
</td>
<td><input type="text" size="40" maxlength="80"
- name="title" value=""
- class="portlet-form-input-field"/></td>
+ name="title" value="<%=title%>"
+ class="portlet-form-input-field"/>
+ </td>
</tr>
<tr>
<td>
@@ -100,18 +140,26 @@
</td>
<td><select name="language"
class="portlet-form-input-field">
- <option selected
- value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
- </option>
+
+ <%if(language.equals("")){%>
<%
for (int i = 0; i < langs.length; i++)
{
%>
- <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
- </option>
+ <option value="<%= langs[i] %>" <%if(langs[i].equals(Locale.getDefault().getLanguage())){%>selected<%}%>><%= new Locale(langs[i]).getDisplayLanguage() %></option>
<%
}
%>
+ <%}else{%>
+ <%
+ for (int i = 0; i < langs.length; i++)
+ {
+ %>
+ <option value="<%= langs[i] %>" <%if(langs[i].equals(language)){%>selected<%}%>><%= new Locale(langs[i]).getDisplayLanguage() %></option>
+ <%
+ }
+ %>
+ <%}%>
</select>
</td>
</tr>
@@ -144,9 +192,9 @@
</tr>
<tr>
<td align="center">
- <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"></textarea>
+ <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"><%= sContent %></textarea>
<br>
- <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/>
+ <input type="button" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button" onclick="javascript:validateAndSubmit();"/>
<input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
</td>
</tr>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -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: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-workflow.sar/portal-workflow-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties 2007-09-04 19:06:38 UTC (rev 14874)
@@ -221,6 +221,7 @@
REGISTER_YIM=Yahoo id
REGISTER_MSNM=MSN messenger id
REGISTER_SKYPE=Skype id
+REGISTER_XMMP=XMMP id
REGISTER_LOCATION=Location
REGISTER_LANGUAGE=Preferred language
REGISTER_OCCUPATION=Occupation
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -46,11 +46,11 @@
output += parent;
%>
-<div class="portlet-form-field-label"><%= output %></div></li>
+<div class="portlet-form-field-label"><%= output %></div>
<ul id="foldinglist">
<li class="pagenosub">
- <div class="portlet-form-field-label"><%= parent %></div></li>
+ <div class="portlet-form-field-label"><%= parent %></div>
</li>
<%
for(Iterator i = parentChildMap.keySet().iterator(); i.hasNext();)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -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: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -44,19 +44,17 @@
}
}
%>
- <li <% if(child == mainPage) out.println(" id=\"current\""); %> onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"><a href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %>
-<%
+ <li <% if(child == mainPage) out.println(" id=\"current\""); %> onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"><a href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %><%
if (tmp.size() == 0)
{
-%>
- </a>
+%></a>
<%
}
else
{
%>
<!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
+ <!--[if lte IE 6]> <table><tr><td><![endif]-->
<ul>
<%
for (Iterator j = tmp.iterator(); j.hasNext();)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -119,6 +119,10 @@
<td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td>
</tr>
<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_XMMP")}</td>
+ <td><input type="text" name="xmmp" value="${n:out("XMMP")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
<td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td>
</tr>
<tr>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/3columns/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/3columns/index.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/3columns/index.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -36,18 +36,20 @@
<div id="content-container">
<table>
<tr>
- <td valign="top">
+ <td valign="top" width="33%">
<!-- insert the content of the 'left' region of the page, and assign the css selector id 'regionA' -->
<p:region regionName='left' regionID='left'/>
</td>
- <td valign="top">
+ <td valign="top" width="34%">
<!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionB' -->
<p:region regionName='center' regionID='center'/>
</td>
- <td valign="top">
+ <td valign="top" width="33%">
<!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionC' -->
<p:region regionName='right' regionID='right'/>
</td>
+ </tr>
+ </table>
<hr class="cleaner"/>
</div>
</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css 2007-09-04 19:06:38 UTC (rev 14874)
@@ -278,12 +278,12 @@
padding: 5px 15px 3px 15px; /*background-image: url(../images/tab_left.gif);*/
background-repeat: no-repeat;
background-position: top left;
- width: 90px;
+ width: 110px;
white-space: nowrap;
}
ul#tabsHeader a:hover {
- text-decoration: underline;
+ text-decoration: none;
color: #000000; /*background-image: url(../images/tab_left_hover2.gif);*/
background-repeat: no-repeat;
background-position: top left;
@@ -292,11 +292,9 @@
ul#tabsHeader #current {
line-height: 22px;
- background-color: #fff;
background-image: url( images/tab_right_current.gif );
background-repeat: no-repeat;
background-position: right top;
- padding-top: -3px; /*border-bottom: 2px solid #fff;*/
}
ul#tabsHeader #current a, #current a:hover {
@@ -314,7 +312,7 @@
height: 0;
top: 0px;
left: 0;
- width: 150px;
+ width: 160px;
text-align: left;
margin: 0px;
padding: 0px;
@@ -322,6 +320,8 @@
}
ul#tabsHeader ul a {
+ text-decoration: none;
+
font: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
@@ -352,7 +352,7 @@
background: #DFE8ED;
color: #5078aa;
padding: 3px;
- width: 120px;
+ width: 160px;
border: 1px solid #98b7c6;
border-width: 0px 1px 1px 1px;
@@ -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: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-management.sar/lib/portal-core-management-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -23,7 +23,6 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<server>
-
<!-- Producer interceptor stack -->
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/META-INF/MANIFEST.MF (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/META-INF/MANIFEST.MF 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.0
+Created-By: 1.4.2_13-b06 (Sun Microsystems Inc.)
+
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/faces-config.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/faces-config.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+
+<faces-config>
+
+ <!-- Facelet portlet view handler-->
+ <application>
+ <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
+ </application>
+
+ <managed-bean>
+ <managed-bean-name>beanContext</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.wsrp.admin.ui.JSFBeanContext</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>consumersMgr</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerManagerBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>registry</property-name>
+ <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class>
+ <value>#{applicationScope.ConsumerRegistry}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>beanContext</property-name>
+ <property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class>
+ <value>#{beanContext}</value>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>consumer</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>registry</property-name>
+ <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class>
+ <value>#{applicationScope.ConsumerRegistry}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>id</property-name>
+ <value>#{sessionScope.consumerId}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>manager</property-name>
+ <value>#{consumersMgr}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>beanContext</property-name>
+ <property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class>
+ <value>#{beanContext}</value>
+ </managed-property>
+ </managed-bean>
+
+ <navigation-rule>
+ <navigation-case>
+ <from-outcome>index</from-outcome>
+ <to-view-id>/WEB-INF/jsf/consumers/consumers.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>configureConsumer</from-outcome>
+ <to-view-id>/WEB-INF/jsf/consumers/editConsumer.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+</faces-config>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jboss-portlet.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jboss-portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,40 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+<portlet-app>
+ <portlet>
+ <portlet-name>WSRPConsumersConfigurationPortlet</portlet-name>
+ <transaction>
+ <trans-attribute>Required</trans-attribute>
+ </transaction>
+ <header-content>
+ <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
+ </header-content>
+ </portlet>
+ <service>
+ <service-name>ConsumerRegistry</service-name>
+ <service-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</service-class>
+ <service-ref>portal.wsrp:service=ConsumerRegistry</service-ref>
+ </service>
+</portlet-app>
+
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/consumers.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/consumers.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,69 @@
+<div class="wsrp-consumers-ui"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <h:form style="padding: 1em 0;">
+ Create a consumer named: <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"/>
+ <h:message styleClass="error" for="consumerName"/>
+ <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer"
+ styleClass="portlet-form-button"/>
+ </h:form>
+
+ <hr style="margin: 1em 0 2em;"/>
+
+ <h:messages errorClass="error" infoClass="info"/>
+
+ <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
+ <thead>
+ <tr class="portlet-table-header">
+ <th>Consumer
+ <div style="font-size: 75%; display:inline; font-weight: normal;">
+ [status: <span class="active">active</span>, <span class="inactive">inactive</span>,
+ <span class="needsRefresh">needs refresh</span>]
+ </div>
+ </th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <h:form>
+ <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
+ <tr>
+ <td
+ class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
+ <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'})
+ #{consumer.refreshNeeded ? '(refresh needed)' : ''}"/>
+ </td>
+ <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <h:commandLink action="#{consumersMgr.configureConsumer}">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <h:outputText value="Configure"/>
+ </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <h:outputText value="Refresh"/>
+ </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <f:param name="activate" value="#{!consumer.active}"/>
+ <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/>
+ </h:commandLink>
+ <c:if
+ test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
+ | <h:commandLink action="#{consumersMgr.registerConsumer}">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <f:param name="register" value="#{!consumer.producerInfo.registered}"/>
+ <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/>
+ </h:commandLink>
+ </c:if> | <h:commandLink action="#{consumersMgr.destroyConsumer}">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <h:outputText value="Destroy"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </h:form>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/editConsumer.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,177 @@
+<div class="wsrp-consumer-ui"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+<h1
+ class="portlet-section-header #{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
+ Consumer '#{consumer.id}' configuration (#{consumer.active ? 'active' : 'inactive'})
+ #{consumer.refreshNeeded ? '(refresh needed)' : ''}</h1>
+
+<hr/>
+
+<h:form>
+<h:messages errorClass="error" infoClass="info"/>
+<table width="100%" class="portlet-table-body">
+<tr>
+ <th>Producer id:</th>
+ <td>
+ <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="error" for="id"/>
+ </td>
+</tr>
+<tr>
+ <th>Cache expiration:</th>
+ <td>
+ <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message styleClass="error"
+ for="cache"/>
+ </td>
+</tr>
+<tr>
+ <th>Endpoint configuration:</th>
+ <td>
+ <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()"
+ valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL?
+ <h:message styleClass="error" for="useWSDL"/>
+ <c:choose>
+ <c:when test="#{consumer.useWSDL}">
+ <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="error" for="wsdl"/>
+ </c:when>
+
+ <c:otherwise>
+ <table border="0" class='portlet-table-body'>
+ <tr>
+ <th>Service Description URL:</th>
+ <td>
+ <h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message
+ styleClass="error" for="sd"/>
+ </td>
+ </tr>
+ <tr>
+ <th>Markup URL:</th>
+ <td>
+ <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message styleClass="error" for="m"/>
+ </td>
+ </tr>
+ <tr>
+ <th>Registration URL:</th>
+ <td>
+ <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message styleClass="error"
+ for="r"/>
+ </td>
+ </tr>
+ <tr>
+ <th>Portlet Management URL:</th>
+ <td>
+ <h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message
+ styleClass="error" for="pm"/>
+ </td>
+ </tr>
+ </table>
+ </c:otherwise>
+ </c:choose>
+ </td>
+</tr>
+<c:if test="#{consumer.localInfoPresent or !consumer.refreshNeeded}">
+ <tr>
+ <th>Registration information</th>
+ <td>
+ <c:choose>
+ <c:when test="#{consumer.localInfoPresent}">
+ <c:choose>
+ <c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}">
+ <table border='1' cellspacing='0' class='registration-prop-table'>
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ </tr>
+ <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}" var="prop">
+ <tr title="#{prop.description.label.value}">
+ <td>
+ <h:outputText value="#{prop.name}"/>
+ </td>
+ <td>
+ <h:inputText value="#{prop.value}" size="40" onchange="this.form.submit()"
+ immediate="true" valueChangeListener="#{consumer.regPropListener}"/>
+ <h:outputText styleClass="error" value="#{prop.status}"
+ rendered="#{prop.determinedInvalid}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ </c:when>
+ <c:otherwise>
+ Registration is indicated as required without registration properties.
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}">
+ Producer doesn't require registration.
+ </c:when>
+ </c:choose>
+ </td>
+ </tr>
+ <c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}">
+ <tr>
+ <th>Registration context:</th>
+ <td>Handle:
+ <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
+ </td>
+ </tr>
+ </c:if>
+ <c:choose>
+ <c:when test="#{consumer.registrationCheckNeeded}">
+ <tr>
+ <td colspan="2">
+ <p class="info">Registration information hasn't been validated with the Producer. You should validate
+ it.</p>
+ <h:commandLink action="#{consumer.refreshRegistrationInfo}" value="Validate"
+ title="Validate registration info from Producer" styleClass="portlet-form-button">
+ <f:param name="mergeLocalInfo" value="true"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:when>
+ <c:otherwise>
+ <c:if
+ test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle and !consumer.registrationValid}">
+ <tr>
+ <td colspan="2">
+ <p class="error">Registration is not valid. You can try to fix the problems and modify the
+ registration.</p>
+ <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
+ title="Modify the registration held with this Producer"
+ styleClass="portlet-form-button"/>
+ </td>
+ </tr>
+ </c:if>
+ </c:otherwise>
+ </c:choose>
+ <c:if test="#{consumer.registrationModified}">
+ <tr>
+ <td colspan="2">
+ <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
+ title="Modify the registration held with this Producer"
+ styleClass="portlet-form-button"/>
+ </td>
+ </tr>
+ </c:if>
+</c:if>
+<tr>
+ <td colspan="2" style="padding: 1em 1em 1em 0;">
+ <h:commandButton action="#{consumer.update}" value="Save" title="" styleClass="portlet-form-button">
+ <f:param name="id" value="#{consumer.id}"/>
+ </h:commandButton>
+ <h:commandLink action="#{consumer.refreshConsumer}" value="Save & Refresh"
+ title="Save changes and refresh information from Producer"
+ styleClass="portlet-form-button">
+ <f:param name="id" value="#{consumer.id}"/>
+ </h:commandLink>
+ <h:commandLink action="#{consumersMgr.listConsumers}" value="Cancel" immediate="true"
+ styleClass="portlet-form-button"/>
+ </td>
+</tr>
+</table>
+</h:form>
+</div>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib/portal-faces-loader-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib/portal-faces-loader-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-el.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/commons-el.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/el-api.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/el-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/el-ri.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/el-ri.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-example.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-example.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-facelets.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-facelets.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-portlet.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jsf-portlet.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jstl.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/myfaces-api.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/myfaces-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/myfaces-impl.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/myfaces-impl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/portal-faces-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/portal-faces-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/portal-wsrp-admin-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/lib2/portal-wsrp-admin-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet-instances.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet-instances.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,38 @@
+<?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<deployments>
+ <deployment>
+ <instance>
+ <instance-id>WSRPConsumersConfigurationPortletInstance</instance-id>
+ <portlet-ref>WSRPConsumersConfigurationPortlet</portlet-ref>
+ <security-constraint>
+ <policy-permission>
+ <role-name>Admin</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+ </security-constraint>
+ </instance>
+ </deployment>
+</deployments>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,46 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<portlet-app
+ xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ version="1.0">
+ <portlet>
+ <description>Configuration portlet for WSRP remote producers.</description>
+ <portlet-name>WSRPConsumersConfigurationPortlet</portlet-name>
+ <display-name>WSRP Consumers Configuration</display-name>
+ <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
+ <init-param>
+ <name>default-view</name>
+ <value>/WEB-INF/jsf/consumers/consumers.xhtml</value>
+ </init-param>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>WSRP Consumers Configuration</title>
+ <keywords>management,admin,wsrp</keywords>
+ </portlet-info>
+ </portlet>
+</portlet-app>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/web.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/web.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <!-- MyFaces specific configuration -->
+ <context-param>
+ <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- Facelet configuration -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- JSF configuration -->
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+
+ <!-- JSF entry point -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+</web-app>
+
+
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/wsrp-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/wsrp-object.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/WEB-INF/wsrp-object.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD Portal Object 2.6//EN" "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
+<deployments>
+ <deployment>
+ <parent-ref>admin</parent-ref>
+ <if-exists>keep</if-exists>
+ <page>
+ <page-name>WSRP</page-name>
+ <security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <role-name>Admin</role-name>
+ </policy-permission>
+ </security-constraint>
+ <window>
+ <window-name>WSRPConsumersConfigurationPortletWindow</window-name>
+ <instance-ref>WSRPConsumersConfigurationPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </page>
+ </deployment>
+</deployments>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/style.css (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-admin.war/style.css 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,70 @@
+.wsrp-consumers-ui table, .wsrp-consumer-ui table {
+ border: 0;
+ border-collapse: separate;
+}
+
+.wsrp-consumers-ui th {
+ text-align: left;
+ border: 0;
+ border-bottom: 1px solid;
+}
+
+.wsrp-consumers-ui td {
+ border: 0;
+ padding-bottom: 2px;
+ padding-top: 2px;
+}
+
+.wsrp-consumer-ui th {
+ text-align: left;
+ border: 0;
+ vertical-align: top;
+}
+
+.wsrp-consumer-ui td {
+ border: 0;
+ padding-bottom: 2px;
+ padding-top: 2px;
+}
+
+.wsrp-consumers-ui .active, .wsrp-consumer-ui .active {
+ background-color: #C7DDB7;
+ font-weight: bold;
+}
+
+.wsrp-consumers-ui .inactive, .wsrp-consumer-ui .inactive {
+ background-color: #EBD1B8;
+}
+
+.wsrp-consumers-ui .needsRefresh, .wsrp-consumer-ui .needsRefresh {
+ font-style: italic;
+}
+
+.wsrp-consumer-ui .registration-prop-table {
+ text-align: left;
+ border: 0;
+ border-collapse: separate;
+}
+
+.wsrp-consumer-ui .portlet-form-button {
+ padding: .2em;
+ margin: 0 .3em;
+}
+
+.error {
+ font-weight: bold;
+ color: red;
+}
+
+.error:before {
+ content: "Error: "
+}
+
+.info {
+ font-weight: bold;
+ color: green;
+}
+
+.info:before {
+ content: "Info: "
+}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
===================================================================
(Binary files differ)
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/jsp/jsp/view.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/jsp/jsp/view.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/jsp/jsp/view.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,63 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ JBoss, a division of Red Hat ~
+~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+~ contributors as indicated by the @authors tag. See the ~
+~ copyright.txt in the distribution for a full listing of ~
+~ individual contributors. ~
+~ ~
+~ This is free software; you can redistribute it and/or modify it ~
+~ under the terms of the GNU Lesser General Public License as ~
+~ published by the Free Software Foundation; either version 2.1 of ~
+~ the License, or (at your option) any later version. ~
+~ ~
+~ This software is distributed in the hope that it will be useful, ~
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+~ Lesser General Public License for more details. ~
+~ ~
+~ You should have received a copy of the GNU Lesser General Public ~
+~ License along with this software; if not, write to the Free ~
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+ alt="Try the latest release of JBoss Portal, live and online."></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+ alt="Download JBoss Portal and have it up and running in minutes."></a>
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+ alt="Download portlets and layouts for your new JBoss Portal installation."></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <font class="portlet-font">This is a basic installation of <b><%= PortalConstants.VERSION %></b>. You may
+ log in at any time, using the <i>Login</i> link at the top-right of this page, with the following
+ credentials:</font>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <b>user/user</b> or <b>admin/admin</b>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
+ our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
+ </td>
+ </tr>
+</table>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/lib/portal-jsp-samples-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/lib/portal-jsp-samples-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet-instances.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet-instances.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,36 @@
+<?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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>JSPPortletInstance</instance-id>
+ <portlet-ref>JSPPortlet</portlet-ref>
+ </instance>
+ </deployment>
+</deployments>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/WEB-INF/portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app
+ xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ version="1.0">
+ <portlet>
+ <description>Simple JSP portlet</description>
+ <portlet-name>JSPPortlet</portlet-name>
+ <display-name>JSP Portlet</display-name>
+ <portlet-class>org.jboss.portal.core.samples.jsp.JSPPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Greetings!</title>
+ <keywords>sample,test</keywords>
+ </portlet-info>
+ </portlet>
+</portlet-app>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/accessorize.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/accessorize.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/dodemo.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/dodemo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/getcode.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-jsp-samples.war/images/getcode.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/default-object.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/default-object.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
+<deployments>
+ <deployment>
+ <parent-ref>default</parent-ref>
+ <if-exists>keep</if-exists>
+ <page>
+ <page-name>News</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>3</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>NewsPortletWindow</window-name>
+ <instance-ref>NewsPortletInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>NewsPortletWindow2</window-name>
+ <instance-ref>NewsPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ </window>
+ </page>
+ </deployment>
+</deployments>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/jsp/news/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/jsp/news/edit.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/jsp/news/edit.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,37 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<div align="center">
+ <br/>
+ <font class="portlet-font">Change News Feed URL:</font>
+ <form method="post" action="
+<portlet:actionURL></portlet:actionURL>">
+ <input class="portlet-form-input-field" type="text" value="<%= renderRequest.getPreferences().getValue("RssXml", "") %>" size="25" name="newurl">
+ <input class="portlet-form-button" type="submit" name="submit" value="submit">
+ </form>
+</div>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/lib/portal-news-samples-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/lib/portal-news-samples-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet-instances.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet-instances.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,53 @@
+<?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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>NewsPortletInstance</instance-id>
+ <portlet-ref>NewsPortlet</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>NewsPortletInstance2</instance-id>
+ <portlet-ref>NewsPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>expires</name>
+ <value>180</value>
+ </preference>
+ <preference>
+ <name>RssXml</name>
+ <value>http://finance.yahoo.com/rss/headline?s=rht</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
+</deployments>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app
+ xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ version="1.0">
+ <portlet>
+ <description>Portlet aggregating news from different feeds</description>
+ <portlet-name>NewsPortlet</portlet-name>
+ <display-name>News Portlet</display-name>
+ <portlet-class>org.jboss.portal.core.samples.news.NewsPortlet</portlet-class>
+ <init-param>
+ <name>RSS1_XSL</name>
+ <value>/WEB-INF/Rss1.xsl</value>
+ </init-param>
+ <init-param>
+ <name>RSS2_XSL</name>
+ <value>/WEB-INF/Rss2.xsl</value>
+ </init-param>
+ <init-param>
+ <name>base_url</name>
+ <value>http://feeds.feedburner.com/JBossPortal</value>
+ </init-param>
+ <expiration-cache>180</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <resource-bundle>NewsResource</resource-bundle>
+ <portlet-info>
+ <title>News Feeds</title>
+ <keywords>sample,news</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>expires</name>
+ <value>180</value>
+ </preference>
+ <preference>
+ <name>RssXml</name>
+ <value>http://feeds.feedburner.com/JBossPortal</value>
+ <read-only>false</read-only>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+</portlet-app>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss1.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss1.xsl (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss1.xsl 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+ <xsl:output method="html"/>
+
+ <xsl:template match="/">
+ <TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">
+ <xsl:apply-templates/>
+ </TABLE>
+ </xsl:template>
+
+ <xsl:template match="item">
+ <TR>
+ <TD>
+ -
+ <A TARGET="_popup" STYLE="text-decoration: none;">
+ <xsl:attribute name="HREF">
+ <xsl:value-of select="link"/>
+ </xsl:attribute>
+ <xsl:value-of select="title"/>
+ </A>
+ </TD>
+ </TR>
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <xsl:template match="text()"/>
+</xsl:stylesheet>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss2.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss2.xsl (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-news-samples.war/WEB-INF/xsl/news/Rss2.xsl 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
+
+ <xsl:variable name="link-path">
+ <xsl:value-of select="rss/channel/link"/>
+ </xsl:variable>
+
+ <xsl:template match="/">
+ <div style="font-size: 1.5em;" class="portlet-section-header">
+ <a href="{$link-path}" target="_blank">
+ <xsl:value-of select="rss/channel/title"/> - <xsl:value-of select="rss/channel/description"/>
+ </a>
+ </div>
+ <ul>
+ <xsl:for-each select="rss/channel/item">
+ <xsl:variable name="this-link">
+ <xsl:value-of select="link"/>
+ </xsl:variable>
+ <li>
+ <div class="portlet-section-subheader">
+ <a href="{$this-link}" target="_blank">
+ <xsl:value-of select="title"/>
+ </a>
+ </div>
+ <div class="portlet-font-dim">
+ <xsl:if test="string(author)">
+ <xsl:value-of select="author"/>
+ </xsl:if>
+ <xsl:if test="string(author) and string(pubDate)">
+  - 
+ </xsl:if>
+ <xsl:if test="string(pubDate)">
+ <xsl:value-of select="pubDate"/>
+ </xsl:if>
+ </div>
+ </li>
+ <!-- <xsl:value-of select="description" disable-output-escaping="yes"/>
+ <br/>-->
+ </xsl:for-each>
+ </ul>
+ <br/>
+ <br/>
+ <xsl:value-of select="rss/channel/copyright"/>
+ </xsl:template>
+</xsl:stylesheet>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/default-object.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/default-object.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
+<deployments>
+ <deployment>
+ <parent-ref>default</parent-ref>
+ <if-exists>keep</if-exists>
+ <page>
+ <page-name>Weather</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>3</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>WeatherPortletWindow</window-name>
+ <instance-ref>WeatherPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </page>
+ </deployment>
+</deployments>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/jsp/weather/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/jsp/weather/edit.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/jsp/weather/edit.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,40 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<div align="center">
+ <br/>
+ <font class="portlet-font">Change Weather Location:</font>
+
+ <form method="post" action="
+<portlet:actionURL></portlet:actionURL>">
+ <font class="portlet-font">Zip Code:</font><br/>
+ <input class="portlet-form-input-field" type="text" value="" size="12" name="newzip">
+ <br/>
+ <input class="portlet-form-input-field" type="submit" name="submit" value="submit">
+ </form>
+</div>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/lib/portal-weather-samples-lib.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/lib/portal-weather-samples-lib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet-instances.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet-instances.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,36 @@
+<?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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>WeatherPortletInstance</instance-id>
+ <portlet-ref>WeatherPortlet</portlet-ref>
+ </instance>
+ </deployment>
+</deployments>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/portlet.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app
+ xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ version="1.0">
+ <portlet>
+ <description>Portlet providing weather forecast</description>
+ <portlet-name>WeatherPortlet</portlet-name>
+ <display-name>Weather Portlet</display-name>
+ <portlet-class>org.jboss.portal.core.samples.weather.WeatherPortlet</portlet-class>
+ <init-param>
+ <name>default_zipcode</name>
+ <value>33145</value>
+ </init-param>
+ <init-param>
+ <name>RSS_XSL</name>
+ <value>/WEB-INF/xsl/weather/Rss.xsl</value>
+ </init-param>
+ <init-param>
+ <name>base_url</name>
+ <value>http://xml.weather.yahoo.com/forecastrss?p=</value>
+ </init-param>
+ <expiration-cache>180</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Weather Portlet</title>
+ <keywords>sample,news</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>expires</name>
+ <value>180</value>
+ </preference>
+ <preference>
+ <name>RssXml</name>
+ <value>http://xml.weather.yahoo.com/forecastrss?p=33145</value>
+ <read-only>false</read-only>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+</portlet-app>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/xsl/weather/Rss.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/xsl/weather/Rss.xsl (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/samples/portal-weather-samples.war/WEB-INF/xsl/weather/Rss.xsl 2007-09-04 19:06:38 UTC (rev 14874)
@@ -0,0 +1,100 @@
+<?xml version="1.0" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
+ <xsl:variable name="image-path">http://us.i1.yimg.com/us.yimg.com/i/us/we/52/</xsl:variable>
+ <xsl:variable name="link-path">
+ <xsl:value-of select="rss/channel/link"/>
+ </xsl:variable>
+ <xsl:template match="/">
+ <br/>
+ <div align="center">
+ <font>
+ <b>
+ <xsl:for-each select="rss/channel/location">
+ <xsl:value-of select="@city"/>, <xsl:value-of select="@region"/>, <xsl:value-of
+ select="@country"/>
+ </xsl:for-each>
+ </b>
+ </font>
+ <br/>
+ <br/>
+ <table width="130" border="0">
+ <tr>
+ <xsl:for-each select="rss/channel/item/condition">
+ <td>
+ <table border="0" height="130">
+ <tr>
+ <td class="portlet-section-header" align="center">Currently</td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center" valign="top">
+ <img src="{$image-path}/{@code}.gif"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center" valign="top">
+ <xsl:value-of select="@text"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center" valign="top">
+ <xsl:value-of select="@temp"/>F</td>
+ </tr>
+ </table>
+ </td>
+ </xsl:for-each>
+ <xsl:for-each select="rss/channel/item/forecast">
+ <td>
+ <table border="0" height="130">
+ <tr>
+ <td class="portlet-section-header" align="center" valign="top">
+ <xsl:value-of select="@day"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center" valign="top">
+ <img src="{$image-path}/{@code}.gif"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center" valign="top">
+ <xsl:value-of select="@text"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center" valign="top">
+ <xsl:value-of select="@low"/>F/<xsl:value-of select="@high"/>F</td>
+ </tr>
+ </table>
+ </td>
+ </xsl:for-each>
+ </tr>
+ </table>
+ <br/>
+ <a href="{$link-path}" target="_blank">Complete Forecast</a>
+ </div>
+ </xsl:template>
+</xsl:stylesheet>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp 2007-09-04 19:06:38 UTC (rev 14874)
@@ -9,6 +9,7 @@
<%@ page import="org.jboss.portal.widget.google.type.EnumType" %>
<%@ page import="javax.portlet.PortletURL" %>
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
+<%@ page import="java.util.Collection" %>
<%@ page language="java"%>
<%@ taglib uri="http://java.sun.com/portlet" prefix="p" %>
<%@ page isELIgnored="false" %>
@@ -44,7 +45,7 @@
// Compute query
GGQuery query = new GGQuery(0, catTerm, queryTerm);
- GGQueryResult result = provider.search(query);
+ Collection widgets = provider.search(query);
%>
@@ -69,7 +70,7 @@
<p>
<table style="width:100%;border:1px solid" cellspacing="0" cellpadding="0">
<%
- for (IteratorStatus i = new IteratorStatus(result.getWidgetIterator()); i.hasNext();)
+ for (IteratorStatus i = new IteratorStatus(widgets.iterator()); i.hasNext();)
{
GGWidget widget = (GGWidget)i.next();
boolean selected = selWidget != null && selWidget.getId().equals(widget.getId());
@@ -80,7 +81,7 @@
selectURL.setParameter("content.uri", widget.getId());
// Set default parametrization state
- for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator(); j.hasNext();)
+ for (Iterator j = widget.getInfo().getPreferences().getPreferences().iterator(); j.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next();
String paramName = "content.param." + prefInfo.getName();
@@ -105,7 +106,7 @@
</p>
<%
- if (selWidget != null && !selWidget.getPreferencesInfo().getPreferencesInfo().isEmpty())
+ if (selWidget != null && !selWidget.getInfo().getPreferences().getPreferences().isEmpty())
{
PortletURL selectURL = renderResponse.createActionURL();
@@ -120,7 +121,7 @@
<p>
<form action="<%= selectURL %>" method="post">
<%
- for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();)
+ for (Iterator i = selWidget.getInfo().getPreferences().getPreferences().iterator(); i.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
if (prefInfo.getType().getOrdinal() == DataType.HIDDEN)
@@ -135,7 +136,7 @@
<table>
<tbody>
<%
- for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();)
+ for (Iterator i = selWidget.getInfo().getPreferences().getPreferences().iterator(); i.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
@@ -151,7 +152,7 @@
}
%>
<tr>
- <td><%= prefInfo.getName() %>:</td>
+ <td><%= prefInfo.getDisplayName() != null ? prefInfo.getDisplayName() : prefInfo.getName() %>:</td>
<%
switch (prefInfo.getType().getOrdinal())
{
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/lib/widget-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -108,7 +108,7 @@
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.event.user.UserEventInterceptor"
+ code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor"
name="portal:service=Interceptor,type=Server,name=UserEvent"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -163,6 +163,23 @@
<!-- Command stack -->
<mbean
+ code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Control"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Portal</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
+ name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
name="portal:service=Interceptor,type=Command,name=Ajax"
xmbean-dd=""
@@ -182,6 +199,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
@@ -196,7 +216,15 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <attribute name="TargetContextPath">/portal-core</attribute>
+ <attribute name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute>
+ <attribute name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute>
+ <!-- Overrides the value of core.login.namespace in config.xml -->
+ <!-- attribute name="LoginNamespace">dashboard</attribute -->
<depends
+ optional-attribute-name="Config"
+ proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends
optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
@@ -217,11 +245,13 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
+ <depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
</depends-list>
</mbean>
@@ -388,6 +418,7 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DefaultLayoutName">generic</attribute>
+ <attribute name="DefaultRenderSetName">divRenderer</attribute>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.PageServiceImpl"
@@ -554,14 +585,28 @@
</mbean>
<!-- The different containers -->
+
<mbean
- code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
+ code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"
+ name="portal:service=InstanceContainerContext"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends>portal:service=Hibernate,type=Instance</depends>
+ <attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
+ <attribute name="CacheNaturalId">true</attribute>
+ </mbean>
+
+ <mbean
+ code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"
name="portal:container=Instance"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends>portal:service=Hibernate,type=Instance</depends>
<depends
+ optional-attribute-name="ContainerContext"
+ proxy-type="attribute">portal:service=InstanceContainerContext</depends>
+ <depends
optional-attribute-name="StackFactory"
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
<depends
@@ -573,8 +618,6 @@
<depends
optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
- <attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
- <attribute name="CacheNaturalId">true</attribute>
</mbean>
<mbean
code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
@@ -590,9 +633,6 @@
optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
- <depends
optional-attribute-name="ContentProviderRegistry"
proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
@@ -699,15 +739,26 @@
proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
- name="portal:commandFactory=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- </mbean>
+ code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper"
+ name="portal:service=PortalObjectPathMapper,type=Default"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <attribute name="Namespace"><![CDATA[]]></attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+ name="portal:commandFactory=PortalObject"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Mapper"
+ proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
+ </mbean>
<!-- LABS
<mbean
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
@@ -746,26 +797,63 @@
proxy-type="attribute">portal:commandFactory=SignOut</depends>
</mbean>
<mbean
- code="org.jboss.portal.core.model.portal.DashboardCommandFactory"
- name="portal:commandFactory=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- </mbean>
- <mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">/dashboard</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=Dashboard</depends>
- </mbean>
+ code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper"
+ name="portal:service=PortalObjectPathMapper,type=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="CustomizationManager"
+ proxy-type="attribute">portal:service=CustomizationManager</depends>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+ name="portal:commandFactory=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Mapper"
+ proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/dashboard</attribute>
+ <depends
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=Dashboard</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory"
+ name="portal:commandFactory=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/ajax</attribute>
+ <depends
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=Ajax</depends>
+ </mbean>
<!-- LABS command factories -->
@@ -849,6 +937,24 @@
optional-attribute-name="PortalObjectCF"
proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
</mbean>
+
+ <mbean
+ code="org.jboss.labs.mapper.command.delegating.page.MetricsCF"
+ name="portal:commandFactory=Metrics"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">metrics</attribute>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="PageDelegatingCF"
+ proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+ <depends
+ optional-attribute-name="PortalObjectCF"
+ proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+ </mbean>
<mbean
code="org.jboss.labs.mapper.command.PortalObjectCFImpl"
@@ -973,7 +1079,21 @@
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
-
+ <mbean
+ code="org.jboss.labs.mapper.url.MetricsUrlFactory"
+ name="portal:urlFactory=Metrics"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <attribute name="Path">metrics</attribute>
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+
<!-- The federating portlet invoker -->
<mbean
code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
@@ -1085,7 +1205,7 @@
<!-- The response handler selector -->
<mbean
- code="org.jboss.portal.core.controller.ResponseHandlerSelector"
+ code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
name="portal:service=ResponseHandler,type=Selector"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -1098,6 +1218,28 @@
proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends>
</mbean>
+ <!-- -->
+ <mbean
+ code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
+ name="portal:service=ControlPolicy,type=Page"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
+ name="portal:service=ControlPolicy,type=Portal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+
<!-- The controller -->
<mbean
code="org.jboss.portal.core.controller.Controller"
@@ -1135,6 +1277,9 @@
<depends
optional-attribute-name="ResponseHandler"
proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends>
+ <depends
+ optional-attribute-name="PageControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
</mbean>
<!-- The controller factory -->
@@ -1272,7 +1417,8 @@
optional-attribute-name="PortletInstancesEntityResolver"
proxy-type="attribute">portal:service=EntityResolver</depends>
<attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
- <attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
+ <attribute name="PortletAPIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
+ <attribute name="PortletInfoFactoryClassName">org.jboss.portal.core.impl.portlet.info.CorePortletInfoFactory</attribute>
<!-- Set to false in clustered mode, otherwise set to true -->
<attribute name="CreateInstances">true</attribute>
</mbean>
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-09-04 19:04:57 UTC (rev 14873)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-09-04 19:06:38 UTC (rev 14874)
@@ -712,8 +712,8 @@
optional-attribute-name="DynamicLoginConfig"
proxy-type="attribute">portal:service=JAASLoginModule</depends>
</mbean>
-
- <!-- Command factories -->
+
+ <!-- Command factories -->
<mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
@@ -854,9 +854,9 @@
optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=Ajax</depends>
</mbean>
+
+ <!-- LABS command factories -->
- <!-- LABS command factories -->
-
<mbean
code="org.jboss.labs.mapper.command.MainCF"
name="portal:commandFactory=LabsMain"
@@ -1093,7 +1093,7 @@
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
-
+
<!-- The federating portlet invoker -->
<mbean
code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
More information about the jboss-svn-commits
mailing list