[jboss-svn-commits] JBL Code SVN: r8571 - in labs/jbosslabs/trunk/portal-extensions-2.6: . binaries/maven-repo-addons/jboss/jars configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF forge-ads/src/java/org/jbosslabs/portlet/ads forge-blog/src/java/org/jboss/portlet/blog forge-common/src/java/org/jboss/forge/common/navigation forge-common/src/java/org/jboss/forge/common/projects forge-common/src/java/org/jboss/forge/common/projects/elements forge-common/src/java/org/jboss/forge/common/soa/primates forge-file-access/src/java/org/jboss/forge/fileaccess/portlet forge-navigation/src/java/org/jboss/forge/navigation forge-podcast/src/java/org/jboss/forge/podcast forge-prj-downloads/src/java/org/jboss/forge/projects/downloads forge-prj-info/src/java/org/jboss/forge/projects/info forge-timetracker forge-timetracke! r/src/java/org/jboss/labs/portlet/timetracker jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates polls/src/java/org/jboss/forge/polls portal-binaries/setup portal-binaries/to-copy portal-binaries/to-copy/jboss-portal.sar portal-binaries/to-copy/jboss-portal.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/conf portal-binaries/to-copy/jboss-portal.sar/conf/data portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user portal-binaries/to-copy/jboss-portal.sar/conf/theme portal-binaries/to-copy/jboss-portal.sar/lib portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms portal-bi! naries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management portal-binaries/to-co
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 22 17:56:07 EST 2006
Author: adamw
Date: 2006-12-22 17:52:04 -0500 (Fri, 22 Dec 2006)
New Revision: 8571
Added:
labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/TODO
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/forge-links/
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/TODO
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-api-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-bridge-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-common-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-core-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-faces-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-format-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-identity-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-portlet-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-security-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-server-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-theme-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/LinkEntry.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectMenuEntry.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectsMenuEntry.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SeparatorEntry.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SpecialLinkEntry.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerStack.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/src/java/org/jboss/labs/portlet/timetracker/TimeTrackerPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMM.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/CellTemplate.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Column.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Columns.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MatrixTemplate.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MetricTemplate.java
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/RowTemplate.java
labs/jbosslabs/trunk/portal-extensions-2.6/labs.iml
labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollTools.java
labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollsPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-hsqldb-ds.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-mysql-ds.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-oracle-ds.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-postgresql-ds.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-sqlserver-ds.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/theme/portal-layout.tld
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/javassist.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-federation-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/index.html
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-app.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-web.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editListRoleMembers.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editUserRoles.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editUserRoles.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/login.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-lib.tld
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-themes.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme-basic-lib.tld
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce.js
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce_src.js
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/favicon.ico
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/maximized.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-app.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/server-layouts.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/error.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml
labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primate.java
labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primates.java
labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-817
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/TODO
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/TODO 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/TODO 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,2 @@
-Fix: (build currently commented out in maven.xml)
-- jbosswiki
-- forge-login - error if worng password entered
-
-- kosmos
-
-- Shotoku <-> portal CMS
+Fix:
+- URLs
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-bridge-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-common-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-core-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-faces-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-format-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-identity-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-portlet-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-security-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-server-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portal-theme-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/portlet-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<server>
<!-- Server configuration service -->
@@ -6,7 +29,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,14 +39,14 @@
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
name="portal:service=AuthorizationDomainRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
name="portal:service=PortalAuthorizationManagerFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="AuthorizationDomainRegistry"
@@ -33,7 +56,7 @@
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
name="portal:service=PortletSecurityService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
@@ -43,37 +66,26 @@
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
</mbean>
- <!-- Portlet state -->
- <mbean
- code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
- name="portal:service=StateStore,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends>portal:service=Hibernate,type=Portlet</depends>
- <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
- </mbean>
-
<!-- Server stack -->
<mbean
code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
name="portal:service=Interceptor,type=Server,name=Transaction"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.server.UserInterceptor"
name="portal:service=Interceptor,type=Server,name=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="UserModule"
@@ -83,115 +95,128 @@
code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
name="portal:service=Interceptor,type=Server,name=Locale"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
name="portal:service=Interceptor,type=Server,name=ContentType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.aspects.server.NavigationInterceptor"
- name="portal:service=Interceptor,type=Server,name=Navigation"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- </mbean>
- <mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Server"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=ContentType</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Server,name=Navigation</depends-list-element>
</depends-list>
</mbean>
<!-- Command stack -->
<mbean
+ code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PortalNode"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.aspects.controller.PageNavigationInterceptor"
name="portal:service=Interceptor,type=Command,name=PageNavigation"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.PortalNodeInterceptor"
- name="portal:service=Interceptor,type=Command,name=PortalNode"
+ code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PageCustomizer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ 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"
- name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+ code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Ajax"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ 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.EventBroadcasterInterceptor"
+ code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends
+ optional-attribute-name="ListenerRegistry"
+ proxy-type="attribute">portal:service=ListenerRegistry</depends>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Command"
+ code="org.jboss.portal.core.aspects.controller.WindowCacheInterceptor"
+ name="portal:service=Interceptor,type=Command,name=WindowCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Command"
+ xmbean-dd=""
+ 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=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=PageNavigation</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=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=WindowCache</depends-list-element>
</depends-list>
</mbean>
- <!-- Consumer stack -->
+ <!-- Instance stack -->
<mbean
code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ 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.portlet.aspects.portlet.ConsumerCacheInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- </mbean>
- <mbean
code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Instance"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
</depends-list>
</mbean>
@@ -201,90 +226,90 @@
code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Valve"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.bridge.BridgeInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Bridge"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=WindowStates"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Modes"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Transaction"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Header"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Producer"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
@@ -300,21 +325,21 @@
code="org.jboss.portal.theme.impl.ThemeServiceImpl"
name="portal:service=ThemeService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.LayoutServiceImpl"
name="portal:service=LayoutService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.page.PageServiceImpl"
name="portal:service=PageService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="LayoutService"
@@ -351,7 +376,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@@ -366,7 +391,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
@@ -381,7 +406,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@@ -395,7 +420,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Portlet"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@@ -408,30 +433,32 @@
<!-- Modules -->
<mbean
- code="org.jboss.portal.identity.db.UserModuleImpl"
+ code="org.jboss.portal.identity.db.DBUserModuleImpl"
name="portal:service=Module,type=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<attribute name="JNDIName">java:/portal/UserModule</attribute>
<attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
</mbean>
<mbean
- code="org.jboss.portal.identity.db.RoleModuleImpl"
+ code="org.jboss.portal.identity.db.DBRoleModuleImpl"
name="portal:service=Module,type=Role"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<attribute name="JNDIName">java:/portal/RoleModule</attribute>
<attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
</mbean>
- <mbean
+
+ <!-- not needed -->
+ <!--mbean
code="org.jboss.portal.core.impl.mail.MailModuleImpl"
name="portal:service=Module,type=Mail"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss:service=Mail</depends>
<depends>portal:service=Module,type=User</depends>
@@ -443,7 +470,8 @@
<attribute name="SMTPConnectionTimeout">100000</attribute>
<attribute name="SMTPTimeout">10000</attribute>
<attribute name="JNDIName">java:portal/MailModule</attribute>
- </mbean>
+ </mbean-->
+
<mbean
code="org.jboss.security.auth.login.DynamicLoginConfig"
name="portal:service=JAASLoginModule">
@@ -457,7 +485,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -466,7 +494,7 @@
code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
name="portal:service=ListenerRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -475,7 +503,7 @@
code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
name="portal:service=ListenerService,type=test_listener"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Registry"
@@ -489,12 +517,15 @@
code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
name="portal:container=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Instance</depends>
<depends
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
+ <depends
optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Instance</depends>
+ proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
@@ -507,7 +538,7 @@
code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
name="portal:container=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=PortalObject</depends>
<depends
@@ -516,43 +547,22 @@
<depends
optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
- <depends
- optional-attribute-name="PortalEventListenerRegistry"
- proxy-type="attribute">portal:service=ListenerRegistry</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
</mbean>
<!-- Command factories -->
-
- <!-- Labs command factory -->
<mbean
- code="org.jboss.labs.mapper.LabsCommandFactory"
- name="portal:commandFactory=Labs"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends>shotoku:service=svn</depends>
- <depends
- optional-attribute-name="NextFactory"
- proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- </mbean>
-
- <!-- Standard command factories -->
- <mbean
- code="org.jboss.portal.core.command.mapper.DelegatingCommandFactoryService"
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
name="portal:commandFactory=DefaultPortal"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="NextFactory"
@@ -565,19 +575,19 @@
code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
name="portal:commandFactory=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Container"
proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
<mbean
- code="org.jboss.portal.core.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,prefix=portal"
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=portal"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="Prefix">portal</attribute>
+ <attribute name="Path">/portal</attribute>
<depends
optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating</depends>
@@ -585,33 +595,101 @@
optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=PortalObject</depends>
</mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
+ name="portal:commandFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=signout"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/signout</attribute>
+ <depends
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="DelegateFactory"
+ 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/>
+ <attribute name="DashboardId">dashboard</attribute>
+ </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>
<!-- URL factories -->
<mbean
- code="org.jboss.portal.core.command.mapper.DelegatingURLFactoryService"
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
name="portal:urlFactory=Delegating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
name="portal:urlFactory=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="Prefix">portal</attribute>
+ <attribute name="Path">/portal</attribute>
<depends
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+ name="portal:urlFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/signout</attribute>
+ <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+ name="portal:urlFactory=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/dashboard</attribute>
+ <attribute name="ClassNames">org.jboss.portal.core.controller.command.ViewDashboardCommand</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
<!-- The federating portlet invoker -->
<mbean
code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
name="portal:service=PortletInvoker,type=Federating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -620,29 +698,59 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Stack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Producer</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
<depends
optional-attribute-name="Registry"
proxy-type="attribute">portal:service=WebAppRegistry</depends>
</mbean>
- <!-- The state portlet invoker -->
+ <!-- The producer portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
- name="portal:service=PortletInvoker,type=Stateful"
+ code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
+ name="portal:service=PersistenceManager,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends>portal:service=Hibernate,type=Portlet</depends>
+ <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
+ name="portal:service=StateManagementPolicy,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="PersistLocally">true</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.portlet.impl.state.StateConverterV0"
+ name="portal:service=StateConverter,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
+ name="portal:service=PortletInvoker,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
<depends
optional-attribute-name="PortletInvoker"
proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
<depends
- optional-attribute-name="StateStore"
- proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
+ optional-attribute-name="PersistenceManager"
+ proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+ <depends
+ optional-attribute-name="StateManagementPolicy"
+ proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+ <depends
+ optional-attribute-name="StateConverter"
+ proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
</mbean>
<!-- Register the state portlet invoker on the federating portlet invoker -->
@@ -650,58 +758,75 @@
code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
name="portal:service=PortletInvokerRegistration,id=local"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Id">local</attribute>
<depends
optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
+ proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
<depends
optional-attribute-name="FederatingPortletInvoker"
proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
</mbean>
- <!-- The instance portlet invoker -->
+ <!-- The core controller -->
<mbean
- code="org.jboss.portal.portlet.test.TestPortletInvoker"
- name="portal:service=PortletInvoker,type=Instance"
+ code="org.jboss.portal.core.controller.CoreController"
+ name="portal:controller=Core"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Producer"
- proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ optional-attribute-name="PageService"
+ proxy-type="attribute">portal:service=PageService</depends>
<depends
- optional-attribute-name="Stack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Instance</depends>
+ optional-attribute-name="CommandFactory"
+ proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+ <depends
+ optional-attribute-name="URLFactory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
-
- <!-- The core controller -->
+ <!-- The ajax controller -->
<mbean
- code="org.jboss.portal.core.CoreController"
- name="portal:controller=Request"
+ code="org.jboss.portal.core.controller.ajax.AjaxController"
+ name="portal:controller=Ajax"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PageService"
proxy-type="attribute">portal:service=PageService</depends>
<depends
optional-attribute-name="CommandFactory"
- proxy-type="attribute">portal:commandFactory=Labs</depends>
+ proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
<depends
optional-attribute-name="URLFactory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
<depends
- optional-attribute-name="CommandStack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Command</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
<depends
optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject</depends>
<depends
optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
<!-- -->
@@ -709,7 +834,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Config"
@@ -733,10 +858,10 @@
| Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
<mbean
- code="org.jboss.portal.core.system.LifecycleInvoker"
+ code="org.jboss.portal.jems.as.system.LifecycleInvoker"
name="portal:service=Controller,target=ObjectDeploymentFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
@@ -751,7 +876,7 @@
code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
name="portal:deploymentFactory=Object"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -769,10 +894,10 @@
| Uncomment in cluster mode : have the creation of instances run as a clustered singleton
<mbean
- code="org.jboss.portal.core.system.LifecycleInvoker"
+ code="org.jboss.portal.jems.as.system.LifecycleInvoker"
name="portal:service=Controller,target=PortletAppDeploymentFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
@@ -787,7 +912,7 @@
code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!--
<depends>jboss.ha:service=HASingletonDeployer</depends>
@@ -817,7 +942,7 @@
code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
name="portal:deploymentFactory=Layout"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -830,7 +955,7 @@
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
name="portal:deploymentFactory=LayoutFeatures"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -843,7 +968,7 @@
code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
name="portal:deploymentFactory=Theme"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -856,7 +981,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
<depends
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,19 +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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<portal-renderSet>
<renderSet name="divRenderer">
<set content-type="text/html">
- <region-renderer>org.jboss.portal.theme.impl.render.DivRegionRenderer</region-renderer>
- <window-renderer>org.jboss.portal.theme.impl.render.DivWindowRenderer</window-renderer>
- <portlet-renderer>org.jboss.portal.theme.impl.render.DivPortletRenderer</portlet-renderer>
- <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer>
+ <ajax-enabled>true</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
</set>
</renderSet>
<renderSet name="emptyRenderer">
<set content-type="text/html">
- <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
- <window-renderer>org.jboss.portal.theme.impl.render.EmptyWindowRenderer</window-renderer>
- <portlet-renderer>org.jboss.portal.theme.impl.render.EmptyPortletRenderer</portlet-renderer>
- <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer>
+ <ajax-enabled>true</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
</set>
</renderSet>
</portal-renderSet>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
@@ -8,120 +31,6 @@
<distributable/>
-->
- <!-- LABS FILTERS -->
- <servlet>
- <servlet-name>loginServlet</servlet-name>
- <servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>loginServlet</servlet-name>
- <url-pattern>/loginAction</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>wrongLoginServlet</servlet-name>
- <servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>wrongLoginServlet</servlet-name>
- <url-pattern>/loginFailed</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>ShowLoginPage</servlet-name>
- <servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ShowLoginPage</servlet-name>
- <url-pattern>/showLogin</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ShowLoginPage</servlet-name>
- <url-pattern>/logout</url-pattern>
- </servlet-mapping>
-
- <filter>
- <filter-name>titleAndTimestampFilter</filter-name>
- <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>titleAndTimestampFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter>
- <filter-name>autologinFilter</filter-name>
- <filter-class>org.jboss.forge.portal.AutologinFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>autologinFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter>
- <filter-name>moveMeta</filter-name>
- <filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>moveMeta</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!-- BlockPages filter -->
- <!-- TAKEN FROM SOHIL'S WEB.XML
- <filter>
- <filter-name>BlockPagesFilter</filter-name>
- <filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>BlockPagesFilter</filter-name>
- <servlet-name>PortalServlet</servlet-name>
- </filter-mapping>
- -->
-
- <!-- SSL Processor -->
- <filter>
- <filter-name>SSLProcessor</filter-name>
- <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>SSLProcessor</filter-name>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>SSLProcessor</filter-name>
- <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
- </filter-mapping>
-
- <!-- Attributes filter -->
- <filter>
- <filter-name>AttributesFilter</filter-name>
- <filter-class>org.jboss.forge.portal.AttributesFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>AttributesFilter</filter-name>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>AttributesFilter</filter-name>
- <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
- </filter-mapping>
-
- <!-- END OF LABS FILTERS -->
-
-
<!-- The portal servlet is the main entrance point -->
<servlet>
<servlet-name>PortalServletWithPathMapping</servlet-name>
@@ -133,7 +42,7 @@
</init-param>
<init-param>
<param-name>controllerName</param-name>
- <param-value>portal:controller=Request</param-value>
+ <param-value>portal:controller=Core</param-value>
<description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
@@ -154,7 +63,7 @@
</init-param>
<init-param>
<param-name>controllerName</param-name>
- <param-value>portal:controller=Request</param-value>
+ <param-value>portal:controller=Core</param-value>
<description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
@@ -188,7 +97,7 @@
<url-pattern>/authsec/*</url-pattern>
</servlet-mapping>
- <!-- Force the mapping of the index.jsp -->
+ <!-- Force the mapping of the index.jsp because of the default servlet replacement -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>/login.jsp</url-pattern>
@@ -268,23 +177,41 @@
<auth-method>FORM</auth-method>
<realm-name>JBoss Portal</realm-name>
<form-login-config>
- <form-login-page>/showLogin</form-login-page>
- <!-- <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&loginFailed=loginFailed</form-error-page>-->
- <form-error-page>/portal/loginFailed</form-error-page>
+ <form-login-page>/login.jsp</form-login-page>
+ <form-error-page>/error.jsp</form-error-page>
</form-login-config>
</login-config>
- <!-- TAKEN FROM SOHIL'S WEB.XML
- <login-config>
- <auth-method>JBOSS-FEDERATED-SSO</auth-method>
- <realm-name>JBoss Portal</realm-name>
- <form-login-config>
- <form-login-page>/index.html?ctrl:id=page.default.login</form-login-page>
- <form-error-page>/index.html?ctrl:id=window.default.LoginWindow&ctrl:type=action&action=loginFailed</form-error-page>
- </form-login-config>
- </login-config>-->
-
<security-role>
<role-name>Authenticated</role-name>
</security-role>
+
+ <!-- AJAX -->
+
+ <!-- The portal servlet for ajax requests -->
+ <servlet>
+ <servlet-name>PortalServletForAjax</servlet-name>
+ <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+ <init-param>
+ <param-name>asDefaultServlet</param-name>
+ <param-value>false</param-value>
+ <description>The servlet needs to know wether it is set as a default servlet or not</description>
+ </init-param>
+ <init-param>
+ <param-name>controllerName</param-name>
+ <param-value>portal:controller=Ajax</param-value>
+ <description>The request controller for the portal servlet</description>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>Authenticated</role-name>
+ <role-link>Authenticated</role-link>
+ </security-role-ref>
+ </servlet>
+
+ <!-- Provide secure access to authenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServletForAjax</servlet-name>
+ <url-pattern>/ajax/*</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -30,7 +30,7 @@
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import java.io.IOException;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -39,7 +39,7 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -26,7 +26,7 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.PermissionTools;
import org.jboss.forge.common.projects.ProjectDescriptor;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.identity.User;
import org.jboss.portlet.JBossRenderRequest;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/LinkEntry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/LinkEntry.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/LinkEntry.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -23,7 +23,7 @@
import org.w3c.dom.Node;
import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.forge.common.projects.ProjectDescriptor;
import org.jboss.forge.common.ForgeHelper;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.ArrayList;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.ProjectDescriptor;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectMenuEntry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectMenuEntry.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectMenuEntry.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -23,7 +23,7 @@
import org.w3c.dom.Node;
import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectsMenuEntry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectsMenuEntry.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/ProjectsMenuEntry.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -23,7 +23,7 @@
import org.w3c.dom.Node;
import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SeparatorEntry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SeparatorEntry.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SeparatorEntry.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -22,7 +22,7 @@
package org.jboss.forge.common.navigation;
import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import java.util.Set;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SpecialLinkEntry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SpecialLinkEntry.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/navigation/SpecialLinkEntry.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -23,7 +23,7 @@
import org.w3c.dom.Node;
import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.forge.common.XmlTools;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -27,7 +27,7 @@
import java.util.Map;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
/**
@@ -167,7 +167,6 @@
/**
* Method constructs path to the DownloadCounterPortlet JSP view file.
*
- * @param portalName
* @return Path to the DownloadCounterPortlet's JSP view file.
*/
public static String getJspCmPath() {
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -44,7 +44,7 @@
import org.jboss.forge.common.projects.elements.PropertiesMap;
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -189,7 +189,7 @@
if (parentDesc!=null){
this.sortOrder = parentDesc.getSortOrder();
this.visible = parentDesc.getVisible();
- //System.out.println("USTAWIÅEM SORT: "+sortOrder.name()+" VISIBLE: "+visible);
+ //System.out.println("USTAWI??EM SORT: "+sortOrder.name()+" VISIBLE: "+visible);
}
// Iterating to find counters' settings which must be parsed first because
@@ -281,7 +281,7 @@
if (parentDesc==null) {
//System.out.println("++++++++++++");
- //System.out.println("ITERACJA DOWNLOADCOUNTERÓW");
+ //System.out.println("ITERACJA DOWNLOADCOUNTER??W");
for (String path : counters.keySet()) {
//System.out.println("COUNTER: "+path);
}
@@ -309,9 +309,6 @@
* Name of the portal to which this component belong to.
* @param projectId
* Id of the project to which this component belong to.
- * @param thisCategory
- * An element holding information about this category (name,
- * description, etc)
* @param componentDir
* Name of the directory storing the files used (descriptors,
* content, etc)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -44,7 +44,7 @@
import org.jboss.forge.common.projects.elements.PropertiesMap;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.aop.Inject;
import org.jboss.shotoku.tools.Tools;
@@ -130,7 +130,7 @@
}
/*if (projectId.compareTo("jbosswiki")==0) {
- System.out.println("TWORZĘ PROJEKT");
+ System.out.println("TWORZ?? PROJEKT");
try {
//JAXBContext jc = JAXBContext.newInstance("org.jboss.forge.common.projects.test");
JAXBContext jc = JAXBContext.newInstance("org.jboss.forge.common.projects.test");
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -27,7 +27,7 @@
import org.jboss.forge.common.navigation.Menu;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* A class which manages creating project and projects descriptors for a given
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -21,7 +21,6 @@
*/
package org.jboss.forge.common.projects;
-import java.io.FileInputStream;
import java.io.IOException;
import java.util.*;
@@ -46,7 +45,7 @@
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -22,7 +22,7 @@
package org.jboss.forge.common.projects.elements;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* An interface that must implemented by classes which map bindings to contexts
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -22,7 +22,7 @@
package org.jboss.forge.common.projects.elements;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* An empty, do-nothing, bindings handler.
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -24,7 +24,7 @@
import java.util.Iterator;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* A bindings handler which fills the context with information read from a
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -26,7 +26,7 @@
import java.util.List;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* A stack of many bindings handlers. Each function is called on all handlers.
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -25,7 +25,7 @@
import org.jboss.forge.common.projects.AbstractDescriptor;
import org.jboss.forge.common.projects.DomToXmlTransformer;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -33,7 +33,7 @@
import org.jboss.forge.common.projects.XmlInputFactory;
import org.jboss.forge.common.projects.DomToXmlTransformer;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -22,7 +22,7 @@
package org.jboss.forge.common.projects.elements;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* A class which instances represent properties, which may be referenced from
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -22,7 +22,7 @@
package org.jboss.forge.common.projects.elements;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -24,7 +24,7 @@
import java.util.List;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -24,7 +24,7 @@
import java.util.Iterator;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerStack.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerStack.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerStack.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -26,7 +26,7 @@
import java.util.ArrayList;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/primates/PrimateDTO.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -27,7 +27,7 @@
import java.util.Set;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -32,7 +32,7 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.DownloadCounterTools;
import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -32,7 +32,7 @@
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.tools.Pair;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/src/java/org/jboss/forge/navigation/NavigationPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -29,8 +29,8 @@
import org.jboss.forge.common.Constants;
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -39,7 +39,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.AbstractDescriptor;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.logging.Logger;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -25,7 +25,7 @@
import org.jboss.forge.podcast.PodcastLocations;
import org.apache.xerces.parsers.DOMParser;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.aop.Inject;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -28,7 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -30,7 +30,7 @@
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -35,7 +35,7 @@
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
Added: labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/TODO
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/TODO 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/TODO 2006-12-22 22:52:04 UTC (rev 8571)
@@ -0,0 +1,2 @@
+REMOVE?
+
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/maven.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/maven.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -7,23 +7,23 @@
<!-- Default war-project goals -->
<goal name="all">
- <attainGoal name="prj-all" />
+<!-- <attainGoal name="prj-all" />-->
</goal>
<goal name="build">
- <attainGoal name="prj-war-build" />
+<!-- <attainGoal name="prj-war-build" />-->
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}" flatten="true" overwrite="true">
+<!-- <ant:copy todir="${local.deploy.dir}" flatten="true" overwrite="true">
<ant:fileset dir=".">
<ant:filename name="to-copy/*" />
</ant:fileset>
</ant:copy>
- <attainGoal name="prj-war-deploy" />
+ <attainGoal name="prj-war-deploy" />-->
</goal>
<goal name="clean">
- <attainGoal name="prj-clean" />
+<!-- <attainGoal name="prj-clean" />-->
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/src/java/org/jboss/labs/portlet/timetracker/TimeTrackerPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/src/java/org/jboss/labs/portlet/timetracker/TimeTrackerPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/src/java/org/jboss/labs/portlet/timetracker/TimeTrackerPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -22,7 +22,7 @@
package org.jboss.labs.portlet.timetracker;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
@@ -128,4 +128,4 @@
}
-}
\ No newline at end of file
+}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMM.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMM.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMM.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -44,7 +44,7 @@
import org.jboss.forge.jmm.portlet.templates.MatrixTemplate;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
@@ -217,4 +217,4 @@
updateDate = pluginsValues.getDate();
}
-}
\ No newline at end of file
+}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -34,7 +34,7 @@
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/JMMPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -30,7 +30,7 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.jmm.common.Constants;
import org.jboss.forge.jmm.common.Locations;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/CellTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/CellTemplate.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/CellTemplate.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -28,7 +28,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.jmm.common.Tags;
import org.jboss.forge.jmm.common.protocol.conf.PluginsValues;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Column.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Column.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Column.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -31,7 +31,7 @@
import org.jboss.forge.jmm.common.protocol.conf.PluginValues;
import org.jboss.forge.jmm.common.tools.ProjectsByScoreComparator;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
/**
* @author Pawel Wrzeszcz
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Columns.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Columns.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/Columns.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -40,7 +40,7 @@
import org.jboss.forge.jmm.common.tools.ProjectsByNameComparator;
import org.jboss.forge.jmm.common.tools.ProjectsByScoreComparator;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -259,4 +259,4 @@
return columns.values();
}
-}
\ No newline at end of file
+}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MatrixTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MatrixTemplate.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MatrixTemplate.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -29,7 +29,7 @@
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.jmm.common.Tags;
import org.jboss.forge.jmm.common.protocol.conf.PluginsValues;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MetricTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MetricTemplate.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/MetricTemplate.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -27,7 +27,7 @@
import org.jboss.forge.jmm.common.protocol.conf.PluginsValues;
import org.jboss.forge.jmm.common.protocol.conf.Plugin.State;
import org.jboss.forge.common.XmlTools;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/RowTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/RowTemplate.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/jmm-portlet/src/java/org/jboss/forge/jmm/portlet/templates/RowTemplate.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -28,7 +28,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.jmm.common.Tags;
import org.jboss.forge.jmm.common.protocol.conf.PluginsValues;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/labs.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/labs.iml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/labs.iml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -41,6 +41,7 @@
<excludeFolder url="file://$MODULE_DIR$/forge-wiki" />
<excludeFolder url="file://$MODULE_DIR$/jboss-as-binaries" />
<excludeFolder url="file://$MODULE_DIR$/jbosswiki" />
+ <excludeFolder url="file://$MODULE_DIR$/jmm" />
<excludeFolder url="file://$MODULE_DIR$/mysql-connector" />
<excludeFolder url="file://$MODULE_DIR$/polls" />
<excludeFolder url="file://$MODULE_DIR$/portal-binaries" />
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollTools.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollTools.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -38,7 +38,7 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portlet.JBossRenderResponse;
import org.jboss.shotoku.ContentManager;
@@ -188,9 +188,7 @@
/**
* Method constructs path to the PollPortlet JSP view file containing
* information about voting results.
- *
- * @param portalName
- * Name of the portal.
+ *
* @return Path to the PollPortlet's JSP voting info view file.
*/
public static String getInfoJsp() {
@@ -200,9 +198,7 @@
/**
* Method constructs path to the PollPortlet JSP view file containing
* detailed information about who and how has voted on specified poll.
- *
- * @param portalName
- * Name of the portal.
+ *
* @return Path to the PollPortlet's JSP voting detailed info view file.
*/
public static String getDetailsJsp() {
@@ -212,9 +208,7 @@
/**
* Method constructs path to the PollPortlet JSP view file containing
* voting question.
- *
- * @param portalName
- * Name of the portal.
+ *
* @return Path to the PollPortlet's JSP voting view file.
*/
public static String getVotingJsp() {
@@ -313,12 +307,6 @@
/**
* This method produces conten context for JSP view file showing
* information about voting.
- * @param portalName
- * Just portal name.
- * @param projectId
- * Project Id name from which request for context is comming.
- * @param cm
- * ContentManager object used for access to cms.
* @param response
* JBossRenderResponse object which is used for creating urls.
* @param pollIdSpecified
@@ -446,14 +434,10 @@
/**
* This method produces conten context for JSP view file showing
* detailed information about voting.
- * @param portalName
- * Just portal name.
* @param projectId
* Project Id name from which request for context is comming.
* @param pollId
* Id of a Poll for which the detailed information context must be produced.
- * @param cm
- * ContentManager object used for access to cms.
* @param response
* JBossRenderResponse object which is used for creating urls.
* @return
@@ -593,12 +577,6 @@
/**
* This method produces conten context for JSP view file showing
* detailed information about voting.
- * @param portalName
- * Just portal name.
- * @param projectId
- * Project Id name from which request for context is comming.
- * @param cm
- * ContentManager object used for access to cms.
* @param response
* JBossRenderResponse object which is used for creating urls.
* @return
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollsPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/polls/src/java/org/jboss/forge/polls/PollsPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -35,7 +35,7 @@
import org.jboss.forge.polls.exceptions.NoSuchPollAnswerException;
import org.jboss.forge.polls.service.PollDTO;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossActionResponse;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-hsqldb-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-hsqldb-ds.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-hsqldb-ds.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>PortalDS</jndi-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-mysql-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-mysql-ds.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-mysql-ds.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>PortalDS</jndi-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-oracle-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-oracle-ds.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-oracle-ds.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>PortalDS</jndi-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-postgresql-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-postgresql-ds.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-postgresql-ds.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>PortalDS</jndi-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-sqlserver-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-sqlserver-ds.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/setup/portal-sqlserver-ds.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>PortalDS</jndi-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/META-INF/jboss-service.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<server>
<!-- Server configuration service -->
@@ -6,7 +29,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,14 +39,14 @@
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
name="portal:service=AuthorizationDomainRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
name="portal:service=PortalAuthorizationManagerFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="AuthorizationDomainRegistry"
@@ -33,7 +56,7 @@
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
name="portal:service=PortletSecurityService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
@@ -43,37 +66,26 @@
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
</mbean>
- <!-- Portlet state -->
- <mbean
- code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
- name="portal:service=StateStore,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends>portal:service=Hibernate,type=Portlet</depends>
- <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
- </mbean>
-
<!-- Server stack -->
<mbean
code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
name="portal:service=Interceptor,type=Server,name=Transaction"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.server.UserInterceptor"
name="portal:service=Interceptor,type=Server,name=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="UserModule"
@@ -83,115 +95,128 @@
code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
name="portal:service=Interceptor,type=Server,name=Locale"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
name="portal:service=Interceptor,type=Server,name=ContentType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.aspects.server.NavigationInterceptor"
- name="portal:service=Interceptor,type=Server,name=Navigation"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- </mbean>
- <mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Server"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=ContentType</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Server,name=Navigation</depends-list-element>
</depends-list>
</mbean>
<!-- Command stack -->
<mbean
+ code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PortalNode"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.aspects.controller.PageNavigationInterceptor"
name="portal:service=Interceptor,type=Command,name=PageNavigation"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.aspects.controller.PortalNodeInterceptor"
- name="portal:service=Interceptor,type=Command,name=PortalNode"
+ code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PageCustomizer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ 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"
- name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+ code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Ajax"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ 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.EventBroadcasterInterceptor"
+ code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends
+ optional-attribute-name="ListenerRegistry"
+ proxy-type="attribute">portal:service=ListenerRegistry</depends>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Command"
+ code="org.jboss.portal.core.aspects.controller.WindowCacheInterceptor"
+ name="portal:service=Interceptor,type=Command,name=WindowCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Command"
+ xmbean-dd=""
+ 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=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=PageNavigation</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=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=WindowCache</depends-list-element>
</depends-list>
</mbean>
- <!-- Consumer stack -->
+ <!-- Instance stack -->
<mbean
code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ 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.portlet.aspects.portlet.ConsumerCacheInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- </mbean>
- <mbean
code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Instance"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
</depends-list>
</mbean>
@@ -201,90 +226,90 @@
code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Valve"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.bridge.BridgeInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Bridge"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=WindowStates"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Modes"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Transaction"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Header"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Producer"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
@@ -300,21 +325,21 @@
code="org.jboss.portal.theme.impl.ThemeServiceImpl"
name="portal:service=ThemeService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.LayoutServiceImpl"
name="portal:service=LayoutService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.page.PageServiceImpl"
name="portal:service=PageService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="LayoutService"
@@ -351,7 +376,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@@ -366,7 +391,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
@@ -381,7 +406,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@@ -395,7 +420,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Portlet"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@@ -408,30 +433,32 @@
<!-- Modules -->
<mbean
- code="org.jboss.portal.identity.db.UserModuleImpl"
+ code="org.jboss.portal.identity.db.DBUserModuleImpl"
name="portal:service=Module,type=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<attribute name="JNDIName">java:/portal/UserModule</attribute>
<attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
</mbean>
<mbean
- code="org.jboss.portal.identity.db.RoleModuleImpl"
+ code="org.jboss.portal.identity.db.DBRoleModuleImpl"
name="portal:service=Module,type=Role"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<attribute name="JNDIName">java:/portal/RoleModule</attribute>
<attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
</mbean>
- <mbean
+
+ <!-- not needed -->
+ <!--mbean
code="org.jboss.portal.core.impl.mail.MailModuleImpl"
name="portal:service=Module,type=Mail"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss:service=Mail</depends>
<depends>portal:service=Module,type=User</depends>
@@ -443,7 +470,8 @@
<attribute name="SMTPConnectionTimeout">100000</attribute>
<attribute name="SMTPTimeout">10000</attribute>
<attribute name="JNDIName">java:portal/MailModule</attribute>
- </mbean>
+ </mbean-->
+
<mbean
code="org.jboss.security.auth.login.DynamicLoginConfig"
name="portal:service=JAASLoginModule">
@@ -457,7 +485,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -466,7 +494,7 @@
code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
name="portal:service=ListenerRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -475,7 +503,7 @@
code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
name="portal:service=ListenerService,type=test_listener"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Registry"
@@ -489,12 +517,15 @@
code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
name="portal:container=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Instance</depends>
<depends
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
+ <depends
optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Instance</depends>
+ proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
@@ -507,7 +538,7 @@
code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
name="portal:container=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=PortalObject</depends>
<depends
@@ -516,25 +547,22 @@
<depends
optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
- <depends
- optional-attribute-name="PortalEventListenerRegistry"
- proxy-type="attribute">portal:service=ListenerRegistry</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
</mbean>
<!-- Command factories -->
<mbean
- code="org.jboss.portal.core.command.mapper.DelegatingCommandFactoryService"
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
name="portal:commandFactory=DefaultPortal"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="NextFactory"
@@ -547,19 +575,19 @@
code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
name="portal:commandFactory=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Container"
proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
<mbean
- code="org.jboss.portal.core.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,prefix=portal"
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=portal"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="Prefix">portal</attribute>
+ <attribute name="Path">/portal</attribute>
<depends
optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating</depends>
@@ -567,33 +595,101 @@
optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=PortalObject</depends>
</mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
+ name="portal:commandFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=signout"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/signout</attribute>
+ <depends
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="DelegateFactory"
+ 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/>
+ <attribute name="DashboardId">dashboard</attribute>
+ </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>
<!-- URL factories -->
<mbean
- code="org.jboss.portal.core.command.mapper.DelegatingURLFactoryService"
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
name="portal:urlFactory=Delegating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
name="portal:urlFactory=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="Prefix">portal</attribute>
+ <attribute name="Path">/portal</attribute>
<depends
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+ name="portal:urlFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/signout</attribute>
+ <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+ name="portal:urlFactory=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/dashboard</attribute>
+ <attribute name="ClassNames">org.jboss.portal.core.controller.command.ViewDashboardCommand</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
<!-- The federating portlet invoker -->
<mbean
code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
name="portal:service=PortletInvoker,type=Federating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -602,29 +698,59 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Stack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Producer</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
<depends
optional-attribute-name="Registry"
proxy-type="attribute">portal:service=WebAppRegistry</depends>
</mbean>
- <!-- The state portlet invoker -->
+ <!-- The producer portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
- name="portal:service=PortletInvoker,type=Stateful"
+ code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
+ name="portal:service=PersistenceManager,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends>portal:service=Hibernate,type=Portlet</depends>
+ <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
+ name="portal:service=StateManagementPolicy,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="PersistLocally">true</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.portlet.impl.state.StateConverterV0"
+ name="portal:service=StateConverter,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
+ name="portal:service=PortletInvoker,type=Producer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
<depends
optional-attribute-name="PortletInvoker"
proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
<depends
- optional-attribute-name="StateStore"
- proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
+ optional-attribute-name="PersistenceManager"
+ proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+ <depends
+ optional-attribute-name="StateManagementPolicy"
+ proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+ <depends
+ optional-attribute-name="StateConverter"
+ proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
</mbean>
<!-- Register the state portlet invoker on the federating portlet invoker -->
@@ -632,39 +758,53 @@
code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
name="portal:service=PortletInvokerRegistration,id=local"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Id">local</attribute>
<depends
optional-attribute-name="PortletInvoker"
- proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
+ proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
<depends
optional-attribute-name="FederatingPortletInvoker"
proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
</mbean>
- <!-- The instance portlet invoker -->
+ <!-- The core controller -->
<mbean
- code="org.jboss.portal.portlet.test.TestPortletInvoker"
- name="portal:service=PortletInvoker,type=Instance"
+ code="org.jboss.portal.core.controller.CoreController"
+ name="portal:controller=Core"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="Producer"
- proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ optional-attribute-name="PageService"
+ proxy-type="attribute">portal:service=PageService</depends>
<depends
- optional-attribute-name="Stack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Instance</depends>
+ optional-attribute-name="CommandFactory"
+ proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+ <depends
+ optional-attribute-name="URLFactory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
-
- <!-- The core controller -->
+ <!-- The ajax controller -->
<mbean
- code="org.jboss.portal.core.CoreController"
- name="portal:controller=Request"
+ code="org.jboss.portal.core.controller.ajax.AjaxController"
+ name="portal:controller=Ajax"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PageService"
@@ -676,14 +816,17 @@
optional-attribute-name="URLFactory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
<depends
- optional-attribute-name="CommandStack"
- proxy-type="attribute">portal:service=InterceptorStack,type=Command</depends>
+ optional-attribute-name="StackFactory"
+ proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
<depends
optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject</depends>
<depends
optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
<!-- -->
@@ -691,7 +834,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Config"
@@ -715,10 +858,10 @@
| Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
<mbean
- code="org.jboss.portal.core.system.LifecycleInvoker"
+ code="org.jboss.portal.jems.as.system.LifecycleInvoker"
name="portal:service=Controller,target=ObjectDeploymentFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
@@ -733,7 +876,7 @@
code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
name="portal:deploymentFactory=Object"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -751,10 +894,10 @@
| Uncomment in cluster mode : have the creation of instances run as a clustered singleton
<mbean
- code="org.jboss.portal.core.system.LifecycleInvoker"
+ code="org.jboss.portal.jems.as.system.LifecycleInvoker"
name="portal:service=Controller,target=PortletAppDeploymentFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
@@ -769,7 +912,7 @@
code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!--
<depends>jboss.ha:service=HASingletonDeployer</depends>
@@ -799,7 +942,7 @@
code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
name="portal:deploymentFactory=Layout"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -812,7 +955,7 @@
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
name="portal:deploymentFactory=LayoutFeatures"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -825,7 +968,7 @@
code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
name="portal:deploymentFactory=Theme"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -838,7 +981,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
<depends
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/config.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<properties>
<!-- When a window has restrictedaccess : show or hide values are permitted -->
<entry key="core.render.window_access_denied">show</entry>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/data/default-object.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<deployments>
<deployment>
<parent-ref/>
@@ -7,36 +30,36 @@
<portal-name>default</portal-name>
<properties>
<!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
<property>
<name>layout.id</name>
<value>generic</value>
</property>
<!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
<property>
<name>theme.id</name>
- <value>Nphalanx</value>
+ <value>renaissance</value>
</property>
<!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
<property>
<name>theme.renderSetId</name>
<value>divRenderer</value>
</property>
<!--
- | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
- -->
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
<property>
<name>layout.strategyId</name>
<value>maximizedRegion</value>
</property>
<!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
<property>
<name>portal.defaultObjectName</name>
<value>default</value>
@@ -55,11 +78,16 @@
<page>
<page-name>default</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
+ <window-name>JSPPortletWindow</window-name>
+ <instance-ref>JSPPortletInstance</instance-ref>
+ <region>left</region>
<height>0</height>
- <!-- keep portal and page properties for this window -->
+ </window>
+ <window>
+ <window-name>DefaultCMSPortletWindow</window-name>
+ <instance-ref>CMSPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
<properties>
<!-- use the window renderer from the emptyRenderer renderSet -->
<property>
@@ -79,34 +107,16 @@
</properties>
</window>
<window>
- <window-name>JSPPortletWindow</window-name>
- <instance-ref>JSPPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>DefaultCMSPortletWindow</window-name>
- <instance-ref>CMSPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
<window-name>UserPortletWindow</window-name>
<instance-ref>UserPortletInstance</instance-ref>
<region>left</region>
<height>1</height>
</window>
- <window>
- <window-name>CatalogPortletWindow</window-name>
- <instance-ref>CatalogPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
</page>
<security-constraint>
<policy-permission>
<unchecked/>
- <action-name>view</action-name>
+ <action-name>viewrecursive</action-name>
<action-name>personalizerecursive</action-name>
</policy-permission>
</security-constraint>
@@ -118,42 +128,12 @@
<page>
<page-name>News</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>WeatherPortletWindow</window-name>
<instance-ref>WeatherPortletInstance</instance-ref>
<region>left</region>
<height>0</height>
</window>
<window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>left</region>
- <height>1</height>
- </window>
- <window>
<window-name>NewsPortletWindow</window-name>
<instance-ref>NewsPortletInstance</instance-ref>
<region>center</region>
@@ -168,70 +148,156 @@
</page>
</deployment>
<deployment>
+ <parent-ref/>
<if-exists>keep</if-exists>
- <parent-ref>default</parent-ref>
- <page>
- <page-name>Admin</page-name>
- <window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>RolePortletWindow</window-name>
- <instance-ref>RolePortletInstance</instance-ref>
- <region>left</region>
- <height>1</height>
- </window>
- <window>
- <window-name>CatalogPortletWindow</window-name>
- <instance-ref>CatalogPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>ManagementPortletWindow</window-name>
- <instance-ref>ManagementPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CMSAdminPortletWindow</window-name>
- <instance-ref>CMSAdminPortletInstance</instance-ref>
- <region>center</region>
- <height>1</height>
- </window>
+ <portal>
+ <portal-name>dashboard</portal-name>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>renaissance</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+ <!--
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
<security-constraint>
<policy-permission>
+ <role-name>Authenticated</role-name>
+ <action-name>dashboard</action-name>
+ </policy-permission>
+ </security-constraint>
+ </portal>
+ </deployment>
+
+ <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>admin</portal-name>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>renaissance</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+ <!--
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+ <!--
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <page>
+ <page-name>default</page-name>
+ <window>
+ <window-name>ManagementPortletWindow</window-name>
+ <instance-ref>ManagementPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>Members</page-name>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>RolePortletWindow</window-name>
+ <instance-ref>RolePortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>CMS</page-name>
+ <window>
+ <window-name>CMSAdminPortletWindow</window-name>
+ <instance-ref>CMSAdminPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </page>
+ <security-constraint>
+ <policy-permission>
<role-name>Admin</role-name>
<action-name>viewrecursive</action-name>
</policy-permission>
</security-constraint>
- </page>
+ </portal>
</deployment>
</deployments>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,135 +1,158 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class
- name="org.jboss.portal.core.impl.model.instance.InstanceImpl"
- table="JBP_INSTANCE">
+ name="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
+ table="JBP_INSTANCE">
<cache usage="read-write"/>
<id
- name="key"
- column="PK"
- access="field">
+ name="key"
+ column="PK"
+ access="field">
<generator class="native">
<param name="sequence">instance_seq</param>
</generator>
</id>
<property
- name="instanceId"
- column="ID"
- not-null="true"
- unique="true"/>
+ name="instanceId"
+ column="ID"
+ not-null="true"
+ unique="true"/>
<property
- name="portletRef"
- column="PORTLET_REF"
- not-null="false"
- unique="false"/>
+ name="portletRef"
+ column="PORTLET_REF"
+ not-null="false"
+ unique="false"/>
<property
- name="modifiable"
- column="MODIFIABLE"
- not-null="true"
- unique="false"/>
+ name="modifiable"
+ column="MODIFIABLE"
+ not-null="true"
+ unique="false"/>
<property
- name="state"
- column="SER_STATE"
- not-null="false"
- unique="false"
- length="50000000"/>
+ name="state"
+ column="SER_STATE"
+ not-null="false"
+ unique="false"
+ length="50000000"/>
<map
- name="securityBindings"
- sort="unsorted"
- inverse="true"
- cascade="none"
- fetch="join">
+ name="securityBindings"
+ sort="unsorted"
+ inverse="true"
+ cascade="none"
+ fetch="join">
<cache usage="read-write"/>
<key column="INSTANCE_PK"/>
<index column="ROLE" type="string"/>
<one-to-many class="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"/>
</map>
<set
- name="userInstances"
- inverse="true"
- cascade="save-update"
- fetch="select"
- lazy="extra">
+ name="customizations"
+ inverse="true"
+ cascade="save-update"
+ fetch="select"
+ lazy="extra">
<cache usage="read-write"/>
<key column="INSTANCE_PK"/>
- <one-to-many class="org.jboss.portal.core.impl.model.instance.UserInstance"/>
+ <one-to-many class="org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl"/>
</set>
</class>
<class
- name="org.jboss.portal.core.impl.model.instance.UserInstance"
- table="JBP_INSTANCE_PER_USER">
+ name="org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl"
+ table="JBP_INSTANCE_PER_USER">
<cache usage="read-write"/>
<id
- name="key"
- column="PK"
- access="field">
+ name="key"
+ column="PK"
+ access="field">
<generator class="native">
<param name="sequence">instance_seq</param>
</generator>
</id>
<many-to-one
- name="instance"
- column="INSTANCE_PK"
- class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
- cascade="none"
- fetch="select"/>
+ name="def"
+ column="INSTANCE_PK"
+ class="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
+ cascade="none"
+ fetch="select"/>
<property
- name="state"
- column="SER_STATE"
- not-null="false"
- unique="false"
- length="50000000"/>
+ name="state"
+ column="SER_STATE"
+ not-null="false"
+ unique="false"
+ length="50000000"/>
<properties
- name="user_and_portlet_ref"
- unique="true">
+ name="user_and_portlet_ref"
+ unique="true">
<property
- name="userId"
- column="USER_ID"
- not-null="true"
- length="170"/>
+ name="customizationId"
+ column="USER_ID"
+ not-null="true"
+ length="170"/>
<property
- name="portletRef"
- column="PORTLET_REF"
- not-null="true"
- length="170"/>
+ name="portletRef"
+ column="PORTLET_REF"
+ not-null="true"
+ length="170"/>
</properties>
</class>
<class
- name="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"
- table="JBP_INSTANCE_SECURITY">
+ name="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"
+ table="JBP_INSTANCE_SECURITY">
<cache usage="read-write"/>
<id
- name="key"
- column="PK"
- type="java.lang.Long">
+ name="key"
+ column="PK"
+ type="java.lang.Long">
<generator class="native">
<param name="sequence">instance_seq</param>
</generator>
</id>
<property
- name="role"
- column="ROLE"
- not-null="true"
- unique="false"/>
+ name="role"
+ column="ROLE"
+ not-null="true"
+ unique="false"/>
<set
- name="actions"
- table="JBP_INSTANCE_SECURITY_ACTIONS"
- cascade="none"
- fetch="join">
+ name="actions"
+ table="JBP_INSTANCE_SECURITY_ACTIONS"
+ cascade="none"
+ fetch="join">
<cache usage="read-write"/>
<key column="PK"/>
<element column="ACTIONS" type="string"/>
</set>
<many-to-one
- name="instance"
- column="INSTANCE_PK"
- class="org.jboss.portal.core.impl.model.instance.InstanceImpl"
- cascade="none"
- fetch="select"/>
+ name="instance"
+ column="INSTANCE_PK"
+ class="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
+ cascade="none"
+ fetch="select"/>
</class>
</hibernate-mapping>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<ehcache>
<!-- Sets the path to the directory where cache .data files are created.
@@ -12,27 +35,27 @@
<diskStore path="java.io.tmpdir/instance"/>
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
+ <!--Default Cache configuration. These will applied to caches programmatically created through
+ the CacheManager.
- The following attributes are required for defaultCache:
+ The following attributes are required for defaultCache:
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
+ maxInMemory - Sets the maximum number of objects that will be created in memory
+ eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
+ is never expired.
+ timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+ if the element is not eternal. Idle time is now - last accessed time
+ timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+ if the element is not eternal. TTL is now - creation time
+ overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
+ has reached the maxInMemory limit.
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="120"
- timeToLiveSeconds="120"
- overflowToDisk="false"
- />
+ -->
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="false"
+ timeToIdleSeconds="120"
+ timeToLiveSeconds="120"
+ overflowToDisk="false"
+ />
</ehcache>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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 hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.datasource">java:PortalDS</property>
@@ -16,7 +39,7 @@
<property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
-->
-
+
<!--
| Comment in clustered mode
-->
@@ -24,7 +47,7 @@
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
<!--
-->
-
+
<!-- Force the dialect instead of using autodetection -->
<!--
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/domain.hbm.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class
name="org.jboss.portal.core.impl.model.portal.ObjectNode"
@@ -53,7 +76,7 @@
name="securityConstraints"
inverse="true"
cascade="all-delete-orphan"
- fetch="join" >
+ fetch="join">
<cache usage="read-write"/>
<key column="NODE_KEY"/>
<index
@@ -78,7 +101,7 @@
name="listener"
column="LISTENER"/>
<map
- name="declaredProperties"
+ name="declaredPropertyMap"
cascade="all-delete-orphan"
table="JBP_PORTAL_OBJECT_PROPS"
fetch="join">
@@ -140,8 +163,8 @@
table="JBP_WINDOW">
<key column="PK"/>
<property
- name="instanceRef"
- column="INSTANCE_REF"/>
+ name="instanceRef"
+ column="INSTANCE_REF"/>
</joined-subclass>
</class>
@@ -151,7 +174,7 @@
<cache usage="read-write"/>
<id
name="key"
- column="PK">
+ column="PK">
<generator class="native">
<param name="sequence">sec_seq</param>
</generator>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<ehcache>
<!-- Sets the path to the directory where cache .data files are created.
@@ -9,30 +32,30 @@
user.home - User's home directory
user.dir - User's current working directory
java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/portal"/>
+ <diskStore path="java.io.tmpdir/portal"/>
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
+ <!--Default Cache configuration. These will applied to caches programmatically created through
+ the CacheManager.
- The following attributes are required for defaultCache:
+ The following attributes are required for defaultCache:
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
+ maxInMemory - Sets the maximum number of objects that will be created in memory
+ eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
+ is never expired.
+ timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+ if the element is not eternal. Idle time is now - last accessed time
+ timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+ if the element is not eternal. TTL is now - creation time
+ overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
+ has reached the maxInMemory limit.
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="120"
- timeToLiveSeconds="120"
- overflowToDisk="false"
- />
+ -->
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="false"
+ timeToIdleSeconds="120"
+ timeToLiveSeconds="120"
+ overflowToDisk="false"
+ />
</ehcache>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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 hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.datasource">java:PortalDS</property>
@@ -16,7 +39,7 @@
<property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
-->
-
+
<!--
| Comment in clustered mode
-->
@@ -24,7 +47,7 @@
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
<!--
-->
-
+
<!-- Force the dialect instead of using autodetection -->
<!--
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/domain.hbm.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/ehcache.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<ehcache>
<!-- Sets the path to the directory where cache .data files are created.
@@ -9,30 +32,30 @@
user.home - User's home directory
user.dir - User's current working directory
java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/portlet"/>
+ <diskStore path="java.io.tmpdir/portlet"/>
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
+ <!--Default Cache configuration. These will applied to caches programmatically created through
+ the CacheManager.
- The following attributes are required for defaultCache:
+ The following attributes are required for defaultCache:
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
+ maxInMemory - Sets the maximum number of objects that will be created in memory
+ eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
+ is never expired.
+ timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+ if the element is not eternal. Idle time is now - last accessed time
+ timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+ if the element is not eternal. TTL is now - creation time
+ overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
+ has reached the maxInMemory limit.
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="120"
- timeToLiveSeconds="120"
- overflowToDisk="false"
- />
+ -->
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="false"
+ timeToIdleSeconds="120"
+ timeToLiveSeconds="120"
+ overflowToDisk="false"
+ />
</ehcache>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portlet/hibernate.cfg.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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 hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.datasource">java:PortalDS</property>
@@ -16,7 +39,7 @@
<property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
-->
-
+
<!--
| Comment in clustered mode
-->
@@ -24,7 +47,7 @@
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
<!--
-->
-
+
<!-- Force the dialect instead of using autodetection -->
<!--
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/domain.hbm.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<ehcache>
<!-- Sets the path to the directory where cache .data files are created.
@@ -9,30 +32,30 @@
user.home - User's home directory
user.dir - User's current working directory
java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/user"/>
+ <diskStore path="java.io.tmpdir/user"/>
- <!--Default Cache configuration. These will applied to caches programmatically created through
- the CacheManager.
+ <!--Default Cache configuration. These will applied to caches programmatically created through
+ the CacheManager.
- The following attributes are required for defaultCache:
+ The following attributes are required for defaultCache:
- maxInMemory - Sets the maximum number of objects that will be created in memory
- eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
- is never expired.
- timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
- if the element is not eternal. Idle time is now - last accessed time
- timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
- if the element is not eternal. TTL is now - creation time
- overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
- has reached the maxInMemory limit.
+ maxInMemory - Sets the maximum number of objects that will be created in memory
+ eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
+ is never expired.
+ timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+ if the element is not eternal. Idle time is now - last accessed time
+ timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+ if the element is not eternal. TTL is now - creation time
+ overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
+ has reached the maxInMemory limit.
- -->
- <defaultCache
- maxElementsInMemory="10000"
- eternal="false"
- timeToIdleSeconds="120"
- timeToLiveSeconds="120"
- overflowToDisk="false"
- />
+ -->
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="false"
+ timeToIdleSeconds="120"
+ timeToLiveSeconds="120"
+ overflowToDisk="false"
+ />
</ehcache>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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 hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.datasource">java:PortalDS</property>
@@ -16,7 +39,7 @@
<property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
-->
-
+
<!--
| Comment in clustered mode
-->
@@ -24,7 +47,7 @@
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
<!--
-->
-
+
<!-- Force the dialect instead of using autodetection -->
<!--
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/login-config.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
<policy>
<!-- For the JCR CMS -->
<application-policy name="cms">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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>
<portlet>
<portlet-name>DefaultPortlet</portlet-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/theme/portal-layout.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/theme/portal-layout.tld 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/conf/theme/portal-layout.tld 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3c.org/2001/XMLSchema-instance"
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/javassist.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-federation-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-aop.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<aop>
<metadata
tag="transaction"
@@ -85,14 +108,17 @@
<method name="getInstances">
<trans-attribute>Required</trans-attribute>
</method>
+ <method name="invoke">
+ <trans-attribute>Required</trans-attribute>
+ </method>
</metadata>
<metadata
tag="transaction"
- class="org.jboss.portal.core.impl.portlet.state.StatefulPortletInvoker">
+ class="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker">
<method name="createClone">
<trans-attribute>Required</trans-attribute>
</method>
- <method name="destroyClone">
+ <method name="destroyClones">
<trans-attribute>Required</trans-attribute>
</method>
<method name="invoke">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,73 +1,52 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<server>
-
-
- <!--mbean
- code="org.jboss.portal.cms.impl.interceptors.LogInterceptor"
- name="portal:service=Interceptor,type=Cms,name=Log"
+ <mbean
+ code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate,type=CMS"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- </mbean-->
+ <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+ <attribute name="DoChecking">true</attribute>
+ <attribute name="ConfigLocation">conf/hibernate/cms/hibernate.cfg.xml</attribute>
+ <attribute name="JNDIName">java:/portal/cms/CMSSessionFactory</attribute>
+ </mbean>
- <!--
-
-
<mbean
- code="org.jboss.portal.cms.impl.cache.CMSTreeCacheServiceImpl"
- name="portal:service=CMSTreeCacheService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="Cache" proxy-type="attribute">
- <mbean
- code="org.jboss.cache.TreeCache"
- name="portal:service=CMSTreeCache">
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
- <attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="IsolationLevel">NONE</attribute>
- </mbean>
- </depends>
- <attribute name="JNDIName">java:/portal/cms/CMSTreeCache</attribute>
- </mbean>
-
- <mbean
- code="org.jboss.portal.cms.impl.interceptors.CacheInterceptor"
- name="portal:service=Interceptor,type=Cms,name=Cache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends>portal:service=CMSTreeCacheService</depends>
- </mbean>
- <mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=Cms"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends-list optional-attribute-name="InterceptorNames">
- <depends-list-element>portal:service=Interceptor,type=Cms,name=Cache</depends-list-element>
- </depends-list>
- </mbean>
-
-
- -->
-
- <mbean
code="org.jboss.portal.cms.impl.jcr.JCRCMS"
name="portal:service=CMS"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!-- The datasource hibernate depends on, it can be commented when the file store is used -->
<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
<depends>portal:service=JAASLoginModule</depends>
<depends>portal:service=Hibernate,type=CMS</depends>
<!--
-
- <depends optional-attribute-name="CmsStack" proxy-type="attribute">portal:service=InterceptorStack,type=Cms</depends>
-
+ //this is not needed anymore. this cache is redundant because of JBossCache PM
+ <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends>
-->
<attribute name="DoChecking">true</attribute>
<attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute>
@@ -120,16 +99,16 @@
-->
<!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
- <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager">
+ <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager">
<param name="schemaObjectPrefix" value="WSP"/>
<param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
<param name="externalBLOBs" value="false"/>
</PersistenceManager>
-
+
<!-- XMLPersistenceManager: uses FileSystem for storage -->
<!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
- <!--SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
<param name="path" value="${wsp.home}/index"/>
<param name="useCompoundFile" value="true"/>
<param name="minMergeDocs" value="100"/>
@@ -140,7 +119,7 @@
<param name="cacheSize" value="1000"/>
<param name="forceConsistencyCheck" value="false"/>
<param name="autoRepair" value="true"/>
- </SearchIndex-->
+ </SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/versions">
<!--
@@ -153,7 +132,7 @@
<param name="schemaObjectPrefix" value="VersionEntry"/>
<param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
</FileSystem>
-
+
<!-- LocalFileSystem: uses FileSystem for storage. -->
<!--
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
@@ -167,12 +146,12 @@
-->
<!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
- <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager">
+ <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager">
<param name="schemaObjectPrefix" value="Version"/>
<param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
<param name="externalBLOBs" value="false"/>
</PersistenceManager>
-
+
<!-- XMLPersistenceManager: uses FileSystem for storage -->
<!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
</Versioning>
@@ -181,8 +160,8 @@
</mbean>
<!--
- | Uncomment in clustered mode : replicated cache for hibernate
-
+ | Uncomment in clustered mode : Provides an HA-singleton based clustering architecture.
+
<mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal:service=ProxyFactory,type=CMS">
@@ -220,39 +199,25 @@
<depends optional-attribute-name="Callback" proxy-type="attribute">portal:service=CMS</depends>
<depends optional-attribute-name="ProxyFactory">portal:service=ProxyFactory,type=CMS</depends>
</mbean>
-
-->
<mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=CMS"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
- <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
- <attribute name="DoChecking">true</attribute>
- <attribute name="ConfigLocation">conf/hibernate/cms/hibernate.cfg.xml</attribute>
- <attribute name="JNDIName">java:/portal/cms/CMSSessionFactory</attribute>
- </mbean>
-
-
- <mbean
code="org.jboss.portal.core.cms.CMSObjectCommandFactory"
name="portal:commandFactory=CMSObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="TargetWindowRef">default.default.DefaultCMSPortletWindow</attribute>
<depends optional-attribute-name="CMSService" proxy-type="attribute">portal:service=CMS</depends>
</mbean>
<mbean
- code="org.jboss.portal.core.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,prefix=content"
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=content"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="Prefix">content</attribute>
+ <attribute name="Path">/content</attribute>
<depends
optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating</depends>
@@ -265,9 +230,310 @@
code="org.jboss.portal.core.cms.CMSObjectURLFactory"
name="portal:urlFactory=CMSObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="Prefix">content</attribute>
+ <attribute name="Path">/content</attribute>
<depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
+
+ <!-- TreeCache configuration used to cache CMS data -->
+ <mbean code="org.jboss.cache.TreeCache"
+ name="cms.pm.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>portal:service=Hibernate,type=CMS</depends>
+ <depends>portal:service=CMS</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+ <!--
+ Node locking scheme:
+ OPTIMISTIC
+ PESSIMISTIC (default)
+ using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
+ -->
+ <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
+
+ <!--
+ Isolation level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <!-- in a non-HA environment with the Jackrabbit cluster is activated -->
+ <!--attribute name="CacheMode">INVALIDATION_ASYNC</attribute-->
+ <!-- in a HA environment since there is only a singleton node for CMS, this can be local -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!--
+ Just used for async repl: use a replication queue
+ -->
+ <attribute name="UseReplQueue">false</attribute>
+
+ <!--
+ Replication interval for replication queue (in ms)
+ -->
+ <attribute name="ReplQueueInterval">0</attribute>
+
+ <!--
+ Max number of elements which trigger replication
+ -->
+ <attribute name="ReplQueueMaxElements">0</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all clusters, in order
+ to find each other
+ -->
+ <attribute name="ClusterName">JCRPMCache</attribute>
+
+ <!-- JGroups protocol stack properties. Can also be a URL,
+ e.g. file:/home/bela/default.xml
+ <attribute name="ClusterProperties"></attribute>
+ -->
+
+ <attribute name="ClusterConfig">
+ <config>
+ <!-- UDP: if you have a multihomed machine,
+ set the bind_addr attribute to the appropriate NIC IP address -->
+ <!-- UDP: On Windows machines, because of the media sense feature
+ being broken with multicast (even after disabling media sense)
+ set the loopback attribute to true -->
+ <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+ ip_ttl="64" ip_mcast="true"
+ receive_on_all_interfaces="true"
+ mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
+ ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
+ loopback="false"/>
+ <PING timeout="2000" num_initial_members="3"
+ up_thread="false" down_thread="false"/>
+ <MERGE2 min_interval="10000" max_interval="20000"/>
+ <!-- <FD shun="true" up_thread="true" down_thread="true" />-->
+ <FD_SOCK/>
+ <VERIFY_SUSPECT timeout="1500"
+ up_thread="false" down_thread="false"/>
+ <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
+ max_xmit_size="8192" up_thread="false" down_thread="false"/>
+ <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
+ down_thread="false"/>
+ <pbcast.STABLE desired_avg_gossip="20000"
+ up_thread="false" down_thread="false"/>
+ <FRAG frag_size="8192"
+ down_thread="false" up_thread="false"/>
+ <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
+ shun="true" print_local_addr="true"/>
+ <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
+ </config>
+ </attribute>
+
+ <!--
+ Whether or not to fetch state on joining a cluster
+ NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
+
+ Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+ -->
+ <!--attribute name="FetchInMemoryState">false</attribute-->
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ initial state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">20000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+ <!-- Name of the eviction policy class. -->
+ <attribute name="EvictionPolicyClass"></attribute>
+
+ <!--
+ Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
+ class loader, e.g., inside an application server. Default is "false".
+
+ Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+ -->
+ <!--attribute name="UseRegionBasedMarshalling">false</attribute-->
+
+ <!--
+ Configuring the PortalCMSCacheLoader
+
+ CacheLoader configuratoon for 1.4.0
+ -->
+ <attribute name="CacheLoaderConfiguration">
+ <config>
+ <passivation>false</passivation>
+ <preload></preload>
+ <shared>false</shared>
+ <cacheloader>
+ <class>org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</class>
+ <properties></properties>
+ <async>false</async>
+ <fetchPersistentState>false</fetchPersistentState>
+ <ignoreModifications>false</ignoreModifications>
+ </cacheloader>
+ </config>
+ </attribute>
+ <!--
+ Configuring the PortalCMSCacheLoader
+
+ CacheLoader configuratoon for 1.2.4SP2
+ -->
+ <!--attribute name="CacheLoaderClass">org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</attribute>
+ <attribute name="CacheLoaderConfig" replace="false"></attribute>
+ <attribute name="CacheLoaderPassivation">false</attribute>
+ <attribute name="CacheLoaderPreload"></attribute>
+ <attribute name="CacheLoaderShared">false</attribute>
+ <attribute name="CacheLoaderFetchTransientState">false</attribute>
+ <attribute name="CacheLoaderFetchPersistentState">false</attribute>
+ <attribute name="CacheLoaderAsynchronous">false</attribute-->
+ </mbean>
+
+ <!--
+ | Uncomment in clustered mode : TreeCache configuration for the clustered JackRabbit in-memory cache...
+ | This helps with node synching, but there are other aspects of JackRabbit like versioning subsystem
+ | and locking system that get out-of-sync in the cluster. This leads to unpredicatable results and hence
+ | the idea to cluster JackRabbit needs to be dropped at this time
+ -->
+ <!--mbean code="org.jboss.cache.TreeCache"
+ name="jackrabbit.inmemory.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+
+
+ <attribute name="IsolationLevel">NONE</attribute>
+
+
+ <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
+
+
+ <attribute name="UseReplQueue">false</attribute>
+
+
+ <attribute name="ReplQueueInterval">0</attribute>
+
+
+ <attribute name="ReplQueueMaxElements">0</attribute>
+
+
+ <attribute name="ClusterName">JackRabbitInternalCache</attribute>
+
+
+
+ <attribute name="ClusterConfig">
+ <config>
+ <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+ ip_ttl="64" ip_mcast="true"
+ receive_on_all_interfaces="true"
+ mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
+ ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
+ loopback="false"/>
+ <PING timeout="2000" num_initial_members="3"
+ up_thread="false" down_thread="false"/>
+ <MERGE2 min_interval="10000" max_interval="20000"/>
+ <FD_SOCK/>
+ <VERIFY_SUSPECT timeout="1500"
+ up_thread="false" down_thread="false"/>
+ <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
+ max_xmit_size="8192" up_thread="false" down_thread="false"/>
+ <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
+ down_thread="false"/>
+ <pbcast.STABLE desired_avg_gossip="20000"
+ up_thread="false" down_thread="false"/>
+ <FRAG frag_size="8192"
+ down_thread="false" up_thread="false"/>
+ <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
+ shun="true" print_local_addr="true"/>
+ <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
+ </config>
+ </attribute>
+
+ <attribute name="FetchInMemoryState">false</attribute>
+
+ <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+ <attribute name="SyncReplTimeout">20000</attribute>
+
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+ <attribute name="EvictionPolicyClass"></attribute>
+
+ <attribute name="UseRegionBasedMarshalling">false</attribute>
+ </mbean-->
+
+
+ <!--mbean
+ code="org.jboss.portal.cms.impl.interceptors.LogInterceptor"
+ name="portal:service=Interceptor,type=Cms,name=Log"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean-->
+
+ <!--
+ //this is not needed anymore. this cache is redundant since there is a JBossCache PM
+ <mbean
+ code="org.jboss.portal.cms.impl.cache.CMSTreeCacheServiceImpl"
+ name="portal:service=CMSTreeCacheService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Cache" proxy-type="attribute">
+ <mbean
+ code="org.jboss.cache.TreeCache"
+ name="portal:service=CMSTreeCache">
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
+ <attribute name="CacheMode">REPL_ASYNC</attribute>
+ <attribute name="IsolationLevel">NONE</attribute>
+ </mbean>
+ </depends>
+ <attribute name="JNDIName">java:/portal/cms/CMSTreeCache</attribute>
+ </mbean>
+
+ <mbean
+ code="org.jboss.portal.cms.impl.interceptors.CacheInterceptor"
+ name="portal:service=Interceptor,type=Cms,name=Cache"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends>portal:service=CMSTreeCacheService</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Cms"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends-list optional-attribute-name="InterceptorNames">
+ <depends-list-element>portal:service=Interceptor,type=Cms,name=Cache</depends-list-element>
+ </depends-list>
+ </mbean>
+ -->
</server>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/domain.hbm.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,173 +1,196 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="org.jboss.portal.cms.hibernate.state.VersionBinVal" table="jbp_cms_version_binval" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="BINVAL_ID"
- type="string"
- length="255"/>
+ name="id"
+ column="BINVAL_ID"
+ type="string"
+ length="255"/>
<property
- name="data"
- column="BINVAL_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="BINVAL_DATA"
+ type="blob"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.VersionNode" table="jbp_cms_version_node" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="NODE_ID"
- type="string"
- length="36"/>
+ name="nodeId"
+ column="NODE_ID"
+ type="string"
+ length="36"/>
<property
- name="data"
- column="NODE_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="NODE_DATA"
+ type="binary"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.VersionProp" table="jbp_cms_version_prop" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="PROP_ID"
- type="string"
- length="255"/>
+ name="propId"
+ column="PROP_ID"
+ type="string"
+ length="255"/>
<property
- name="data"
- column="PROP_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="PROP_DATA"
+ type="binary"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.VersionRefs" table="jbp_cms_version_refs" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="NODE_ID"
- type="string"
- length="36"/>
+ name="refId"
+ column="NODE_ID"
+ type="string"
+ length="36"/>
<property
- name="data"
- column="REFS_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="REFS_DATA"
+ type="binary"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.WSPBinVal" table="jbp_cms_wsp_binval" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="BINVAL_ID"
- type="string"
- length="255"/>
+ name="id"
+ column="BINVAL_ID"
+ type="string"
+ length="255"/>
<property
- name="data"
- column="BINVAL_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="BINVAL_DATA"
+ type="blob"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.WSPNode" table="jbp_cms_wsp_node" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="NODE_ID"
- type="string"
- length="36"/>
+ name="nodeId"
+ column="NODE_ID"
+ type="string"
+ length="36"/>
<property
- name="data"
- column="NODE_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="NODE_DATA"
+ type="binary"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.WSPProp" table="jbp_cms_wsp_prop" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="PROP_ID"
- type="string"
- length="255"/>
+ name="propId"
+ column="PROP_ID"
+ type="string"
+ length="255"/>
<property
- name="data"
- column="PROP_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="PROP_DATA"
+ type="binary"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.state.WSPRefs" table="jbp_cms_wsp_refs" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="id"
- column="NODE_ID"
- type="string"
- length="36"/>
+ name="refId"
+ column="NODE_ID"
+ type="string"
+ length="36"/>
<property
- name="data"
- column="REFS_DATA"
- type="blob"
- length="100000000"
- not-null="true"/>
+ name="data"
+ column="REFS_DATA"
+ type="binary"
+ length="100000000"
+ not-null="true"/>
</class>
<class name="org.jboss.portal.cms.hibernate.CMSEntry" table="jbp_cms_cmsentry" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="name"
- column="FSENTRY_NAME"
- type="string"
- length="255"
- not-null="false"/>
+ name="name"
+ column="FSENTRY_NAME"
+ type="string"
+ length="255"
+ not-null="false"/>
<property name="path"
column="FSENTRY_PATH"
type="string"
@@ -189,17 +212,17 @@
</class>
<class name="org.jboss.portal.cms.hibernate.RepositoryEntry" table="jbp_cms_repositoryentry" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="name"
- column="FSENTRY_NAME"
- type="string"
- length="255"
- not-null="false"/>
+ name="name"
+ column="FSENTRY_NAME"
+ type="string"
+ length="255"
+ not-null="false"/>
<property name="path"
column="FSENTRY_PATH"
type="string"
@@ -221,17 +244,17 @@
</class>
<class name="org.jboss.portal.cms.hibernate.VersionEntry" table="jbp_cms_versionentry" lazy="true">
<id
- name="key"
- column="PK"
- type="java.lang.Integer">
+ name="key"
+ column="PK"
+ type="java.lang.Integer">
<generator class="native"/>
</id>
<property
- name="name"
- column="FSENTRY_NAME"
- type="string"
- length="255"
- not-null="false"/>
+ name="name"
+ column="FSENTRY_NAME"
+ type="string"
+ length="255"
+ not-null="false"/>
<property name="path"
column="FSENTRY_PATH"
type="string"
@@ -252,3 +275,4 @@
not-null="true"/>
</class>
</hibernate-mapping>
+
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/conf/hibernate/cms/hibernate.cfg.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
<?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 hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "-//Hibernate/Hibernate Configuration DTD//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<property name="connection.datasource">java:PortalDS</property>
@@ -9,6 +32,10 @@
<property name="cache.use_second_level_cache">false</property>
<property name="cache.use_query_cache">false</property>
+ <!-- managed environment transaction configuration -->
+ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+
<!-- Force the dialect instead of using autodetection -->
<!--
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/index.html 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/default/index.html 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,69 @@
-<!-- begin: portlet content -->
+<style type="text/css">
+ #welcomelogo {
+ float: left;
+ margin: 30px 0px 30px 15px;
+ }
+
+ #welcometext {
+ margin: 30px 50px 30px 225px;
+ }
+
+ #welcomegreybox {
+ background-color: #f4f4f4;
+ padding: 15px;
+ margin-bottom: 30px;
+ }
+
+ #welcomegreyboxTD {
+ border-left: 1px solid #d5d5d5;
+ padding-left: 15px;
+ }
+
+ #welcomegreybox h3 {
+ color: #5078aa;
+ font: bold 13px Helvetica, Arial, sans-serif;
+ }
+</style>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="560"><img src="default/images/homeimg_main.jpg" width="560" height="160"/></td>
+ <td align="right" valign="top" bgcolor="#7AB5E0"><img src="default/images/homeimg_cornerelement.gif" width="2"
+ height="2"/></td>
+ </tr>
+</table>
+<div id="welcomelogo"><img src="default/images/homeimg_jbosslogo.gif" width="143" height="64"/></div>
+<p id="welcometext">JBoss Portal provides an open source platform for hosting and serving a portal Web interface,
+ publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help
+ enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license
+ combined with a flexible and scalable underling platform.</p>
+
+<div id="welcomegreybox">
+ <table width="100%">
+ <tr>
+ <td valign="top"><h3>Support Services</h3>
+
+ <p>JBoss Inc. offers various support services tailored to fit your needs. <a href="default/support.html">Explore</a>
+ support and service options for JBoss Portal.</p></td>
+ <td valign="top" id="welcomegreyboxTD"><h3>PortletSwap</h3>
+
+ <p><a href="http://www.portletswap.com" target="_blank">Portletswap.com</a> is an open community sponsored
+ by JBoss, Inc. to facilitate the exchange of portlets and layouts for use in JBoss Portal.</p></td>
+ <td valign="top" id="welcomegreyboxTD"><h3>Project Information</h3>
+
+ <p>Learn more about the <a href="default/project.html">JBoss Portal project</a>, on-going development, open
+ issues, and our
+ user and developer communities.</p></td>
+ </tr>
+ </table>
+
+</div>
+<p>Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy
+ developing it!</p>
+<p>Baci e abbracci,<br/>
+ The JBoss Portal Team.</p>
+
+<!--
<table width="100%" border="0" cellpadding="2">
<tr>
<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Portal provides an open source platform for hosting and serving a portal's Web interface, publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license combined with a flexible and scalable underlying platform.</font></td>
@@ -34,4 +99,4 @@
</font></td>
</tr>
</table>
-<!-- end: portlet content -->
\ No newline at end of file
+-->
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource.properties 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,98 +1,26 @@
-#from modules/NS-User/lang/eng/global.php
-#_USERGRAPHIC=Graphics in the user page?
-#_FORCHANGES=(For changes only)
-#_LAST10SUBMISSIONS=Last 10 news submissions sent by
-#_NOINFOFOR=There is no available info for
-#_ADDFIELD=Add Fields
-#_DELETEFIELD=Delete Field and Data
-#_STRING_INSTRUCTIONS=STRINGS ONLY\: Data Length Range (1,254)
-#_OFFLINE=Offline.
-#_LAST10COMMENTS=Last 10 comments by
-#_MODIFYUSERSADDNOAUTH=Not authorised to add user
-#_USERSTATUS=Actual user status
-#_UDT_FLOAT=Float
-#_FIELD_DEACTIVATE=Deactivate
-#_USERUPDATE=Update user
-#_FIELDTYPE=Data Type
-#_FIELDLENGTH=Length
-#_MINAGEDESCR=Sets the required age to register (0\=No age check)
-#_ADDINSTRUCTIONS=Example\: _MYINT -- You must create a define in language/(current language)/global.php for this variable
-#_PASSWDNOMATCH=Sorry, the new passwords don't match. Go back and try again
-#_USERADMIN=User Administration
-#_DELETEUSER=Delete user
-#_DYNAMICDATA=Dynamic User Data
-#_MODIFYUSERSEDITNOAUTH=Not authorised to edit user
-#_UDT_CORE=Core
-#_UDT_TEXT=Text
-#_RETYPEPASSWD=Retype password
-#_FIELD_ACTIVATE=Activate
-#_MINAGE=Minimum age\:
-#_MODIFYUSERSDELNOAUTH=Not authorised to delete user
-#_ALLOWUSERS=Allow other users to view my e-mail address
-#_EDITUSER=Edit user
-#_USERPATH=User menu images path
-#_FIELD_REQUIRED=Required
-#_USERCONF=User Configuration
-#_USERID=User ID
-#_NEEDTOCOMPLETE=You need to fill in all the required fields
-#_BIO=Extra info
-#_FIELD_NA=N/A
-#_FIELDLABEL=Field Label
-#_FIELD_DEL_SURE=Are you sure you want to delete all the data for field
-#_FIELDVALIDATION=Validation
-#_MODIFYUSERSNOAUTH=Not authorised to modify users
-#_FIELD_NOEXIST=Field does not exist
-#_UDT_STRING=String
-#_FIELDWEIGHT=Weight
-#_UDT_INTEGER=Integer
-#_SURE2DELETE=Are you sure you want to delete user
-#_ADDUSERBUT=Add user
-#_LOCATION=Location
-#_FIELDACTIVE=Active
-#_ERRORINVURL=Error in URL. Could be caused by a space in the URL
-#_PASSWDLEN=Minimum users password length\:
-#_REGISTEREDUSER=Registered user \#
-#_UDT_MANDATORY=Core Required
-#_ADDUSER=Add a new user
+################################################################################
+# 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. #
+################################################################################
-#from modules/NS-NewUser/lang/eng/global.php
-#_PRIVACYPOLICY=Privacy Policy
-#_HERE=here
-#_YOUAREREGISTERED=You are now registered. You should receive your password at the e-mail account you provided.
-#_ANDCONNECTOR=and
-#_YOUUSEDEMAIL=You or someone else has used your e-mail account
-#_TERMSOFUSE=Terms of Use
-#_ERRORMUSTAGREE=To use this site, you must agree to our Terms of Service and Privacy Policy\! Please go back and check the box to agree.
-#_USERPASS4=Password for
-#_UPASSWORD=-Password\:
-#_FOLLOWINGMEM=The following is the member information\:
-#_REGISTRATIONAGREEMENT=I agree to be bound by this website's
-#_YOURPASSIS=Your password is\:
-#_TOREGISTER=to register an account at
-#_UNICKNAME=-Username\:
-#_PASSWILLSEND=(Password will be sent to the e-mail address you enter)
-#_ASREG7=and lots of other cool stuff...
-
-#from includes/language/blocks/eng/login.php
-
-
-
-#from modules\NS-Your_Account\lang\eng\global.php
-#_ACTIVATEPERSONAL=Activate personal menu
-#_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
-#_CANNOTGETPASSWORD=Cannot get password dta
-#_CHANGEHOME=Change homepage
-#_CHANGEYOURINFO=Change your info
-#_CHECKTHISOPTION=(Check this option and the following text will appear on the homepage)
-#_HOMECONFIG=Homepage configuration
-#_MAX127=(max. 127):
-#_NEWSINHOME=Number of stories on the homepage
-#_SELECTTHEME=Select a theme
-#_SELECTTHETHEME=Select theme
-#_YOUCANUSEHTML=(You can use HTML code for links as an example)
-
-
-
_ASREGISTERED=Don't have an account yet? You can <a href\="index.html?module=user&op=getlogin">create one</a>.
_BLOCKNICKNAME=Username
_BLOCKPASSWORD=Password
@@ -190,7 +118,6 @@
EmailPublic=(This e-mail will be public. Type what you'd like. Spam proof)
RealEmail=Real e-mail
FakeEmail=Fake e-mail
-Required=(required)
NewUser=New user
SaveChanges=Save Changes
SaveChange=Save Changes
@@ -236,7 +163,6 @@
NotAuth=You\'re not authorized to perform this operation
-// Used by JBoss Portal
REMEMBERME=Remember me
LOGIN=Login
@@ -251,9 +177,15 @@
NAMENOTAVAILABLE=N/A
-// Registration
-REGISTER_REGISTER=Don't have an account yet? You can
+# Registration
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=You can create an account.
REGISTER_REGISTER_LINK=create one
+REGISTER_REGISTER_ADMIN_LINK=Create User account
+REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
REGISTER_NEWUSER=New user registration
REGISTER_PASSWORDAGAIN=Confirm your password
REGISTER_REALEMAIL=Real e-mail
@@ -263,7 +195,6 @@
REGISTER_FAKEEMAIL_EXPLAIN=If this field is not empty, the real email will be used only to send notifications
REGISTER_QUESTION=Secret question
REGISTER_ANSWER=Secret answer
-REGISTER_NEWUSER=Create New user
REGISTER_ASREGUSER=As a registered user you can:
REGISTER_ASREG6=Select different themes
REGISTER_ASREG5=Customize the comments
@@ -297,7 +228,6 @@
REGISTER_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
REGISTER_SAVECHANGES=Save changes
REGISTER_CONFIRMATIONEMAIL=Confirmation email
-REGISTER_LANGUAGE=Language
REGISTER_SHOWMENU=Go back to the user menu
@@ -308,7 +238,10 @@
REGISTER_ERROR_PASSWORDMISMATCH=Passwords do not match
REGISTER_ERROR_INVALIDREALEMAIL=Email address is not valid
+REGISTER_CONFIRM=User created successfully.
+REGISTER_ADMIN_SEARCH=View/Edit users
+
MENU_LOGOUT=Logout
MENU_EDITPROFILE=Edit your profile
MENU_LISTUSERS=List of all the users
@@ -318,11 +251,16 @@
LIST_USERNAMECONTAINS=Username contains
LIST_FULLNAME=Fullname
LIST_USERNAME=Username
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profile
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Edit Roles
+LIST_ACTIONDELETEUSER=Delete user
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
FILTER=Filter
NEXTPAGE=Next page
@@ -362,6 +300,9 @@
MENU_EDITROLE=Edit existing role
MENU_EDITROLEMEMBERS=Edit role members
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=CMS Admin
TITLE_BROWSE=Directory Browser
@@ -434,3 +375,4 @@
PERMISSION_DOMAIN_MOD=Modify Domain
PERMISSION_DEFINEDROLES=Defined roles
PERMISSION_IMPLIEDROLES=Implied roles
+
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_en.properties 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,98 +1,26 @@
-#from modules/NS-User/lang/eng/global.php
-#_USERGRAPHIC=Graphics in the user page?
-#_FORCHANGES=(For changes only)
-#_LAST10SUBMISSIONS=Last 10 news submissions sent by
-#_NOINFOFOR=There is no available info for
-#_ADDFIELD=Add Fields
-#_DELETEFIELD=Delete Field and Data
-#_STRING_INSTRUCTIONS=STRINGS ONLY\: Data Length Range (1,254)
-#_OFFLINE=Offline.
-#_LAST10COMMENTS=Last 10 comments by
-#_MODIFYUSERSADDNOAUTH=Not authorised to add user
-#_USERSTATUS=Actual user status
-#_UDT_FLOAT=Float
-#_FIELD_DEACTIVATE=Deactivate
-#_USERUPDATE=Update user
-#_FIELDTYPE=Data Type
-#_FIELDLENGTH=Length
-#_MINAGEDESCR=Sets the required age to register (0\=No age check)
-#_ADDINSTRUCTIONS=Example\: _MYINT -- You must create a define in language/(current language)/global.php for this variable
-#_PASSWDNOMATCH=Sorry, the new passwords don't match. Go back and try again
-#_USERADMIN=User Administration
-#_DELETEUSER=Delete user
-#_DYNAMICDATA=Dynamic User Data
-#_MODIFYUSERSEDITNOAUTH=Not authorised to edit user
-#_UDT_CORE=Core
-#_UDT_TEXT=Text
-#_RETYPEPASSWD=Retype password
-#_FIELD_ACTIVATE=Activate
-#_MINAGE=Minimum age\:
-#_MODIFYUSERSDELNOAUTH=Not authorised to delete user
-#_ALLOWUSERS=Allow other users to view my e-mail address
-#_EDITUSER=Edit user
-#_USERPATH=User menu images path
-#_FIELD_REQUIRED=Required
-#_USERCONF=User Configuration
-#_USERID=User ID
-#_NEEDTOCOMPLETE=You need to fill in all the required fields
-#_BIO=Extra info
-#_FIELD_NA=N/A
-#_FIELDLABEL=Field Label
-#_FIELD_DEL_SURE=Are you sure you want to delete all the data for field
-#_FIELDVALIDATION=Validation
-#_MODIFYUSERSNOAUTH=Not authorised to modify users
-#_FIELD_NOEXIST=Field does not exist
-#_UDT_STRING=String
-#_FIELDWEIGHT=Weight
-#_UDT_INTEGER=Integer
-#_SURE2DELETE=Are you sure you want to delete user
-#_ADDUSERBUT=Add user
-#_LOCATION=Location
-#_FIELDACTIVE=Active
-#_ERRORINVURL=Error in URL. Could be caused by a space in the URL
-#_PASSWDLEN=Minimum users password length\:
-#_REGISTEREDUSER=Registered user \#
-#_UDT_MANDATORY=Core Required
-#_ADDUSER=Add a new user
+################################################################################
+# 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. #
+################################################################################
-#from modules/NS-NewUser/lang/eng/global.php
-#_PRIVACYPOLICY=Privacy Policy
-#_HERE=here
-#_YOUAREREGISTERED=You are now registered. You should receive your password at the e-mail account you provided.
-#_ANDCONNECTOR=and
-#_YOUUSEDEMAIL=You or someone else has used your e-mail account
-#_TERMSOFUSE=Terms of Use
-#_ERRORMUSTAGREE=To use this site, you must agree to our Terms of Service and Privacy Policy\! Please go back and check the box to agree.
-#_USERPASS4=Password for
-#_UPASSWORD=-Password\:
-#_FOLLOWINGMEM=The following is the member information\:
-#_REGISTRATIONAGREEMENT=I agree to be bound by this website's
-#_YOURPASSIS=Your password is\:
-#_TOREGISTER=to register an account at
-#_UNICKNAME=-Username\:
-#_PASSWILLSEND=(Password will be sent to the e-mail address you enter)
-#_ASREG7=and lots of other cool stuff...
-
-#from includes/language/blocks/eng/login.php
-
-
-
-#from modules\NS-Your_Account\lang\eng\global.php
-#_ACTIVATEPERSONAL=Activate personal menu
-#_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
-#_CANNOTGETPASSWORD=Cannot get password dta
-#_CHANGEHOME=Change homepage
-#_CHANGEYOURINFO=Change your info
-#_CHECKTHISOPTION=(Check this option and the following text will appear on the homepage)
-#_HOMECONFIG=Homepage configuration
-#_MAX127=(max. 127):
-#_NEWSINHOME=Number of stories on the homepage
-#_SELECTTHEME=Select a theme
-#_SELECTTHETHEME=Select theme
-#_YOUCANUSEHTML=(You can use HTML code for links as an example)
-
-
-
_ASREGISTERED=Don't have an account yet? You can <a href\="index.html?module=user&op=getlogin">create one</a>.
_BLOCKNICKNAME=Username
_BLOCKPASSWORD=Password
@@ -190,7 +118,6 @@
EmailPublic=(This e-mail will be public. Type what you'd like. Spam proof)
RealEmail=Real e-mail
FakeEmail=Fake e-mail
-Required=(required)
NewUser=New user
SaveChanges=Save Changes
SaveChange=Save Changes
@@ -236,8 +163,6 @@
NotAuth=You\'re not authorized to perform this operation
-// Used by JBoss Portal
-
REMEMBERME=Remember me
LOGIN=Login
USERNAME=Username
@@ -251,9 +176,15 @@
NAMENOTAVAILABLE=N/A
-// Registration
-REGISTER_REGISTER=Don't have an account yet? You can
+# Registration
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=You can create an account.
REGISTER_REGISTER_LINK=create one
+REGISTER_REGISTER_ADMIN_LINK=Create User account
+REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
REGISTER_NEWUSER=New user registration
REGISTER_PASSWORDAGAIN=Confirm your password
REGISTER_REALEMAIL=Real e-mail
@@ -263,7 +194,6 @@
REGISTER_FAKEEMAIL_EXPLAIN=If this field is not empty, the real email will be used only to send notifications
REGISTER_QUESTION=Secret question
REGISTER_ANSWER=Secret answer
-REGISTER_NEWUSER=Create New user
REGISTER_ASREGUSER=As a registered user you can:
REGISTER_ASREG6=Select different themes
REGISTER_ASREG5=Customize the comments
@@ -297,7 +227,6 @@
REGISTER_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
REGISTER_SAVECHANGES=Save changes
REGISTER_CONFIRMATIONEMAIL=Confirmation email
-REGISTER_LANGUAGE=Language
REGISTER_SHOWMENU=Go back to the user menu
@@ -308,6 +237,8 @@
REGISTER_ERROR_PASSWORDMISMATCH=Passwords do not match
REGISTER_ERROR_INVALIDREALEMAIL=Email address is not valid
+REGISTER_CONFIRM=User created successfully.
+REGISTER_ADMIN_SEARCH=View/Edit users
MENU_LOGOUT=Logout
MENU_EDITPROFILE=Edit your profile
@@ -318,11 +249,16 @@
LIST_USERNAMECONTAINS=Username contains
LIST_FULLNAME=Fullname
LIST_USERNAME=Username
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profile
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Edit Roles
+LIST_ACTIONDELETEUSER=Delete user
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
FILTER=Filter
NEXTPAGE=Next page
@@ -362,6 +298,9 @@
MENU_EDITROLE=Edit existing role
MENU_EDITROLEMEMBERS=Edit role members
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=CMS Admin
TITLE_BROWSE=Directory Browser
@@ -431,4 +370,5 @@
PERMISSION_MODIFYROLES=Add/Remove roles
PERMISSION_MODIFYINGROLES=Modifying roles for
PERMISSION_DOMAIN=Domain
-PERMISSION_DOMAIN_MOD=Modify Domain
\ No newline at end of file
+PERMISSION_DOMAIN_MOD=Modify Domain
+
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,98 +1,26 @@
-#from modules/NS-User/lang/eng/global.php
-#_USERGRAPHIC=Graphics in the user page?
-#_FORCHANGES=(For changes only)
-#_LAST10SUBMISSIONS=Last 10 news submissions sent by
-#_NOINFOFOR=There is no available info for
-#_ADDFIELD=Add Fields
-#_DELETEFIELD=Delete Field and Data
-#_STRING_INSTRUCTIONS=STRINGS ONLY\: Data Length Range (1,254)
-#_OFFLINE=Offline.
-#_LAST10COMMENTS=Last 10 comments by
-#_MODIFYUSERSADDNOAUTH=Not authorised to add user
-#_USERSTATUS=Actual user status
-#_UDT_FLOAT=Float
-#_FIELD_DEACTIVATE=Deactivate
-#_USERUPDATE=Update user
-#_FIELDTYPE=Data Type
-#_FIELDLENGTH=Length
-#_MINAGEDESCR=Sets the required age to register (0\=No age check)
-#_ADDINSTRUCTIONS=Example\: _MYINT -- You must create a define in language/(current language)/global.php for this variable
-#_PASSWDNOMATCH=Sorry, the new passwords don't match. Go back and try again
-#_USERADMIN=User Administration
-#_DELETEUSER=Delete user
-#_DYNAMICDATA=Dynamic User Data
-#_MODIFYUSERSEDITNOAUTH=Not authorised to edit user
-#_UDT_CORE=Core
-#_UDT_TEXT=Text
-#_RETYPEPASSWD=Retype password
-#_FIELD_ACTIVATE=Activate
-#_MINAGE=Minimum age\:
-#_MODIFYUSERSDELNOAUTH=Not authorised to delete user
-#_ALLOWUSERS=Allow other users to view my e-mail address
-#_EDITUSER=Edit user
-#_USERPATH=User menu images path
-#_FIELD_REQUIRED=Required
-#_USERCONF=User Configuration
-#_USERID=User ID
-#_NEEDTOCOMPLETE=You need to fill in all the required fields
-#_BIO=Extra info
-#_FIELD_NA=N/A
-#_FIELDLABEL=Field Label
-#_FIELD_DEL_SURE=Are you sure you want to delete all the data for field
-#_FIELDVALIDATION=Validation
-#_MODIFYUSERSNOAUTH=Not authorised to modify users
-#_FIELD_NOEXIST=Field does not exist
-#_UDT_STRING=String
-#_FIELDWEIGHT=Weight
-#_UDT_INTEGER=Integer
-#_SURE2DELETE=Are you sure you want to delete user
-#_ADDUSERBUT=Add user
-#_LOCATION=Location
-#_FIELDACTIVE=Active
-#_ERRORINVURL=Error in URL. Could be caused by a space in the URL
-#_PASSWDLEN=Minimum users password length\:
-#_REGISTEREDUSER=Registered user \#
-#_UDT_MANDATORY=Core Required
-#_ADDUSER=Add a new user
+################################################################################
+# 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. #
+################################################################################
-#from modules/NS-NewUser/lang/eng/global.php
-#_PRIVACYPOLICY=Privacy Policy
-#_HERE=here
-#_YOUAREREGISTERED=You are now registered. You should receive your password at the e-mail account you provided.
-#_ANDCONNECTOR=and
-#_YOUUSEDEMAIL=You or someone else has used your e-mail account
-#_TERMSOFUSE=Terms of Use
-#_ERRORMUSTAGREE=To use this site, you must agree to our Terms of Service and Privacy Policy\! Please go back and check the box to agree.
-#_USERPASS4=Password for
-#_UPASSWORD=-Password\:
-#_FOLLOWINGMEM=The following is the member information\:
-#_REGISTRATIONAGREEMENT=I agree to be bound by this website's
-#_YOURPASSIS=Your password is\:
-#_TOREGISTER=to register an account at
-#_UNICKNAME=-Username\:
-#_PASSWILLSEND=(Password will be sent to the e-mail address you enter)
-#_ASREG7=and lots of other cool stuff...
-
-#from includes/language/blocks/eng/login.php
-
-
-
-#from modules\NS-Your_Account\lang\eng\global.php
-#_ACTIVATEPERSONAL=Activate personal menu
-#_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
-#_CANNOTGETPASSWORD=Cannot get password dta
-#_CHANGEHOME=Change homepage
-#_CHANGEYOURINFO=Change your info
-#_CHECKTHISOPTION=(Check this option and the following text will appear on the homepage)
-#_HOMECONFIG=Homepage configuration
-#_MAX127=(max. 127):
-#_NEWSINHOME=Number of stories on the homepage
-#_SELECTTHEME=Select a theme
-#_SELECTTHETHEME=Select theme
-#_YOUCANUSEHTML=(You can use HTML code for links as an example)
-
-
-
_ASREGISTERED=�No tiene una cuenta todav�a? Puede <a href\="index.html?module=user&op=getlogin">crear una</a>.
_BLOCKNICKNAME=Usuario
_BLOCKPASSWORD=Clave
@@ -190,7 +118,6 @@
EmailPublic=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
RealEmail=E-mail real
FakeEmail=E-mail de pega
-Required=(obligatorio)
NewUser=Nuevo usuario
SaveChanges=Guardar cambios
SaveChange=Guardar cambios
@@ -236,8 +163,6 @@
NotAuth=Usted no est� autorizado para realizar esta operaci�n
-// Used by JBoss Portal
-
REMEMBERME=Recordarme
LOGIN=Login
USERNAME=Usuario
@@ -251,9 +176,15 @@
NAMENOTAVAILABLE=N/A
-// Registration
-REGISTER_REGISTER=�No tiene una cuenta todav�a? Puede
+# Registration
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=Puedes crear una cuenta.
REGISTER_REGISTER_LINK=crear una
+REGISTER_REGISTER_ADMIN_LINK=Crear una cuenta
+REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
REGISTER_NEWUSER=Registro de nuevo usuario
REGISTER_PASSWORDAGAIN=Confirme su clave
REGISTER_REALEMAIL=E-mail real
@@ -263,7 +194,6 @@
REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no est� vac�o, el e-mail real s�lo se usar� para enviarle notificaciones
REGISTER_QUESTION=Pregunta secreta
REGISTER_ANSWER=Respuesta secreta
-REGISTER_NEWUSER=Crear nuevo usuario
REGISTER_ASREGUSER=Como usuario registrado, usted podr�:
REGISTER_ASREG6=Elegir diferentes estilos
REGISTER_ASREG5=Personalizar los comentarios
@@ -297,7 +227,6 @@
REGISTER_CANKNOWABOUT=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
REGISTER_SAVECHANGES=Guardar cambios
REGISTER_CONFIRMATIONEMAIL=email de confirmaci�n
-REGISTER_LANGUAGE=Lenguaje
REGISTER_SHOWMENU=Volver al men� de usuario
@@ -308,6 +237,8 @@
REGISTER_ERROR_PASSWORDMISMATCH=Las Claves no coincide
REGISTER_ERROR_INVALIDREALEMAIL=La direcci�n de E-mail no es v�lida
+REGISTER_CONFIRM=User created successfully.
+REGISTER_ADMIN_SEARCH=View/Edit users
MENU_LOGOUT=Desconectarse
MENU_EDITPROFILE=Editar su perfil
@@ -318,11 +249,16 @@
LIST_USERNAMECONTAINS=Usuario contiene
LIST_FULLNAME=Nombre completo
LIST_USERNAME=Nombre de usuario
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Acciones
LIST_ACTIONSSHOWPROFILE=Perfil
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Editar Roles
+LIST_ACTIONDELETEUSER=Borrar el usario
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
FILTER=Filtro
NEXTPAGE=P�gina siguiente
@@ -362,6 +298,9 @@
MENU_EDITROLE=Editar un rol existente
MENU_EDITROLEMEMBERS=Editar los miembros de un rol
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=Administraci�n de CMS
TITLE_BROWSE=Explorador de directorios
@@ -387,4 +326,4 @@
PERMISSION_MODIFYROLES=A�adir/Borrar roles
PERMISSION_MODIFYINGROLES=Modificar roles para
PERMISSION_DOMAIN=Dominio
-PERMISSION_DOMAIN_MOD=Modificar el dominio
\ No newline at end of file
+PERMISSION_DOMAIN_MOD=Modificar el dominio
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_fr.properties 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,95 +1,26 @@
-#from modules/NS-User/lang/eng/global.php
-#_USERGRAPHIC=Graphics in the user page?
-#_FORCHANGES=(For changes only)
-#_LAST10SUBMISSIONS=Last 10 news submissions sent by
-#_NOINFOFOR=There is no available info for
-#_ADDFIELD=Add Fields
-#_DELETEFIELD=Delete Field and Data
-#_STRING_INSTRUCTIONS=STRINGS ONLY\: Data Length Range (1,254)
-#_OFFLINE=Offline.
-#_LAST10COMMENTS=Last 10 comments by
-#_MODIFYUSERSADDNOAUTH=Not authorised to add user
-#_USERSTATUS=Actual user status
-#_UDT_FLOAT=Float
-#_FIELD_DEACTIVATE=Deactivate
-#_USERUPDATE=Update user
-#_FIELDTYPE=Data Type
-#_FIELDLENGTH=Length
-#_MINAGEDESCR=Sets the required age to register (0\=No age check)
-#_ADDINSTRUCTIONS=Example\: _MYINT -- You must create a define in language/(current language)/global.php for this variable
-#_PASSWDNOMATCH=Sorry, the new passwords don't match. Go back and try again
-#_USERADMIN=User Administration
-#_DELETEUSER=Delete user
-#_DYNAMICDATA=Dynamic User Data
-#_MODIFYUSERSEDITNOAUTH=Not authorised to edit user
-#_UDT_CORE=Core
-#_UDT_TEXT=Text
-#_RETYPEPASSWD=Retype password
-#_FIELD_ACTIVATE=Activate
-#_MINAGE=Minimum age\:
-#_MODIFYUSERSDELNOAUTH=Not authorised to delete user
-#_ALLOWUSERS=Allow other users to view my e-mail address
-#_EDITUSER=Edit user
-#_USERPATH=User menu images path
-#_FIELD_REQUIRED=Required
-#_USERCONF=User Configuration
-#_USERID=User ID
-#_NEEDTOCOMPLETE=You need to fill in all the required fields
-#_BIO=Extra info
-#_FIELD_NA=N/A
-#_FIELDLABEL=Field Label
-#_FIELD_DEL_SURE=Are you sure you want to delete all the data for field
-#_FIELDVALIDATION=Validation
-#_MODIFYUSERSNOAUTH=Not authorised to modify users
-#_FIELD_NOEXIST=Field does not exist
-#_UDT_STRING=String
-#_FIELDWEIGHT=Weight
-#_UDT_INTEGER=Integer
-#_SURE2DELETE=Are you sure you want to delete user
-#_ADDUSERBUT=Add user
-#_LOCATION=Location
-#_FIELDACTIVE=Active
-#_ERRORINVURL=Error in URL. Could be caused by a space in the URL
-#_PASSWDLEN=Minimum users password length\:
-#_REGISTEREDUSER=Registered user \#
-#_UDT_MANDATORY=Core Required
-#_ADDUSER=Add a new user
+################################################################################
+# 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. #
+################################################################################
-#from modules/NS-NewUser/lang/eng/global.php
-#_PRIVACYPOLICY=Privacy Policy
-#_HERE=here
-#_YOUAREREGISTERED=You are now registered. You should receive your password at the e-mail account you provided.
-#_ANDCONNECTOR=and
-#_YOUUSEDEMAIL=You or someone else has used your e-mail account
-#_TERMSOFUSE=Terms of Use
-#_ERRORMUSTAGREE=To use this site, you must agree to our Terms of Service and Privacy Policy\! Please go back and check the box to agree.
-#_USERPASS4=Password for
-#_UPASSWORD=-Password\:
-#_FOLLOWINGMEM=The following is the member information\:
-#_REGISTRATIONAGREEMENT=I agree to be bound by this website's
-#_YOURPASSIS=Your password is\:
-#_TOREGISTER=to register an account at
-#_UNICKNAME=-Username\:
-#_PASSWILLSEND=(Password will be sent to the e-mail address you enter)
-#_ASREG7=and lots of other cool stuff...
-
-#from includes/language/blocks/eng/login.php
-
-#from modules\NS-Your_Account\lang\eng\global.php
-#_ACTIVATEPERSONAL=Activate personal menu
-#_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
-#_CANNOTGETPASSWORD=Cannot get password dta
-#_CHANGEHOME=Change homepage
-#_CHANGEYOURINFO=Change your info
-#_CHECKTHISOPTION=(Check this option and the following text will appear on the homepage)
-#_HOMECONFIG=Homepage configuration
-#_MAX127=(max. 127):
-#_NEWSINHOME=Number of stories on the homepage
-#_SELECTTHEME=Select a theme
-#_SELECTTHETHEME=Select theme
-#_YOUCANUSEHTML=(You can use HTML code for links as an example)
-
-
_BLOCKNICKNAME=Identifiant
_BLOCKPASSWORD=Mot de passe
@@ -167,7 +98,7 @@
TimeZoneOffset=D�calage GMT
EmailNotPublic=(e-mail obligatoire mais non publi�. Utilis� pour vous envoyer votre mot de passe)
EmailPublic=(e-mail public.)
-Required=(obligatoire)
+#Required=Obligatoire
SaveChanges=Enregistrer les modifications
SaveChange=Enregistrer les modifications
TypeNewPassword=(saisissez un nouveau mot de passe 2 fois pour valider)
@@ -212,8 +143,6 @@
NotAuth=Op�ration non autoris�e
-// Used by JBoss Portal
-
REMEMBERME=Enregistrer
LOGIN=Login
USERNAME=Identifiant
@@ -227,9 +156,15 @@
NAMENOTAVAILABLE=N/D
-// Registration
-REGISTER_REGISTER=Pas encore membre ?
+# Registration
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=Cr�er un compte
REGISTER_REGISTER_LINK=Cr�er un compte
+REGISTER_REGISTER_ADMIN_LINK=Cr�er un compte
+REGISTER_TY=Thank you for registering.
+REGISTER_BASICINFO=Basic User Information
+REGISTER_IM=Instant Message Identities
+REGISTER_ADDITIONAL=Additional Optional User Information
REGISTER_NEWUSER=Enregistrement d'un nouvel utilisateur
REGISTER_PASSWORDAGAIN=Comfirmer votre mot de passe
REGISTER_REALEMAIL=e-mail r�el
@@ -237,7 +172,6 @@
REGISTER_FAKEEMAIL_EXPLAIN=Si ce champ n'est pas vide, l'email r�el ne sera utilis� que pour envoyer des notifications
REGISTER_QUESTION=Question secr�te
REGISTER_ANSWER=R�ponse secr�te
-REGISTER_NEWUSER=Nouvel utilisateur
REGISTER_ASREGUSER=En �tant enregistr� vous pouvez:
REGISTER_ASREG6=Choisir parmi plusieurs th�mes
REGISTER_ASREG5=Personnaliser les commentaires
@@ -272,7 +206,6 @@
REGISTER_CANKNOWABOUT=(255 caracteres max.)
REGISTER_SAVECHANGES=Enregistrer les changements
REGISTER_CONFIRMATIONEMAIL=Email de confirmation
-REGISTER_LANGUAGE=Language
REGISTER_SHOWMENU=Retour au menu utilisateur
@@ -283,6 +216,8 @@
REGISTER_ERROR_PASSWORDMISMATCH=les mots de passe sont differents
REGISTER_ERROR_INVALIDREALEMAIL=Adresse email invalide
+REGISTER_CONFIRM=User created successfully.
+REGISTER_ADMIN_SEARCH=View/Edit users
MENU_LOGOUT=Deconnection
MENU_EDITPROFILE=Editer votre profile
@@ -293,10 +228,15 @@
LIST_USERNAMECONTAINS=Identifiant contient
LIST_FULLNAME=Nom complet
LIST_USERNAME=Identifiant
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profil
LIST_ACTIONADDROLESTOUSER=Roles
+LIST_ACTIONDELETEUSER=Delete user
+LIST_SEARCHRESULTS=Search results for
+LIST_MATCHING=Matching Users
FILTER=Filtre
NEXTPAGE=Page suivante
@@ -328,6 +268,9 @@
MENU_CREATEROLE=Creer nouveau role
MENU_EDITROLE=Editer un role existant
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=Administration CMS
TITLE_BROWSE=Navigation repertoires
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/faces-config.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-app.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-app.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-app.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<jboss-app>
<app-name>portal</app-name>
</jboss-app>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-portlet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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>
<portlet>
<portlet-name>UserPortlet</portlet-name>
@@ -7,6 +30,19 @@
</portlet>
<portlet>
<portlet-name>RolePortlet</portlet-name>
+ <header-content>
+ <script type="text/javascript" language="javascript">
+ function hideShow(id)
+ {
+ var navpoint = document.getElementById(id);
+ if (navpoint.className == 'hidden') {
+ navpoint.className = 'shown';
+ } else {
+ navpoint.className = 'hidden';
+ }
+ }
+ </script>
+ </header-content>
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
@@ -48,12 +84,6 @@
</security-constraint>
</portlet>
<portlet>
- <portlet-name>NavigationPortlet</portlet-name>
- <transaction>
- <trans-attribute>Required</trans-attribute>
- </transaction>
- </portlet>
- <portlet>
<portlet-name>ThemeSelectorPortlet</portlet-name>
<transaction>
<trans-attribute>Required</trans-attribute>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-web.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jboss-web.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<jboss-web>
</jboss-web>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/index.xhtml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -99,16 +99,6 @@
</f:facet>
</t:tree2>
</h:form>
- <h:form>
- <h:commandLink value="" onclick="return showhide('treehelp');">
- <t:graphicImage
- value="/images/management/help.gif" style="border-width:0"/>
- </h:commandLink>
- </h:form>
- <div id="treehelp" style="visibility:hidden;display:none;" class="helpblock">
- Some help text.
- <br/>
- </div>
</h:panelGroup>
<h:panelGroup id="splitter">
</h:panelGroup>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/instances.xhtml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -25,16 +25,16 @@
<h:column>
<f:facet name="header">
<t:commandSortHeader columnName="id">
- <f:facet name="ascending">
- <t:graphicImage value="/images/management/up.png"
- rendered="true" border="0" />
- </f:facet>
- <f:facet name="descending">
- <t:graphicImage value="/images/management/down.png"
- rendered="true" border="0" />
- </f:facet>
- <h:outputText value="Id"/>
- </t:commandSortHeader>
+ <f:facet name="ascending">
+ <t:graphicImage value="/images/management/up.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <f:facet name="descending">
+ <t:graphicImage value="/images/management/down.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <h:outputText value="Id"/>
+ </t:commandSortHeader>
</f:facet>
<h:commandLink action="#{instancemgr.selectInstance}">
<h:outputText value="#{instance[0].id}"/>
@@ -44,19 +44,19 @@
<h:column>
<f:facet name="header">
<t:commandSortHeader columnName="portlet">
- <f:facet name="ascending">
- <t:graphicImage value="/images/management/up.png"
- rendered="true" border="0" />
- </f:facet>
- <f:facet name="descending">
- <t:graphicImage value="/images/management/down.png"
- rendered="true" border="0" />
- </f:facet>
- <h:outputText value="Portlet"/>
- </t:commandSortHeader>
+ <f:facet name="ascending">
+ <t:graphicImage value="/images/management/up.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <f:facet name="descending">
+ <t:graphicImage value="/images/management/down.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <h:outputText value="Portlet"/>
+ </t:commandSortHeader>
</f:facet>
<h:commandLink rendered="#{instance[1] != null}" action="#{portletmgr.selectPortlet}">
- <f:param name="id" value="#{instance[1].id}"/>
+ <f:param name="id" value="#{instance[1].context.id}"/>
<h:outputText value="#{instance[1].name}"/>
</h:commandLink>
<h:outputText rendered="#{instance[1] == null}" value="Portlet not deployed"/>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/management/portlets.xhtml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -24,107 +24,107 @@
columnClasses="menu,,content">
<h:panelGroup
id="panel1">
- <h:form name="portlets">
- <t:dataTable
- id="portletsTable"
- var="portlet"
- value="#{portletmgr.portlets}"
- rows="10"
- sortColumn="#{portletmgr.sortColumn}"
- sortAscending="#{portletmgr.sortAscending}"
- rowClasses="portlet-section-body,portlet-section-alternate">
- <h:column>
- <f:facet name="header">
- <t:commandSortHeader columnName="id">
- <f:facet name="ascending">
- <t:graphicImage value="/images/management/up.png"
- rendered="true" border="0" />
- </f:facet>
- <f:facet name="descending">
- <t:graphicImage value="/images/management/down.png"
- rendered="true" border="0" />
- </f:facet>
- <h:outputText value="Id"/>
- </t:commandSortHeader>
- </f:facet>
- <h:commandLink
- action="#{portletmgr.selectPortlet}">
- <f:param
- name="id"
- value="#{portlet.id}"/>
- <h:outputText value="#{portlet.id}"/>
- </h:commandLink>
- </h:column>
- <h:column>
- <f:facet name="header">
- <t:commandSortHeader columnName="name">
- <f:facet name="ascending">
- <t:graphicImage value="/images/management/up.png"
- rendered="true" border="0" />
- </f:facet>
- <f:facet name="descending">
- <t:graphicImage value="/images/management/down.png"
- rendered="true" border="0" />
- </f:facet>
- <h:outputText value="Name"/>
- </t:commandSortHeader>
- </f:facet>
- <h:outputText value="#{portlet.name}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Remote"/>
- </f:facet>
- <h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Remotable"/>
- </f:facet>
- <h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <t:commandSortHeader columnName="description">
- <f:facet name="ascending">
- <t:graphicImage value="/images/management/up.png"
- rendered="true" border="0" />
- </f:facet>
- <f:facet name="descending">
- <t:graphicImage value="/images/management/down.png"
- rendered="true" border="0" />
- </f:facet>
- <h:outputText value="Description"/>
- </t:commandSortHeader>
- </f:facet>
- <h:outputText value="#{portlet.description}"/>
- </h:column>
- </t:dataTable>
- <t:dataScroller id="scrollPortlets"
- for="portletsTable" fastStep="10"
- pageCountVar="portletsPageCount" pageIndexVar="portletsPageIndex"
- paginator="true" paginatorMaxPages="9"
- paginatorActiveColumnStyle="font-weight:bold;">
- <f:facet name="first">
- <t:graphicImage url="/images/management/first.png" border="1"/>
+<h:form name="portlets">
+ <t:dataTable
+ id="portletsTable"
+ var="portlet"
+ value="#{portletmgr.portlets}"
+ rows="10"
+ sortColumn="#{portletmgr.sortColumn}"
+ sortAscending="#{portletmgr.sortAscending}"
+ rowClasses="portlet-section-body,portlet-section-alternate">
+ <h:column>
+ <f:facet name="header">
+ <t:commandSortHeader columnName="id">
+ <f:facet name="ascending">
+ <t:graphicImage value="/images/management/up.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <f:facet name="descending">
+ <t:graphicImage value="/images/management/down.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <h:outputText value="Id"/>
+ </t:commandSortHeader>
</f:facet>
- <f:facet name="last">
- <t:graphicImage url="/images/management/last.png" border="1"/>
+ <h:commandLink
+ action="#{portletmgr.selectPortlet}">
+ <f:param
+ name="id"
+ value="#{portlet.context.id}"/>
+ <h:outputText value="#{portlet.context.id}"/>
+ </h:commandLink>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <t:commandSortHeader columnName="name">
+ <f:facet name="ascending">
+ <t:graphicImage value="/images/management/up.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <f:facet name="descending">
+ <t:graphicImage value="/images/management/down.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <h:outputText value="Name"/>
+ </t:commandSortHeader>
</f:facet>
- <f:facet name="previous">
- <t:graphicImage url="/images/management/left.png" border="1"/>
+ <h:outputText value="#{portlet.name}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Remote"/>
</f:facet>
- <f:facet name="next">
- <t:graphicImage url="/images/management/right.png" border="1"/>
+ <h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Remotable"/>
</f:facet>
- <f:facet name="fastforward">
- <t:graphicImage url="/images/management/fast-forward.png" border="1"/>
+ <h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <t:commandSortHeader columnName="description">
+ <f:facet name="ascending">
+ <t:graphicImage value="/images/management/up.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <f:facet name="descending">
+ <t:graphicImage value="/images/management/down.png"
+ rendered="true" border="0"/>
+ </f:facet>
+ <h:outputText value="Description"/>
+ </t:commandSortHeader>
</f:facet>
- <f:facet name="fastrewind">
- <t:graphicImage url="/images/management/fast-rewind.png" border="1"/>
- </f:facet>
- </t:dataScroller>
- </h:form>
+ <h:outputText value="#{portlet.description}"/>
+ </h:column>
+ </t:dataTable>
+ <t:dataScroller id="scrollPortlets"
+ for="portletsTable" fastStep="10"
+ pageCountVar="portletsPageCount" pageIndexVar="portletsPageIndex"
+ paginator="true" paginatorMaxPages="9"
+ paginatorActiveColumnStyle="font-weight:bold;">
+ <f:facet name="first">
+ <t:graphicImage url="/images/management/first.png" border="1"/>
+ </f:facet>
+ <f:facet name="last">
+ <t:graphicImage url="/images/management/last.png" border="1"/>
+ </f:facet>
+ <f:facet name="previous">
+ <t:graphicImage url="/images/management/left.png" border="1"/>
+ </f:facet>
+ <f:facet name="next">
+ <t:graphicImage url="/images/management/right.png" border="1"/>
+ </f:facet>
+ <f:facet name="fastforward">
+ <t:graphicImage url="/images/management/fast-forward.png" border="1"/>
+ </f:facet>
+ <f:facet name="fastrewind">
+ <t:graphicImage url="/images/management/fast-rewind.png" border="1"/>
+ </f:facet>
+ </t:dataScroller>
+</h:form>
</h:panelGroup>
<h:panelGroup id="splitter">
<h:graphicImage value="/images/management/line-trunk.gif" height="100%" width="3"/>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editListRoleMembers.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editListRoleMembers.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editListRoleMembers.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,44 +1,80 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-<div align="center">
-<font class="portlet-font">${n:i18n("ROLE_EDIT_USER")}: ${n:out("displayname")}</font>
-<br>
+<p>${n:i18n("ROLE_EDIT_USER")}: ${n:out("displayname")}</p>
-<table width="80">
-<tr>
-<td><n:if ctx="previouspage"><a href="${n:out("previouspage.link")}"><img src="<%= renderRequest.getContextPath() %>/images/role/previous.gif" border="0" align="absmiddle" alt="${n:i18n("PREVIOUSPAGE")}"/></a></n:if></td>
-<td>
-<a href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showMainEditRoleMembers"/></portlet:renderURL>"><img src="<%= renderRequest.getContextPath() %>/images/role/back.gif" border="0" align="absmiddle" alt="${n:i18n("ROLE_MAINLIST")}"/></a>
-</td>
-<td><n:if ctx="nextpage"><a href="${n:out("nextpage.link")}"><img src="<%= renderRequest.getContextPath() %>/images/role/next.gif" border="0" align="absmiddle" alt="${n:i18n("NEXTPAGE")}"/></a></n:if></td>
-</tr></table>
+<hr/>
-<br>
+<p></p>
-<table cellpadding="2" cellspacing="2" width="100%">
- <tr class="portlet-section-alternate">
- <th>${n:i18n("LIST_FULLNAME")}</th>
- <th>${n:i18n("LIST_USERNAME")}</th>
- <th>${n:i18n("LIST_ROLES")}</th>
- <th>${n:i18n("LIST_ACTIONS")}</th>
- </tr>
- <n:iterate ctx="row">
- <tr class="portlet-section-body">
- <td>${n:out("row.fullname0")}</td>
- <td>${n:out("row.username0")}</td>
- <td><n:iterate ctx="roles0">${n:out("row.roles0.name")}<br /></n:iterate></td>
- <td><a href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONEDITROLES")}</a></td>
- </tr>
- <tr class="portlet-section-alternate">
- <td>${n:out("row.fullname1")}</td>
- <td>${n:out("row.username1")}</td>
- <td><n:iterate ctx="roles1">${n:out("row.roles1.name")}<br /></n:iterate></td>
- <td><a href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONEDITROLES")}</a></td>
- </tr>
- </n:iterate>
+<table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_FULLNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_USERNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_ROLES")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_ACTIONS")}</td>
+ </tr>
+ <n:iterate ctx="row">
+ <tr class="portlet-section-body">
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.fullname")}</td>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.username")}</td>
+ <td nowrap="nowrap" class="portlet-table-text">
+ <n:iterate ctx="roles">${n:out("row.roles.name")}<br/></n:iterate>
+ </td>
+ <td nowrap="nowrap" class="portlet-table-text"><a
+ href="${n:out("row.editURL")}">${n:i18n("LIST_ACTIONEDITROLES")}</a></td>
+ </tr>
+ </n:iterate>
</table>
+
+<div align="center">
+ <table width="0%" border="0" cellspacing="0" cellpadding="0" class="pagination">
+ <tr>
+ <td nowrap>
+ <ul>
+ <n:if ctx="previouspage">
+ <li class="previouspage">
+ <a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a>
+ </li>
+ </n:if>
+ <n:if ctx="nextpage">
+ <li class="nextpage">
+ <a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a>
+ </li>
+ </n:if>
+ </ul>
+ </td>
+ </tr>
+ </table>
</div>
+
+<br/>
+
+<form
+ action="<portlet:actionURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:actionURL>"
+ method="post">
+ <font class="portlet-form-label">${n:i18n("MENU_EDITROLEMEMBERS")}</font><br/>
+ <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15"/>
+ <select name="roleid" class="portlet-form-input-field">
+ <n:iterate ctx="rolelist">
+ <option value="${n:out("rolelist.id")}" ${n:out("rolelist.selected")}>${n:out("rolelist.displayname")}</option>
+ </n:iterate>
+ </select>
+ <select name="usersperpage">
+ <option value="10">10</option>
+ <option value="20">20</option>
+ <option value="30">30</option>
+ <option value="50">50</option>
+ <option value="75">75</option>
+ <option value="100">100</option>
+ </select>
+ <br/>
+ <input name="Find" type="submit" class="portlet-form-button" id="Find"
+ value="${n:i18n("Search")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+</form>
+
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,59 +1,27 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-<div align="center">
-<form id="editRole" action="<portlet:actionURL><portlet:param name="op" value="editRole"/></portlet:actionURL>" method="post">
- <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
- <tr>
- <td colspan="2" class="portlet-section-alternate" align="left">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/role.gif" align="absmiddle"/>
- ${n:i18n("ROLE_EDIT")}</td>
- </tr>
- <tr>
- <td class="portlet-section-body">${n:i18n("ROLE_SELECTONETOMODIFY")}:</td>
- <td class="portlet-section-body">
- <select name="roleid" class="pn-normal" class="portlet-form-input-field">
- <n:iterate ctx="role">
- <option value="${n:out("role.id")}" ${n:out("role.selected")}>${n:out("role.displayname")}</option>
- </n:iterate>
- </select></td>
- </tr>
- <tr>
- <td class="portlet-section-body">${n:i18n("ROLE_NEWDISPLAYNAME")}:</td>
- <td class="portlet-section-body"><input class="portlet-form-input-field" type="text" name="roledisplayname" value="${param["roledisplayname"]}" size="21" maxlength="25"> <n:error key="roledisplayname_error"/></td>
- </tr>
- <tr>
- <td colspan="2" align="center" class="portlet-section-body">
- <input type="submit" value="${n:i18n("ROLE_UPDATE")}" class="portlet-form-button">
- </td>
- </tr>
- </table>
-</form>
-<form id="deleteRole" action="<portlet:actionURL><portlet:param name="op" value="removeRole"/></portlet:actionURL>" method="post">
- <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
- <tr>
- <td colspan="2" class="portlet-section-alternate" align="left">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/delete.gif" align="absmiddle"/>
- ${n:i18n("ROLE_DELETE")}</td>
- </tr>
- <tr>
- <td class="portlet-section-body">${n:i18n("ROLE_SELECTONETODELETE")}:</td>
- <td class="portlet-section-body">
- <select name="roleid" class="pn-normal" class="portlet-form-input-field">
- <n:iterate ctx="role">
- <option value="${n:out("role.id")}" ${n:out("role.selected")}>${n:out("role.displayname")}</option>
- </n:iterate>
- </select> <n:error key="roledelete_error"/>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center" class="portlet-section-body">
- <input type="submit" value="${n:i18n("ROLE_DELETE")}" class="portlet-form-button">
- </td>
- </tr>
- </table>
-</form>
+<div>
+ <h6>${n:i18n("MENU_EDITROLE")}: ${n:out("editroledisplayname")}</h6>
+
+ <form name="editRole"
+ action="<portlet:actionURL><portlet:param name="op" value="editRole"/></portlet:actionURL>" method="post">
+ <input type="hidden" name="roleid" value="${n:out("editroleid")}"/>
+
+ <p>
+ <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
+ <br/>
+ <input name="roledisplayname" type="text" value="${param["editroledisplayname"]}" size="21" maxlength="25"/>
+ <n:error key="roledisplayname_error"/>
+ </p>
+
+ <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
+ value="${n:i18n("SaveChanges")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+ </p>
+ </form>
</div>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editUserRoles.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editUserRoles.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editUserRoles.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,31 +1,30 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
+<span>${n:i18n("EDITROLESFORUSER")}: "${n:out("username")}"
-<div align="center">
-
-<font class="portlet-font">${n:i18n("EDITROLESFORUSER")}: ${n:out("userfullname")} "${n:out("username")}"
-</font>
-
<form method="post" action="<portlet:actionURL><portlet:param name="op" value="addRolesToUser"/></portlet:actionURL>">
-<input type="hidden" name="userid" value="${n:out("userid")}"/>
-<table>
- <tr>
- <th colspan="3" class="portlet-section-header">${n:i18n("ROLESAVAILABLE")}</th>
- </tr>
- <n:iterate ctx="row">
- <tr>
- <n:iterate ctx="col">
- <td><input type="checkbox" name="roles" value="${n:out("row.col.name")}" ${n:out("row.col.ischecked")}><font class="portlet-font">${n:out("row.col.displayname")}</font></td>
- </n:iterate>
- </tr>
- </n:iterate>
- <tr>
- <td colspan="3"><input type="submit" value="${n:i18n("ASSIGNROLES")}" class="portlet-form-input-field"/></th>
- </tr>
-</table>
-</form>
-
-</div>
+ <input type="hidden" name="userid" value="${n:out("userid")}"/>
+ <table>
+ <tr>
+ <th colspan="3">${n:i18n("ROLESAVAILABLE")}</th>
+ </tr>
+ <n:iterate ctx="row">
+ <tr>
+ <n:iterate ctx="col">
+ <td><input type="checkbox" name="roles"
+ value="${n:out("row.col.name")}" ${n:out("row.col.ischecked")}>${n:out("row.col.displayname")}
+ </td>
+ </n:iterate>
+ </tr>
+ </n:iterate>
+ <tr>
+ <td colspan="3"><input type="submit" class="portlet-form-button"
+ value="${n:i18n("ASSIGNROLES")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,31 +1,65 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
+<div class="portlet-section-body">
+ <p>
+ ${n:i18n("ROLE_TEXT_1")} ${n:i18n("ROLE_TEXT_2")}
+ <hr/>
+ </p>
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <tr>
+ <td class="portlet-table-text" colspan="3"><strong>${n:out("nbRoles")}</strong></td>
+ </tr>
+ <n:iterate ctx="role">
+ <tr>
+ <td width="100%" class="portlet-table-text"><a href="<portlet:renderURL windowState="maximized">
+ <portlet:param name="op" value="showEditRole" />
+ <portlet:param name="roleid" value="${n:out('role.id')}"/>
+ <portlet:param name="roledisplayname" value="${n:out('role.displayname')}"/>
+ </portlet:renderURL>">${n:out("role.displayname")}</a></td>
+ <td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
+ <portlet:param name="op" value="showListEditRoleMembers"/>
+ <portlet:param name="roleid" value="${n:out('role.id')}"/>
+ <portlet:param name="usersperpage" value="10"/>
+ <portlet:param name="usernamefilter" value=""/>
+ </portlet:actionURL>">Members</a></td>
+ <td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
+ <portlet:param name="op" value="removeRole"/>
+ <portlet:param name="roleid" value="${n:out('role.id')}"/>
+ </portlet:actionURL>">Delete</a></td>
+ </tr>
+ </n:iterate>
+ </table>
+ <p><a onclick="hideShow('showall');" href="#" class="addicon">${n:i18n("MENU_CREATEROLE")}</a></p>
+ <n:error key="rolename_error"/>
+ <br/>
+ <n:error key="roledisplayname_error"/>
+</div>
+<div id="showall" class="hidden">
+ <div>
+ <hr/>
-<table width="100%" cellpadding="2" border="0">
- <tr>
- <td class="portlet-section-alternate">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/role.gif" align="absmiddle"/> ${n:out("nbRoles")}
- </td>
- </tr>
- <tr>
- <td class="portlet-section-body">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/bullet.gif" align="absmiddle"/>
- <a id="createRole" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showCreateRole" /></portlet:renderURL>">${n:i18n("MENU_CREATEROLE")}</a>
- </td>
- </tr>
- <tr>
- <td class="portlet-section-body">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/bullet.gif" align="absmiddle"/>
- <a id="editRole" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showEditRole" /></portlet:renderURL>">${n:i18n("MENU_EDITROLE")}</a>
- </td>
- </tr>
- <tr>
- <td class="portlet-section-body">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/bullet.gif" align="absmiddle"/>
- <a id="managemembers" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showMainEditRoleMembers" /></portlet:renderURL>">${n:i18n("MENU_EDITROLEMEMBERS")}</a>
- </td>
- </tr>
-</table>
+ <h6>${n:i18n("ROLE_CREATE")}</h6>
+
+ <form name="createRole"
+ action="<portlet:actionURL><portlet:param name="op" value="createRole"/></portlet:actionURL>" method="post">
+ <p>
+ <label class="portlet-form-label">${n:i18n("ROLE_NAME")}</label>
+ <br/>
+ <input name="rolename" type="text"/>
+ </p>
+
+ <p>
+ <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
+
+ <br/>
+ <input name="roledisplayname" type="text"/></p>
+
+ <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
+ value="${n:i18n("SaveChanges")}"/>
+ </p>
+ </form>
+ </div>
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editProfile.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,161 +1,185 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
-<span class="portlet-font"><a href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
-<div class="box">
- <table cellpadding="0" cellspacing="8" border="0" class="pn-normal">
- <form action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post">
- <input type="hidden" name="userid" value="${n:out("userid")}"/>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td>
- <td><input type="text" name="givenname" value="${n:out("GIVENNAME")}" size="30" maxlength="60"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td>
- <td><input type="text" name="familyname" value="${n:out("FAMILYNAME")}" size="30" maxlength="60"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}</td>
- <td><input type="text" name="realemail" value="${n:out("REALEMAIL")}" size="30" maxlength="60"> <span class="portlet-font">${n:i18n("REQUIRED")}</span> <n:error key="realemail_error"/></td>
- <td></td>
- </tr>
- <tr>
- <td> </td>
- <td><span class="portlet-font">${n:i18n("REGISTER_EMAILNOTPUBLIC")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td>
- <td><input type="text" name="fakeemail" value="${n:out("FAKEEMAIL")}" size="30" maxlength="60"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span> <n:error key="fakeemail_error"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><span class="portlet-font">${n:i18n("REGISTER_EMAILPUBLIC")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_VIEWREALEMAIL")}</td>
- <td><input type="checkbox" name="viewrealemail" value="true" ${n:out("VIEWREALEMAIL")}/></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td>
- <td><input type="text" name="homepage" value="${n:out("HOMEPAGE")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_LANGUAGE")}</td>
- <td>
- <select name="locale" class="pn-normal">
- <n:iterate ctx="locale">
- <option value="${n:out("locale.id")}" ${n:out("locale.selected")}>${n:out("locale.name")}</option>
- </n:iterate>
- </select>
- </td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_TIMEZONEOFFSET")}</td>
- <td>
- <select name="timezoneoffset" class="pn-normal">
- <n:iterate ctx="timezone">
- <option value="${n:out("timezone.id")}" ${n:out("timezone.selected")}>${n:out("timezone.name")}</option>
- </n:iterate>
- </select>
- </td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_THEME")}</td>
- <td>
- <select name="theme" class="pn-normal">
- <option value="" selected>${n:i18n("REGISTER_DEFAULT_THEME")}</option>
- <n:iterate ctx="theme">
- <option value="${n:out("theme.id")}" ${n:out("theme.selected")}>${n:out("theme.id")}</option>
- </n:iterate>
- </select>
- </td>
- </tr>
- <%--tr>
- <td>${n:i18n("REGISTER_YOURAVATAR")}</td>
- <td>
- <select name="avatar" class="pn-normal">${param["AVATARS"]}</select>
- <img src="modules/user/images/avatars/{AVATAR}" name="avatar" width="32" height="32" alt="" align="top">
- </td>
- </tr>
- <tr>
- <td>${n:i18n("REGISTER_MESSAGEORDER")}</td>
- <td class="pn-normal">
- <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_1}" checked="checked"/>{ORDER_LABEL_1}</div>
- <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_2}"/>{ORDER_LABEL_2}</div>
- </td>
- </tr--%>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_ICQ")}</td>
- <td><input type="text" name="icq" value="${n:out("ICQ")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_AIM")}</td>
- <td><input type="text" name="aim" value="${n:out("AIM")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_YIM")}</td>
- <td><input type="text" name="yim" value="${n:out("YIM")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_MSNM")}</td>
- <td><input type="text" name="msnm" value="${n:out("MSNM")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_SKYPE")}</td>
- <td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td>
- <td><input type="text" name="location" value="${n:out("LOCATION")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <!--tr>
+<%@ page isELIgnored="false" %>
+
+<p><span class="requiredfield">*</span> ${n:i18n("REQUIRED")}</p>
+
+<hr/>
+
+<table cellpadding="0" cellspacing="8" border="0" class="pn-normal">
+<form action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post">
+<input type="hidden" name="userid" value="${n:out("userid")}"/>
+<tr>
+ <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td>
+ <td><input type="text" name="givenname" value="${n:out("GIVENNAME")}" size="30" maxlength="60"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td>
+ <td><input type="text" name="familyname" value="${n:out("FAMILYNAME")}" size="30" maxlength="60"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span></td>
+ <td><input type="text" name="realemail" value="${n:out("REALEMAIL")}" size="30" maxlength="60">
+ <n:error key="realemail_error"/>
+ </td>
+ <td></td>
+</tr>
+<tr>
+ <td> </td>
+ <td><span class="portlet-form-label">${n:i18n("REGISTER_EMAILNOTPUBLIC")}</span></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td>
+ <td><input type="text" name="fakeemail" value="${n:out("FAKEEMAIL")}" size="30" maxlength="60">
+ <n:error key="fakeemail_error"/>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td><span class="portlet-form-label">${n:i18n("REGISTER_EMAILPUBLIC")}</span></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_VIEWREALEMAIL")}</td>
+ <td><input type="checkbox" name="viewrealemail" value="true" ${n:out("VIEWREALEMAIL")}/></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td>
+ <td><input type="text" name="homepage" value="${n:out("HOMEPAGE")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_LANGUAGE")}</td>
+ <td>
+ <select name="locale" class="pn-normal">
+ <n:iterate ctx="locale">
+ <option value="${n:out("locale.id")}" ${n:out("locale.selected")}>${n:out("locale.name")}</option>
+ </n:iterate>
+ </select>
+ </td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_TIMEZONEOFFSET")}</td>
+ <td>
+ <select name="timezoneoffset" class="pn-normal">
+ <n:iterate ctx="timezone">
+ <option value="${n:out("timezone.id")}" ${n:out("timezone.selected")}>${n:out("timezone.name")}</option>
+ </n:iterate>
+ </select>
+ </td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_THEME")}</td>
+ <td>
+ <select name="theme" class="pn-normal">
+ <option value="" selected>${n:i18n("REGISTER_DEFAULT_THEME")}</option>
+ <n:iterate ctx="theme">
+ <option value="${n:out("theme.id")}" ${n:out("theme.selected")}>${n:out("theme.id")}</option>
+ </n:iterate>
+ </select>
+ </td>
+</tr>
+<%--tr>
+ <td>${n:i18n("REGISTER_YOURAVATAR")}</td>
+ <td>
+ <select name="avatar" class="pn-normal">${param["AVATARS"]}</select>
+ <img src="modules/user/images/avatars/{AVATAR}" name="avatar" width="32" height="32" alt="" align="top">
+ </td>
+</tr>
+<tr>
+ <td>${n:i18n("REGISTER_MESSAGEORDER")}</td>
+ <td class="pn-normal">
+ <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_1}" checked="checked"/>{ORDER_LABEL_1}</div>
+ <div><input type="radio" name="sort_order_desc" value="{ORDER_VALUE_2}"/>{ORDER_LABEL_2}</div>
+ </td>
+</tr--%>
+<tr>
+ <td colspan="3" nowrap><h4>${n:i18n("REGISTER_IM")}</h4></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_ICQ")}</td>
+ <td><input type="text" name="icq" value="${n:out("ICQ")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_AIM")}</td>
+ <td><input type="text" name="aim" value="${n:out("AIM")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_YIM")}</td>
+ <td><input type="text" name="yim" value="${n:out("YIM")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_MSNM")}</td>
+ <td><input type="text" name="msnm" value="${n:out("MSNM")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_SKYPE")}</td>
+ <td><input type="text" name="skype" value="${n:out("SKYPE")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td colspan="3" nowrap><h4>${n:i18n("REGISTER_ADDITIONAL")}</h4></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td>
+ <td><input type="text" name="location" value="${n:out("LOCATION")}" size="30" maxlength="100"></td>
+</tr>
+<!--tr>
<td>${n:i18n("REGISTER_LANGUAGE")}</td>
<td>
<select name="language" class="pn-normal">${param["LANGUAGE"]}</select>
</td>
</tr-->
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_OCCUPATION")}</td>
- <td><input type="text" name="occupation" value="${n:out("OCCUPATION")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_INTERESTS")}</td>
- <td><input type="text" name="interests" value="${n:out("INTERESTS")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_SIGNATURE")}</td>
- <td><textarea wrap="virtual" cols="50" rows="5" name="signature" class="pn-normal">${n:out("SIGNATURE")}</textarea></td>
- </tr>
- <tr>
- <td> </td>
- <td class="portlet-font">${n:i18n("OPTIONAL")} - ${n:i18n("255MAX")}</td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_EXTRAINFO")}</td>
- <td><textarea wrap="virtual" cols="50" rows="5" name="extra" class="pn-normal">${n:out("EXTRA")}</textarea></td>
- </tr>
- <tr>
- <td> </td>
- <td class="portlet-font">${n:i18n("OPTIONAL")} - ${n:i18n("REGISTER_CANKNOWABOUT")}</td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("PASSWORD")}</td>
- <td><input type="password" name="pass1" size="10" maxlength="20"> <n:error key="pass1_error"/> <input type="password" name="pass2" size="10" maxlength="20"> <span class="portlet-font">${n:i18n("REGISTER_PASSWORDAGAIN")}</span> <n:error key="pass2_error"/></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_QUESTION")}</td>
- <td class="pn-normal"><input type="text" name="question" value="${n:out("QUESTION")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td class="portlet-form-label">${n:i18n("REGISTER_ANSWER")}</td>
- <td class="pn-normal"><input type="text" name="answer" value="${n:out("ANSWER")}" size="30" maxlength="100"> <span class="portlet-font">${n:i18n("OPTIONAL")}</span></td>
- </tr>
- <tr>
- <td> </td>
- <td><input type="submit" value="${n:i18n("REGISTER_SAVECHANGES")}"></td>
- </tr>
- </form>
- </table>
- <br/>
-</div>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_OCCUPATION")}</td>
+ <td><input type="text" name="occupation" value="${n:out("OCCUPATION")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_INTERESTS")}</td>
+ <td><input type="text" name="interests" value="${n:out("INTERESTS")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_SIGNATURE")}</td>
+ <td><textarea wrap="virtual" cols="50" rows="5" name="signature" class="pn-normal">${n:out("SIGNATURE")}</textarea>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td class="portlet-form-label">${n:i18n("255MAX")}</td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_EXTRAINFO")}</td>
+ <td><textarea wrap="virtual" cols="50" rows="5" name="extra" class="pn-normal">${n:out("EXTRA")}</textarea></td>
+</tr>
+<tr>
+ <td> </td>
+ <td class="portlet-form-label">${n:i18n("REGISTER_CANKNOWABOUT")}</td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("PASSWORD")}</td>
+ <td><input type="password" name="pass1" size="10" maxlength="20">
+ <n:error key="pass1_error"/>
+ <input type="password" name="pass2" size="10" maxlength="20"> <span
+ class="portlet-form-label">${n:i18n("REGISTER_PASSWORDAGAIN")}</span>
+ <n:error key="pass2_error"/>
+ </td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_QUESTION")}</td>
+ <td class="pn-normal"><input type="text" name="question" value="${n:out("QUESTION")}" size="30" maxlength="100">
+ </td>
+</tr>
+<tr>
+ <td class="portlet-form-label">${n:i18n("REGISTER_ANSWER")}</td>
+ <td class="pn-normal"><input type="text" name="answer" value="${n:out("ANSWER")}" size="30" maxlength="100"></td>
+</tr>
+<tr>
+ <td colspan="3" class="bottombuttonbar"><input class="portlet-form-button" type="submit"
+ value="${n:i18n("REGISTER_SAVECHANGES")}">
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+ </td>
+</tr>
+</form>
+</table>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editUserRoles.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editUserRoles.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/editUserRoles.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,27 +1,32 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
-<span>${n:i18n("EDITROLESFORUSER")}: ${n:out("userfullname")} "${n:out("username")}"
+<span>${n:i18n("EDITROLESFORUSER")}: "${n:out("username")}"
<form method="post" action="<portlet:actionURL><portlet:param name="op" value="addRolesToUser"/></portlet:actionURL>">
-<input type="hidden" name="userid" value="${n:out("userid")}"/>
-<table>
- <tr>
- <th colspan="3">${n:i18n("ROLESAVAILABLE")}</th>
- </tr>
- <n:iterate ctx="row">
- <tr>
- <n:iterate ctx="col">
- <td><input type="checkbox" name="roles" value="${n:out("row.col.name")}" ${n:out("row.col.ischecked")}>${n:out("row.col.displayname")}</td>
- </n:iterate>
- </tr>
- </n:iterate>
- <tr>
- <td colspan="3"><input type="submit" value="${n:i18n("ASSIGNROLES")}"/></th>
- </tr>
-</table>
+ <input type="hidden" name="userid" value="${n:out("userid")}"/>
+ <table>
+ <tr>
+ <th colspan="3">${n:i18n("ROLESAVAILABLE")}</th>
+ </tr>
+ <n:iterate ctx="row">
+ <tr>
+ <n:iterate ctx="col">
+ <td><input type="checkbox" name="roles"
+ value="${n:out("row.col.name")}" ${n:out("row.col.ischecked")}>${n:out("row.col.displayname")}
+ </td>
+ </n:iterate>
+ </tr>
+ </n:iterate>
+ <tr>
+ <td colspan="3"><input type="submit" class="portlet-form-button"
+ value="${n:i18n("ASSIGNROLES")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+ </tr>
+ </table>
</form>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/listUsers.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,57 +1,101 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
-<span class="portlet-font"><a href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
+<%@ page isELIgnored="false" %>
+<portlet:defineObjects/>
-<form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
-<table>
-<tr class="portlet-section-header">
- <th colspan="2">${n:i18n("LIST_FILTERS")}</th>
-</tr>
-<tr class="portlet-section-body">
- <td>${n:i18n("LIST_USERSPERPAGE")}
- <select name="usersperpage">
+<p>${n:i18n("LIST_SEARCHRESULTS")} "${n:out("usernamefilter")}" (${n:out("results")} ${n:i18n("LIST_MATCHING")})</p>
+
+<hr/>
+
+<p></p>
+<table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_USERNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_FIRSTNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_LASTNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_ROLES")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_ACTIONS")}</td>
+ </tr>
+ <n:iterate ctx="row">
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-alternate">${n:out("row.username0")}</td>
+ <td nowrap="nowrap" class="portlet-table-alternate">${n:out("row.firstname0")}</td>
+ <td nowrap="nowrap" class="portlet-table-alternate">${n:out("row.lastname0")}</td>
+ <td nowrap="nowrap" class="portlet-table-alternate">
+ <n:iterate ctx="roles0">${n:out("row.roles0.name")}<br/></n:iterate>
+ </td>
+ <td nowrap="nowrap" class="portlet-table-alternate"><a
+ href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
+ href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL0")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ </tr>
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.username1")}</td>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.firstname1")}</td>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.lastname1")}</td>
+
+ <td nowrap="nowrap" class="portlet-table-text">
+ <n:iterate ctx="roles1">${n:out("row.roles1.name")}<br/></n:iterate>
+ </td>
+ <td nowrap="nowrap" class="portlet-table-text"><a
+ href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
+ href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL1")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ </tr>
+ </n:iterate>
+</table>
+
+<div align="center">
+ <table width="0%" border="0" cellspacing="0" cellpadding="0" class="pagination">
+ <tr>
+ <td nowrap>
+ <ul>
+ <n:if ctx="previouspage">
+ <li class="previouspage">
+ <a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a>
+ </li>
+ </n:if>
+ <n:if ctx="nextpage">
+ <li class="nextpage">
+ <a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a>
+ </li>
+ </n:if>
+ </ul>
+ </td>
+ </tr>
+ </table>
+</div>
+
+<br/>
+
+<form
+ action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>"
+ method="post">
+ <font class="portlet-form-label">${n:i18n("REGISTER_ADMIN_SEARCH")}</font><br/>
+ <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15"/>
+ <select name="usersperpage">
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
<option value="50">50</option>
<option value="75">75</option>
<option value="100">100</option>
- </select>
- </td>
- <td>${n:i18n("LIST_USERNAMECONTAINS")}
- <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15" />
- </td>
- <td>
- <input type="submit" value="${n:i18n("FILTER")}"/>
- </td>
-</tr>
-</table>
+ </select>
+ <br/>
+ <input name="Find" type="submit" class="portlet-form-button" id="Find"
+ value="${n:i18n("Search")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
</form>
-
-<n:if ctx="previouspage"><a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a></n:if>
-<n:if ctx="nextpage"><a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a></n:if>
-
-<table>
- <tr class="portlet-section-header">
- <th>${n:i18n("LIST_FULLNAME")}</th>
- <th>${n:i18n("LIST_USERNAME")}</th>
- <th>${n:i18n("LIST_ROLES")}</th>
- <th>${n:i18n("LIST_ACTIONS")}</th>
- </tr>
- <n:iterate ctx="row">
- <tr class="portlet-section-body">
- <td>${n:out("row.fullname0")}</td>
- <td>${n:out("row.username0")}</td>
- <td><n:iterate ctx="roles0">${n:out("row.roles0.name")}<br /></n:iterate></td>
- <td><a href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a></td>
- </tr>
- <tr class="portlet-section-alternate">
- <td>${n:out("row.fullname1")}</td>
- <td>${n:out("row.username1")}</td>
- <td><n:iterate ctx="roles1">${n:out("row.roles1.name")}<br /></n:iterate></td>
- <td><a href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a></td>
- </tr>
- </n:iterate>
-</table>
\ No newline at end of file
+<br/>
+<a id="register"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>"><img
+ src="<%= renderRequest.getContextPath() %>/images/user/ico_adduser.gif" border="0"
+ align="absmiddle"/></a> <a
+id="register"
+href="
+<portlet:renderURL windowState="maximized">
+ <portlet:param name="op" value="showRegister"/>
+</portlet:renderURL>
+">${n:i18n("REGISTER_REGISTER_ADMIN_LINK")}</a>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/login.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/login.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/login.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,63 +1,20 @@
-<%@ page import="org.jboss.portal.core.CoreConstants"%>
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
<div class="box" align="center">
- <%
- String auth = null;
- String url = (String)renderRequest.getAttribute("URL");
- if (url != null)
- {
- auth = url;
- }
- else
- {
- String contextPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_CONTEXT_PATH);
- String servletPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_SERVLET_PATH);
- auth = contextPath + servletPath + "/auth/";
- }
- // SSL
- String secureAuth = null;
- String secureURL = (String)renderRequest.getAttribute("secureURL");
- if (secureURL != null)
- {
- secureAuth = secureURL;
- }
- else
- {
- String contextPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_CONTEXT_PATH);
- String servletPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_SERVLET_PATH);
- secureAuth = contextPath + servletPath + "/authsec/";
- }
- %>
- <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
- <!-- NYI -->
- <!--tr>
- <td class="portlet-form-field-label">${n:i18n("REMEMBERME")}: </td>
- <td class="portlet-form-field"><input type="checkbox" value="true" name="rememberme"/></td>
- </tr-->
- <tr>
- <td colspan="1" align="center">
- <a id="standardlogin" href="<%= auth %>">Standard ${n:i18n("LOGIN")}</a>
- <%
- if (secureURL != null)
- {
- %>
- |
- <a id="securelogin" href="<%= secureAuth %>">Secured ${n:i18n("LOGIN")}</a>
- <%
- }
- %>
- </td>
- </tr>
- <tr>
- <td colspan="1">
- <span class="portlet-text">${n:i18n("REGISTER_REGISTER")}<br />
- <a id="register" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>">${n:i18n("REGISTER_REGISTER_LINK")}</a></span>
- </td>
- </tr>
- </table>
+ <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
+ <tr>
+ <td colspan="1">
+ <span class="portlet-text">
+ ${n:i18n("REGISER_NOT_LOGGED_IN")}
+ <br/><br/>
+ <a id="register"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>">${n:i18n("REGISTER_REGISTER")}</a></span>
+ </td>
+ </tr>
+ </table>
</div>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/menu.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,41 +1,59 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
<table width="100%" cellpadding="2" border="0">
- <tr>
- <td class="portlet-section-body">
- <a id="editprofile" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showProfile"/></portlet:renderURL>"><img src="<%= renderRequest.getContextPath() %>/images/user/edit_profile.gif" border="0" align="absmiddle" /></a> <a id="editprofile" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showProfile"/></portlet:renderURL>">${n:i18n("MENU_EDITPROFILE")}</a>
- </td>
- </tr>
-<n:if ctx="admin">
- <tr>
- <td class="portlet-section-body">
- <a id="listusers" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showListUsers"/></portlet:renderURL>"><img src="<%= renderRequest.getContextPath() %>/images/user/userlist.gif" border="0" align="absmiddle" /></a> <a id="listusers" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showListUsers"/></portlet:renderURL>">${n:i18n("MENU_LISTUSERS")}</a>
- </td>
- </tr>
-</n:if>
+ <n:if ctx="admin">
+ <tr>
+ <td class="portlet-section-body">
+ <form
+ action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>"
+ method="post">
+ <input type="hidden" name="usersperpage" value="10"/>
+ <font class="portlet-form-label">${n:i18n("REGISTER_ADMIN_SEARCH")}</font><br/>
+ <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15"/>
+ <input name="Find" type="submit" class="portlet-form-button" id="Find" value="${n:i18n("Search")}"/>
+ </form>
+ <br/>
+ </td>
+ </tr>
+ </n:if>
- <tr>
- <td class="portlet-section-body">
- <a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>">
- <img src="<%= renderRequest.getContextPath() %>/images/user/logout.gif" border="0" align="absmiddle" />
- </a> <a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>">${n:i18n("MENU_LOGOUT")}</a>
- </td>
- </tr>
+ <n:if ctx="admin">
+ <tr>
+ <td class="portlet-section-body">
+ <a id="register"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>"><img
+ src="<%= renderRequest.getContextPath() %>/images/user/ico_adduser.gif" border="0"
+ align="absmiddle"/></a> <a
+ id="register"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>">${n:i18n("REGISTER_REGISTER_ADMIN_LINK")}</a>
+ </td>
+ </tr>
+ </n:if>
- <%--
- todo : find a way to get the base url of the portal to use as locationURL
- <tr>
- <td class="portlet-section-body">
- <a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/><portlet:param name="locationURL" value=""/></portlet:actionURL>">
- <img src="<%= renderRequest.getContextPath() %>/images/user/logout.gif" border="0" align="absmiddle" />
- </a> <a id="logout" href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/><portlet:param name="locationURL" value="/portal/portal/default/default"/></portlet:actionURL>">Logout and return to default page</a>
- </td>
- </tr>
- --%>
+ <tr>
+ <td class="portlet-section-body">
+ <a id="editprofile"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showProfile"/></portlet:renderURL>"><img
+ src="<%= renderRequest.getContextPath() %>/images/user/edit_profile.gif" border="0"
+ align="absmiddle"/></a> <a id="editprofile"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showProfile"/></portlet:renderURL>">${n:i18n("MENU_EDITPROFILE")}</a>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="portlet-section-body">
+ <a id="logout"
+ href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>"><img
+ src="<%= renderRequest.getContextPath() %>/images/user/logout.gif" border="0"
+ align="absmiddle"/></a> <a id="logout"
+ href="<portlet:actionURL windowState="normal"><portlet:param name="op" value="userLogout"/></portlet:actionURL>">${n:i18n("MENU_LOGOUT")}</a>
+ </td>
+ </tr>
+
</table>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,68 +1,70 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
+<p><span class="requiredfield">*</span> ${n:i18n("REQUIRED")}</p>
+<hr/>
+<table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal">
+ <form name="register"
+ action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
+ <tr>
+ <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
+ </tr>
+ <tr>
-<div style="margin: 0 15% 0 15%" align="center">
- <form name="register" action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
- <table cellspacing="2" cellpadding="2" border="0">
- <th colspan="2" class="portlet-section-header">${n:i18n("REGISTER_NEWUSER")}</th>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("USERNAME")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="uname" value="${param["USERNAME"]}" size="26" maxlength="25"> * <n:error key="uname_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("PASSWORD")}: </font></td>
- <td><input class="portlet-form-input-field" type="password" name="pass1" size="26" maxlength="60"> * <n:error key="pass1_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_PASSWORDAGAIN")}: </font></td>
- <td><input class="portlet-form-input-field" type="password" name="pass2" size="26" maxlength="60"> * <n:error key="pass2_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="realemail" value="${param["REALEMAIL"]}" size="26" maxlength="60"> * <n:error key="realemail_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="fakeemail" value="${param["FAKEEMAIL"]}" size="26" maxlength="60"></td>
- </tr>
- <tr class="portlet-section-body">
- <td colspan="2"><font class="portlet-form-label">*${n:i18n("REGISTER_FAKEEMAIL_EXPLAIN")}</font></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_QUESTION")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="question" value="${param["QUESTION"]}" size="26" maxlength="25"> * <n:error key="question_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_ANSWER")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="answer" value="${param["ANSWER"]}" size="26" maxlength="25"> * <n:error key="answer_error"/></td>
- </tr>
- <tr><td colspan="2" height="5"></td></tr>
- <tr>
- <td colspan="2" align="center"><input name="register" type="submit" class="portlet-form-button" value="${n:i18n("REGISTER_NEWUSER")}" /></td>
- </tr>
- </table>
- </form>
-</div>
- <br/>
- <div align="center" class="portlet-font">${n:i18n("REGISTER_ALREADYHAVEACCOUNT")} <a id="login" href="<portlet:renderURL><portlet:param name="op" value="showLogin"/></portlet:renderURL>">${n:i18n("REGISTER_SIGNIN")}</a></div>
- <!-- BEGIN disclaimer -->
- <div class="portlet-font">
- ${n:i18n("REGISTER_ASREGUSER")}
- <ul>
- <li>${n:i18n("REGISTER_ASREG1")}</li>
- <li>${n:i18n("REGISTER_ASREG2")}</li>
- <li>${n:i18n("REGISTER_ASREG3")}</li>
- <li>${n:i18n("REGISTER_ASREG4")}</li>
- <li>${n:i18n("REGISTER_ASREG5")}</li>
- <li>${n:i18n("REGISTER_ASREG6")}</li>
- </ul></div>
- <div align="center">
- <div class="portlet-font">${n:i18n("REGISTER_REGISTERNOW")}</div>
- <div class="portlet-font">${n:i18n("REGISTER_WEDONTGIVE")}</div>
- </div>
- <!-- END disclaimer -->
+ <td class="portlet-form-label" nowrap>${n:i18n("USERNAME")}<span class="requiredfield">*</span></td>
+ <td colspan="2"><input type="text" name="uname" value="${param["USERNAME"]}"
+ size="30" maxlength="25">
+ <n:error key="uname_error"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span>
+ </td>
+ <td><input type="text" name="realemail" value="user at portal.com" size="30" maxlength="60">
+ <n:error key="realemail_error"/>
+ </td>
+ <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>Allow
+ other users to view my real e-mail address
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_FAKEEMAIL")}</td>
+ <td colspan="2"><input type="text" name="fakeemail" value="" size="30" maxlength="60"></td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("PASSWORD")}<span class="requiredfield">*</span></td>
+
+ <td colspan="2"><input type="password" name="pass1" size="30" maxlength="20">
+ <n:error key="pass1_error"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_PASSWORDAGAIN")}<span
+ class="requiredfield">*</span></td>
+ <td colspan="2"><input type="password" name="pass2" size="30" maxlength="20">
+ <n:error key="pass2_error"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td>
+
+ <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100">
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td>
+ <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="bottombuttonbar">
+ <input name="register" type="submit" class="portlet-form-button"
+ value="${n:i18n("REGISTER_NEWUSER")}"/>
+ </td>
+ </tr>
+ </form>
+</table>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,19 +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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<portal-renderSet>
<renderSet name="divRenderer">
<set content-type="text/html">
- <region-renderer>org.jboss.portal.theme.impl.render.DivRegionRenderer</region-renderer>
- <window-renderer>org.jboss.portal.theme.impl.render.DivWindowRenderer</window-renderer>
- <portlet-renderer>org.jboss.portal.theme.impl.render.DivPortletRenderer</portlet-renderer>
- <decoration-renderer>org.jboss.portal.theme.impl.render.DivDecorationRenderer</decoration-renderer>
+ <ajax-enabled>true</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
</set>
</renderSet>
<renderSet name="emptyRenderer">
<set content-type="text/html">
- <region-renderer>org.jboss.portal.theme.impl.render.EmptyRegionRenderer</region-renderer>
- <window-renderer>org.jboss.portal.theme.impl.render.EmptyWindowRenderer</window-renderer>
- <portlet-renderer>org.jboss.portal.theme.impl.render.EmptyPortletRenderer</portlet-renderer>
- <decoration-renderer>org.jboss.portal.theme.impl.render.EmptyDecorationRenderer</decoration-renderer>
+ <ajax-enabled>true</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
</set>
</renderSet>
</portal-renderSet>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-strategies.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<portal-strategies>
<set name="maximizedRegion">
<strategy content-type="text/html">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<layouts>
<layout>
<name>nodesk</name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-lib.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-lib.tld 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-lib.tld 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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 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-jsptaglibrary_2_0.xsd"
- version="2.0">
+ 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-jsptaglibrary_2_0.xsd"
+ version="2.0">
<tlib-version>1.1</tlib-version>
<short-name>JBoss-Portal-tags</short-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-themes.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-themes.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-themes.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,23 +1,52 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<themes>
<theme>
<name>industrial</name>
- <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css" type="text/css" />
- <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico" />
+ <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico"/>
</theme>
<theme>
<name>Nphalanx</name>
- <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css" />
- <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico" />
+ <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico"/>
</theme>
<theme>
<name>mission-critical</name>
- <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css" />
- <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico" />
+ <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico"/>
</theme>
<theme>
<name>Maple</name>
<link rel="stylesheet" id="main_css" href="/themes/maple/portal_style.css" type="text/css"/>
<link rel="shortcut icon" href="/themes/maple/images/favicon.ico"/>
</theme>
+ <theme>
+ <name>renaissance</name>
+ <link rel="stylesheet" id="main_css" href="/themes/renaissance/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/renaissance/images/favicon.ico"/>
+ <link rel="icon" href="/themes/renaissance/images/animated_favicon1.gif" type="image/gif"/>
+ </theme>
</themes>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet-instances.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,13 +1,30 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<deployments>
<deployment>
<instance>
- <instance-id>NavigationPortletInstance</instance-id>
- <portlet-ref>NavigationPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <instance>
<instance-id>UserPortletInstance</instance-id>
<portlet-ref>UserPortlet</portlet-ref>
</instance>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,9 +1,32 @@
<?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">
+ 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 user login/logout and profile management</description>
<portlet-name>UserPortlet</portlet-name>
@@ -144,19 +167,7 @@
<title>Management Portlet</title>
</portlet-info>
</portlet>
- <portlet>
- <description>Portlet providing navigable tabs with portal pages</description>
- <portlet-name>NavigationPortlet</portlet-name>
- <display-name>Navigation Portlet</display-name>
- <portlet-class>org.jboss.portal.core.portlet.catalog.NavigationPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Portal Navigation</title>
- </portlet-info>
- </portlet>
+
<user-attribute>
<name>user.name.nickName</name>
</user-attribute>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme-basic-lib.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme-basic-lib.tld 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/theme-basic-lib.tld 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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 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-jsptaglibrary_2_0.xsd"
- version="2.0">
+ 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-jsptaglibrary_2_0.xsd"
+ version="2.0">
<tlib-version>1.1</tlib-version>
<short-name>Theme_basic_tags</short-name>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/web.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<web-app
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce.js 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce.js 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,7 @@
/**
- * $RCSfile: tiny_mce.js,v $
- * $Revision: 1.1.1.1 $
- * $Date: 2005/01/14 23:05:58 $
+ * $RCSfile$
+ * $Revision: 2 $
+ * $Date: 2005-01-14 18:01:32 -0500 (Fri, 14 Jan 2005) $
*
* @author Moxiecode
* @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce_src.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce_src.js 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/tiny_mce_src.js 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,7 +1,7 @@
/**
- * $RCSfile: tiny_mce_src.js,v $
- * $Revision: 1.1.1.1 $
- * $Date: 2005/01/14 23:06:00 $
+ * $RCSfile$
+ * $Revision: 2 $
+ * $Date: 2005-01-14 18:01:32 -0500 (Fri, 14 Jan 2005) $
*
* @author Moxiecode
* @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/favicon.ico
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,4 @@
-<%@ page import="org.jboss.portal.server.PortalConstants"%>
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -8,13 +8,14 @@
<meta http-equiv="Content-Type" content="text/html;"/>
<!-- to correct the unsightly Flash of Unstyled Content. -->
<script type="text/javascript"></script>
- <!-- inject the theme; default to the Nphalanx theme if nothing is selected for the portal or the page -->
- <p:theme themeName='Nphalanx'/>
+ <!-- inject the theme; default to the renaissance theme if nothing is selected for the portal or the page -->
+ <p:theme themeName='renaissance'/>
<!-- insert header content that was possibly set by portlets on the page -->
<p:headerContent/>
</head>
<body id="body">
+<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
<div id="portal-container">
<div id="sizer">
<div id="expander">
@@ -22,6 +23,11 @@
<table border="0" cellpadding="0" cellspacing="0" id="header-container">
<tr>
<td align="center" valign="top" id="header">
+
+ <!-- Utility controls -->
+ <p:region regionName='dashboardnav' regionID='dashboardnav'/>
+
+ <!-- navigation tabs and such -->
<p:region regionName='navigation' regionID='navigation'/>
<div id="spacer"></div>
</td>
@@ -33,15 +39,18 @@
<!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionB' -->
<p:region regionName='center' regionID='regionB'/>
<hr class="cleaner"/>
-
- <div id="footer-container" class="portal-copyright">Powered by <a class="portal-copyright"
- href="http://www.jboss.com/products/jbossportal">JBoss
- Portal</a><br/>
- <span id="ThemeBy"></span>
- </div>
</div>
</div>
</div>
</div>
+
+<!-- TODO: Fix the auto jump in this tag -->
+<!-- <div id="footer-container" class="portal-copyright">Powered by
+<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
+</div>
+-->
+
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+
</body>
</html>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/maximized.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/maximized.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/maximized.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,42 +1,51 @@
-<%@ page import="org.jboss.portal.server.PortalConstants"%>
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title><%= PortalConstants.VERSION.toString() %></title>
- <meta http-equiv="Content-Type" content="text/html;"/>
- <!-- to correct the unsightly Flash of Unstyled Content. -->
- <script type="text/javascript"></script>
- <!-- use the Nphalanx theme if nothing else was defined for the portal or the page -->
- <p:theme themeName='Nphalanx'/>
- <!-- inject header content that was generated by the portlets on the requested page -->
- <p:headerContent/>
+ <title><%= PortalConstants.VERSION.toString() %>
+ </title>
+ <meta http-equiv="Content-Type" content="text/html;"/>
+ <!-- to correct the unsightly Flash of Unstyled Content. -->
+ <script type="text/javascript"></script>
+ <!-- use the Nphalanx theme if nothing else was defined for the portal or the page -->
+ <p:theme themeName='renaissance'/>
+ <!-- inject header content that was generated by the portlets on the requested page -->
+ <p:headerContent/>
</head>
<body id="body">
-<div id="portal-container"><div id="sizer"><div id="expander">
- <div id="logoName"></div>
- <table border="0" cellpadding="0" cellspacing="0" id="header-container">
- <tr>
- <td align="center" valign="top" id="header">
- <p:region regionName='navigation' regionID='navigation'/>
- <div id="spacer"></div>
- </td>
- </tr>
- </table>
- <div id="content-container">
- <!-- Note: this construct assumes that the 'maximizedRegion' layout strategy was chosen for the layout, page or portal -->
- <!-- the 'maximizedRegion' strategy assigns the maximized portlet to the 'maximized' region -->
- <p:region regionName='maximized' regionID='regionMaximized'/>
- <hr class="cleaner"/>
+<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
+<div id="portal-container">
+ <div id="sizer">
+ <div id="expander">
+ <div id="logoName"></div>
+ <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+ <tr>
+ <td align="center" valign="top" id="header">
+ <p:region regionName='dashboardnav' regionID='dashboardnav'/>
- <div id="footer-container" class="portal-copyright">Powered by
- <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br>
- <span id="ThemeBy"></span>
- </div>
- </div>
+ <p:region regionName='navigation' regionID='navigation'/>
+ <div id="spacer"></div>
+ </td>
+ </tr>
+ </table>
+ <div id="content-container">
+ <!-- Note: this construct assumes that the 'maximizedRegion' layout strategy was chosen for the layout, page or portal -->
+ <!-- the 'maximizedRegion' strategy assigns the maximized portlet to the 'maximized' region -->
+ <p:region regionName='maximized' regionID='regionMaximized'/>
+ <hr class="cleaner"/>
-</div></div></div>
+ <div id="footer-container" class="portal-copyright">Powered by
+ <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br>
+ <span id="ThemeBy"></span>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
</body>
</html>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,931 +1,975 @@
- /*****************************
- * JBoss Industrial Theme CSS *
- ******************************/
+/*****************************
+* JBoss Industrial Theme CSS *
+******************************/
- #body {
- background-image: url( images/portal_background.gif );
- margin: 0px;
- padding: 0px;
- }
+#body {
+ background-image: url( images/portal_background.gif );
+ margin: 0px;
+ padding: 0px;
+}
- /*****************
- * Portal Header *
- ******************/
+/*****************
+* Portal Header *
+******************/
- /* spacer to keep header at certain width regardless of display size
+/* spacer to keep header at certain width regardless of display size
done to avoid overlapping of tab navigation in header */
- #spacer {
- width: 1024px;
- line-height: 0px;
- font-size: 0px;
- height: 0px;
- }
+#spacer {
+ width: 1024px;
+ line-height: 0px;
+ font-size: 0px;
+ height: 0px;
+}
- /* Wrapper for Header */
- #header-container {
- background-image: url( images/portal_background.gif );
- background-repeat: repeat-y;
- height: 100%;
- min-width: 1000px;
- width: 100%;
- /* test to reposition header on page
- position: absolute;
- bottom: 5px;*/
- }
+/* Wrapper for Header */
+#header-container {
+ background-image: url( images/portal_background.gif );
+ background-repeat: repeat-y;
+ height: 100%;
+ min-width: 1000px;
+ width: 100%;
+ /* test to reposition header on page
+ position: absolute;
+ bottom: 5px;*/
+}
- /* Header background */
- #header {
- background-image: url( images/header.gif );
- background-repeat: repeat-x;
- height: 100px;
- padding: 0px; /*margin: 0 25% 0 25%;*/
- }
+/* Header background */
+#header {
+ background-image: url( images/header.gif );
+ background-repeat: repeat-x;
+ height: 100px;
+ padding: 0px; /*margin: 0 25% 0 25%;*/
+}
- #logoName {
- /* Original Logo...*/
- background-image: url( images/JBossLogo.gif );
+#logoName {
+/* Original Logo...*/
+ background-image: url( images/JBossLogo.gif );
+ background-repeat: no-repeat;
+ width: 187px;
+ height: 35px;
+ position: absolute;
+ left: 15px;
+ top: 16px;
+
+ /* alt Smokestack Logo in header...
+ background-image: url(images/JBossLogoV2.gif);
background-repeat: no-repeat;
- width: 187px;
- height: 35px;
+ width: 576px;
+ height: 71px;
position: absolute;
- left: 15px;
- top: 16px;
+ left: 0px;
+ top: 1px; */
- /* alt Smokestack Logo in header...
- background-image: url(images/JBossLogoV2.gif);
- background-repeat: no-repeat;
- width: 576px;
- height: 71px;
- position: absolute;
- left: 0px;
- top: 1px; */
+ z-index: 2;
- z-index: 2;
+}
- }
+/************************
+* Portal Layout Regions *
+*************************/
- /************************
- * Portal Layout Regions *
- *************************/
+/* wrapper for entire portal. starts/ends after/before body tag */
+#portal-container {
+/*width: 100%;*/
- /* wrapper for entire portal. starts/ends after/before body tag */
- #portal-container {
- /*width: 100%;*/
+/*part of below IE hack to preserve min-width for portlet regions */
+ padding: 0 350px 0 350px;
+}
- /*part of below IE hack to preserve min-width for portlet regions */
- padding: 0 350px 0 350px;
- }
+/* min width hack for IE */
+#expander {
+ margin: 0 -350px 0 -350px;
+ position: relative;
+}
- /* min width hack for IE */
- #expander {
- margin: 0 -350px 0 -350px;
- position: relative;
- }
+/* min width hack for IE */
+#sizer {
+ width: 100%;
+}
- /* min width hack for IE */
- #sizer {
- width: 100%;
- }
+/* IE Hack \*/
+* html #portal-container,
+ * html #sizer,
+ * html #expander {
+ height: 0;
+}
- /* IE Hack \*/
- * html #portal-container,
- * html #sizer,
- * html #expander {
- height: 0;
- }
+/* end IE min-width hack */
- /* end IE min-width hack */
+/*table that contains all regions. does not include header*/
+#content-container {
+ height: 100%; /*width: 100%;*/
+ /*margin:1em auto;
+border: 1px solid black;*/
+ text-align: left;
+ max-width: 1600px;
+ min-width: 800px;
- /*table that contains all regions. does not include header*/
- #content-container {
- height: 100%; /*width: 100%;*/
- /*margin:1em auto;
- border: 1px solid black;*/
- text-align: left;
- max-width: 1600px;
- min-width: 800px;
+ /*part of below IE hack
+padding: 0 350px 0 350px;*/
+}
- /*part of below IE hack
- padding: 0 350px 0 350px;*/
- }
+/* Login JSP Selectors */
+#login-container {
+ position: relative;
+ left: 35%;
+ top: 55px;
+ right: 45%;
+ width: 320px;
+ height: 250px;
+ margin: 0px;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 10px;
+}
- /* Login JSP Selectors */
- #login-container {
- position: relative;
- left: 35%;
- top: 55px;
- right: 45%;
- width: 320px;
- height: 250px;
- margin: 0px;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 10px;
- }
+#login-container fieldset {
+ background-color: transparent;
+}
- #login-container fieldset {
- background-color: transparent;
- }
+#login-container label, #login-container input {
+ display: block;
+ float: left;
+ width: auto;
+ margin-top: 15px;
+}
- #login-container label, #login-container input {
- display: block;
- float: left;
- width: auto;
- margin-top: 15px;
- }
+#login-container label {
+ text-align: right;
+ padding-right: 20px;
+ width: 95px;
+}
- #login-container label {
- text-align: right;
- padding-right: 20px;
- width: 95px;
- }
+#login-container br {
+ clear: left;
+}
- #login-container br {
- clear: left;
- }
+#login-container legend {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ color: #596874;
+}
- #login-container legend {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
- color: #596874;
- }
+#loginForm {
+ margin: 0px;
+ padding: 0px;
+}
- #loginForm {
- margin: 0px;
- padding: 0px;
- }
+/* end Login Page Selectors */
- /* end Login Page Selectors */
+/* portlet regions within content-container. this includes footer-container. */
+#regionA {
+ /* test to swap columns...
+ float: right; */
- /* portlet regions within content-container. this includes footer-container. */
- #regionA {
- /* test to swap columns...
- float: right; */
+ width: 30%;
+ float: left;
+ margin: 0px;
+ padding: 0px;
+ min-width: 250px;
+ height: 300px;
+}
- width: 30%;
- float: left;
- margin: 0px;
- padding: 0px;
- min-width: 250px;
- }
+#regionB {
+ /*test to swap columns...
+margin: 0 30% 0 0; */
- #regionB {
- /*test to swap columns...
- margin: 0 30% 0 0; */
+/* two column layout*/
+ margin: 0 0 0 30%;
+ padding: 0;
+ width: 69%;
+ height: 300px;
- /* two column layout*/
- margin: 0 0 0 30%;
- padding: 0;
- width: 69%;
+ /* test to add 3rd region in layout...
+ width: 40%;
+ float: left;*/
+}
- /* test to add 3rd region in layout...
- width: 40%;
- float: left;*/
- }
+#regionC {
+ /* inclusion of 3rd region - comment out for 2 region testing
+ padding: 0px;
+ width: 27%;
+ float: left;*/
+ display: none;
+ height: 300px;
+}
- #regionC {
- /* inclusion of 3rd region - comment out for 2 region testing
- padding: 0px;
- width: 27%;
- float: left;*/
- display: none;
- }
+/* give a maximized portlet more space */
+#regionMaximized {
+ width: 100%;
+ float: left;
+ margin: 0px;
+ padding: 0px;
+ min-width: 400px;
+}
- /* give a maximized portlet more space */
- #regionMaximized {
- width: 100%;
- float: left;
- margin: 0px;
- padding: 0px;
- min-width: 400px;
- }
+#footer-container {
+/* margin: 30px 25% 0 25%;*/
+ text-align: center;
+ width: 99.5%;
+}
- #footer-container {
- /* margin: 30px 25% 0 25%;*/
- text-align: center;
- width: 99.5%;
- }
+#navigation-container {
- #navigation-container {
+}
- }
+#sub-navigation-container {
- #sub-navigation-container {
+}
- }
+/* used to clear float in regionA,B,C divs so that
+footer spans bottom of page */
+hr.cleaner {
+ clear: both;
+ height: 1px;
+ margin: -1px 0 0 0;
+ padding: 0;
+ border: none;
+ visibility: hidden;
+}
- /* used to clear float in regionA,B,C divs so that
- footer spans bottom of page */
- hr.cleaner {
- clear: both;
- height: 1px;
- margin: -1px 0 0 0;
- padding: 0;
- border: none;
- visibility: hidden;
- }
+/****************************
+* Tab Navigation for Header *
+*****************************/
- /****************************
- * Tab Navigation for Header *
- *****************************/
+UL#tabsHeader {
+ margin: 0;
+ padding-left: 300px;
+ min-width: 550px;
+}
- UL#tabsHeader {
- margin: 0;
- padding-left: 300px;
- min-width: 550px;
- }
+UL#tabsHeader li {
+ list-style: none;
+ float: left;
+ margin-left: -1px;
+ margin-top: 74px;
+ margin-right: 0px;
+ line-height: 16px;
+ padding: 0px;
+ border-right: 1px solid #72828E;
+ border-left: 1px solid #72828E;
+}
- UL#tabsHeader li {
- list-style: none;
- float: left;
- margin-left: -1px;
- margin-top: 74px;
- margin-right: 0px;
- line-height: 16px;
- padding: 0px;
- border-right: 1px solid #72828E;
- border-left: 1px solid #72828E;
- }
+UL#tabsHeader li:hover {
+ background-image: url( images/highlightedTab.gif );
+ background-repeat: repeat-x;
+}
- UL#tabsHeader li:hover {
- background-image: url( images/highlightedTab.gif );
- background-repeat: repeat-x;
- }
-
- /* hover selectors for main header tabs done to deal
+/* hover selectors for main header tabs done to deal
with IE not liking hover pseudo class on li */
- UL#tabsHeader li.hoverOn {
- background-image: url( images/highlightedTab.gif );
- background-repeat: repeat-x;
- }
+UL#tabsHeader li.hoverOn {
+ background-image: url( images/highlightedTab.gif );
+ background-repeat: repeat-x;
+}
- UL#tabsHeader li.hoverOff {
- background-image: none;
- }
+UL#tabsHeader li.hoverOff {
+ background-image: none;
+}
- UL#tabsHeader a {
- display: block;
- float: left;
- padding: 4px 15px 5px 15px;
- text-decoration: none;
- font: 13px / normal Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- background: 100% 0 no-repeat;
- color: #596874;
- }
+UL#tabsHeader a {
+ display: block;
+ float: left;
+ padding: 4px 15px 5px 15px;
+ text-decoration: none;
+ font: 13px / normal Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ background: 100% 0 no-repeat;
+ color: #596874;
+}
- UL#tabsHeader a:hover {
- text-decoration: underline;
- }
+UL#tabsHeader a:hover {
+ text-decoration: underline;
+}
- UL#tabsHeader #current, UL#tabsHeader #current a {
- font: 13px / normal Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-weight: 600;
- color: #EBEAEA;
- background-image: url( images/activeTab.gif );
- background-repeat: repeat-x;
- }
+UL#tabsHeader #current, UL#tabsHeader #current a {
+ font: 13px / normal Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-weight: 600;
+ color: #EBEAEA;
+ background-image: url( images/activeTab.gif );
+ background-repeat: repeat-x;
+}
- /* used for sub navigation if applicable
- UL#tabsHeader #currentSubNav, UL#tabsHeader #currentSubNav a {
- color: #000;
- line-height: 19px;
- padding-top: 0px;
- padding-bottom: 1px;
- margin-bottom: -1px;
- background: #eeeeef;
- }*/
+/* used for sub navigation if applicable
+UL#tabsHeader #currentSubNav, UL#tabsHeader #currentSubNav a {
+ color: #000;
+ line-height: 19px;
+ padding-top: 0px;
+ padding-bottom: 1px;
+ margin-bottom: -1px;
+ background: #eeeeef;
+}*/
- /* Tab background color for selected global nav item */
- li.currentTabBackground {
- background: #fff;
- }
+/* Tab background color for selected global nav item */
+li.currentTabBackground {
+ background: #fff;
+}
- /* used for sub navigation if applicable
- li.currentTabBackgroundSubNav {
- background: #eeeeef;
- }*/
+/* used for sub navigation if applicable
+li.currentTabBackgroundSubNav {
+ background: #eeeeef;
+}*/
- /* backslash hack for IE5-Mac \*/
- UL#tabsHeader a {
- float: none;
- }
+/* backslash hack for IE5-Mac \*/
+UL#tabsHeader a {
+ float: none;
+}
- /* End Mac Hack */
- html>body UL#tabsHeader a {
- width: auto;
- }
+/* End Mac Hack */
+html>body UL#tabsHeader a {
+ width: auto;
+}
- /* fixes IE6 win hack */
+/* fixes IE6 win hack */
- /****************************
- * Portlet Container Windows *
- *****************************/
+/***************************
+* Utility Navigation *
+*****************************/
- .portlet-container {
- /*margin: 10px;*/
- padding: 10px;
- }
+#dashboardnav {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #FFFFFF;
+ z-index: 20;
+}
- .portlet-titlebar-title {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: 500;
- color: #596874;
- white-space: nowrap;
- line-height: 100%;
- float: left;
- text-indent: 15px;
- }
+#dashboardnav a {
+ color: #FFFFFF;
+}
- .portlet-titlebar-decoration {
- background-image: url( images/portlet-win-decoration.gif );
- background-repeat: no-repeat;
- height: 11px;
- width: 11px;
- float: left;
- position: relative;
- top: 6px;
- }
+#dashboardnav .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
- /* wrapper for floating portlet window modes */
- .portlet-mode-container {
- float: right;
- }
+/****************************
+* Portlet Container Windows *
+*****************************/
- .portlet-titlebar-left {
- background-image: url( images/portlet-top-left.gif );
- background-repeat: no-repeat;
- width: 9px;
- height: 33px;
- background-position: right;
- min-width: 9px;
- }
+.portlet-container {
+/*margin: 10px;*/
+ padding: 10px;
+}
- .portlet-titlebar-center {
- background-image: url( images/portlet-top-middle.gif );
- background-repeat: repeat-x;
- height: 33px;
- }
+.portlet-titlebar-title {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: 500;
+ color: #596874;
+ white-space: nowrap;
+ line-height: 100%;
+ float: left;
+ text-indent: 15px;
+}
- .portlet-titlebar-right {
- background-image: url( images/portlet-top-right.gif );
- background-repeat: no-repeat;
- width: 10px;
- height: 33px;
- min-width: 10px;
- }
+.portlet-titlebar-decoration {
+ background-image: url( images/portlet-win-decoration.gif );
+ background-repeat: no-repeat;
+ height: 11px;
+ width: 11px;
+ float: left;
+ position: relative;
+ top: 6px;
+}
- .portlet-content-left {
- background-image: url( images/portlet-left-vertical.gif );
- height: 100%;
- background-repeat: repeat-y;
- background-position: right;
- width: 9px;
- min-width: 9px;
- }
+/* wrapper for floating portlet window modes */
+.portlet-mode-container {
+ float: right;
+}
- .portlet-content-center {
- background-color: #f7f7f7;
- background-repeat: repeat;
- vertical-align: top;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- }
+.portlet-titlebar-left {
+ background-image: url( images/portlet-top-left.gif );
+ background-repeat: no-repeat;
+ width: 9px;
+ height: 33px;
+ background-position: right;
+ min-width: 9px;
+}
- .portlet-body {
- background-color: #f7f7f7;
- }
+.portlet-titlebar-center {
+ background-image: url( images/portlet-top-middle.gif );
+ background-repeat: repeat-x;
+ height: 33px;
+}
- .portlet-content-right {
- background-image: url( images/portlet-right-vertical.gif );
- height: 100%;
- background-repeat: repeat-y;
- background-position: left;
- width: 10px;
- min-width: 10px;
- }
+.portlet-titlebar-right {
+ background-image: url( images/portlet-top-right.gif );
+ background-repeat: no-repeat;
+ width: 10px;
+ height: 33px;
+ min-width: 10px;
+}
- .portlet-footer-left {
- background-image: url( images/portlet-bottom-left.gif );
- width: 9px;
- height: 9px;
- background-repeat: no-repeat;
- background-position: top right;
- min-width: 9px;
- }
+.portlet-content-left {
+ background-image: url( images/portlet-left-vertical.gif );
+ height: 100%;
+ background-repeat: repeat-y;
+ background-position: right;
+ width: 9px;
+ min-width: 9px;
+}
- .portlet-footer-center {
- background-image: url( images/portlet-bottom-middle.gif );
- height: 14px;
- background-repeat: repeat-x;
- }
+.portlet-content-center {
+ background-color: #f7f7f7;
+ background-repeat: repeat;
+ vertical-align: top;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+}
- .portlet-footer-right {
- background-image: url( images/portlet-bottom-right.gif );
- width: 10px;
- height: 9px;
- background-repeat: no-repeat;
- min-width: 10px;
- }
+.portlet-body {
+ background-color: #f7f7f7;
+}
- /***********************
- * Portlet Window Modes *
- ************************/
- .portlet-mode-maximized {
- background-image: url( images/maximize.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-content-right {
+ background-image: url( images/portlet-right-vertical.gif );
+ height: 100%;
+ background-repeat: repeat-y;
+ background-position: left;
+ width: 10px;
+ min-width: 10px;
+}
- .portlet-mode-minimized {
- background-image: url( images/minimize.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-footer-left {
+ background-image: url( images/portlet-bottom-left.gif );
+ width: 9px;
+ height: 9px;
+ background-repeat: no-repeat;
+ background-position: top right;
+ min-width: 9px;
+}
- .portlet-mode-normal {
- background-image: url( images/normal.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-footer-center {
+ background-image: url( images/portlet-bottom-middle.gif );
+ height: 14px;
+ background-repeat: repeat-x;
+}
- .portlet-mode-help {
- background-image: url( images/help.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-footer-right {
+ background-image: url( images/portlet-bottom-right.gif );
+ width: 10px;
+ height: 9px;
+ background-repeat: no-repeat;
+ min-width: 10px;
+}
- .portlet-mode-edit {
- background-image: url( images/edit.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+/***********************
+* Portlet Window Modes *
+************************/
+.portlet-mode-maximized {
+ background-image: url( images/maximize.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- .portlet-mode-remove {
- background-image: url( images/remove.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-mode-minimized {
+ background-image: url( images/minimize.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- .portlet-mode-view {
- background-image: url( images/view.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-mode-normal {
+ background-image: url( images/normal.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- .portlet-mode-reload {
- background-image: url( images/reload.gif );
- width: 16px;
- height: 23px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-mode-help {
+ background-image: url( images/help.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- /**********************
- * Copyright Selectors *
- ***********************/
- .portal-copyright {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 9px;
- color: #5E6D7A;
- }
+.portlet-mode-edit {
+ background-image: url( images/edit.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- a.portal-copyright {
- color: #768591;
- text-decoration: none;
- }
+.portlet-mode-remove {
+ background-image: url( images/remove.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- a.portal-copyright:hover {
- color: #96A5B1;
- text-decoration: none;
- }
+.portlet-mode-view {
+ background-image: url( images/view.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- #ThemeBy:before {
- content: "Theme by Novell";
- }
+.portlet-mode-reload {
+ background-image: url( images/reload.gif );
+ width: 16px;
+ height: 23px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- /*************
- * Elements *
- **************/
- a {
- color: #768591;
- text-decoration: none;
- }
+/**********************
+* Copyright Selectors *
+***********************/
+.portal-copyright {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 9px;
+ color: #5E6D7A;
+}
- a:hover {
- color: #96A5B1;
- text-decoration: none;
- }
+a.portal-copyright {
+ color: #768591;
+ text-decoration: none;
+}
- INPUT {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- }
+a.portal-copyright:hover {
+ color: #96A5B1;
+ text-decoration: none;
+}
- SELECT {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- }
+#ThemeBy:before {
+ content: "Theme by Novell";
+}
- FONT {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- color: #768591;
- }
+/*************
+* Elements *
+**************/
+a {
+ color: #768591;
+ text-decoration: none;
+}
- FIELDSET {
- background-color: #f7f7f7;
- border: 1px solid #BABDB6;
- padding: 6px;
- }
+a:hover {
+ color: #96A5B1;
+ text-decoration: none;
+}
- LEGEND {
- background-color: transparent;
- padding-left: 6px;
- padding-right: 6px;
- padding-bottom: 0px;
- font-size: 12px;
- }
+INPUT {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+}
- /*******************
- * Table Selectors *
- ********************/
- /* Table header */
- .portlet-table-header {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 12px;
- font-weight: bold;
- background-color: #768591;
- color: #fff;
- }
+SELECT {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+}
- /* Normal text in a table cell */
- .portlet-table-body {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- }
+FONT {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ color: #768591;
+}
- /* Text in every other row in the table */
- .portlet-table-alternate {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- background-color: #ececec;
- }
+FIELDSET {
+ background-color: #f7f7f7;
+ border: 1px solid #BABDB6;
+ padding: 6px;
+}
- /* Text in a selected cell range */
- .portlet-table-selected {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- background-color: #768591;
- color: #fff;
- }
+LEGEND {
+ background-color: transparent;
+ padding-left: 6px;
+ padding-right: 6px;
+ padding-bottom: 0px;
+ font-size: 12px;
+}
- /* Text of a subheading */
- .portlet-table-subheader {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- }
+/*******************
+* Table Selectors *
+********************/
+/* Table header */
+.portlet-table-header {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 12px;
+ font-weight: bold;
+ background-color: #768591;
+ color: #fff;
+}
- /* Table footer */
- .portlet-table-footer {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 10px;
- }
+/* Normal text in a table cell */
+.portlet-table-body {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+}
- /* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
- .portlet-table-text {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-style: italic;
- }
+/* Text in every other row in the table */
+.portlet-table-alternate {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ background-color: #ececec;
+}
- /********
- * FONTS *
- *********/
+/* Text in a selected cell range */
+.portlet-table-selected {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ background-color: #768591;
+ color: #fff;
+}
- /* Font attributes for the normal fragment font.
+/* Text of a subheading */
+.portlet-table-subheader {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+}
+
+/* Table footer */
+.portlet-table-footer {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 10px;
+}
+
+/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
+.portlet-table-text {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-style: italic;
+}
+
+/********
+* FONTS *
+*********/
+
+/* Font attributes for the normal fragment font.
Used for the display of non-accentuated information */
- .portlet-font {
- color: #000;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- /*margin-top: 7px;
- margin-bottom: 5px;*/
- }
+.portlet-font {
+ color: #000;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ /*margin-top: 7px;
+ margin-bottom: 5px;*/
+}
- /* Font attributes similar to the portlet.font but the color is lighter */
- .portlet-font-dim {
- color: #888385;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- }
+/* Font attributes similar to the portlet.font but the color is lighter */
+.portlet-font-dim {
+ color: #888385;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+}
- /********
- * FORMS *
- *********/
+/********
+* FORMS *
+*********/
- /* Text used for the descriptive label of the whole form (not the label for fields)...why not call this portlet-form-title? */
- .portlet-form-label {
- color: #000;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- }
+/* Text used for the descriptive label of the whole form (not the label for fields)...why not call this portlet-form-title? */
+.portlet-form-label {
+ color: #000;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+}
- /* Text on a form button */
- .portlet-form-button {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- color: #000;
- }
+/* Text on a form button */
+.portlet-form-button {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ color: #000;
+}
- /* Text that appears beside a context dependent action icon */
- .portlet-icon-label {
+/* Text that appears beside a context dependent action icon */
+.portlet-icon-label {
- }
+}
- /* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
+/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
not sure if we need this one?.. */
- .portlet-dlg-icon-label {
+.portlet-dlg-icon-label {
- }
+}
- /* Text for form field labels */
- .portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- color: #000;
- vertical-align: bottom;
- }
+/* Text for form field labels */
+.portlet-form-field-label {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ color: #000;
+ vertical-align: bottom;
+}
- /* Text for a form field */
- .portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- color: #000;
- margin-top: 10px;
- }
+/* Text for a form field */
+.portlet-form-field {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ color: #000;
+ margin-top: 10px;
+}
- /* Text of the user-input in an input field. not sure if we need this guy? */
- .portlet-form-input-field {
- color: #000;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- }
+/* Text of the user-input in an input field. not sure if we need this guy? */
+.portlet-form-input-field {
+ color: #000;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+}
- /********
- * LINKS *
- *********/
+/********
+* LINKS *
+*********/
- .portal-links:link {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- color: #242424;
- text-decoration: none;
- }
+.portal-links:link {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+ color: #242424;
+ text-decoration: none;
+}
- .portal-links:hover {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- color: #5699B7;
- text-decoration: none;
- }
+.portal-links:hover {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+ color: #5699B7;
+ text-decoration: none;
+}
- .portal-links:active {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- color: #242424;
- text-decoration: none;
- }
+.portal-links:active {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+ color: #242424;
+ text-decoration: none;
+}
- .portal-links:visited {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- color: #242424;
- text-decoration: none;
- }
+.portal-links:visited {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+ color: #242424;
+ text-decoration: none;
+}
- /***********
- * MESSAGES *
- ************/
+/***********
+* MESSAGES *
+************/
- /* Status of the current operation. */
- .portlet-msg-status {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-style: normal;
- color: #788793;
- }
+/* Status of the current operation. */
+.portlet-msg-status {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-style: normal;
+ color: #788793;
+}
- /* Help messages, general additional information, etc. */
- .portlet-msg-info {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-style: italic;
- color: #000;
- }
+/* Help messages, general additional information, etc. */
+.portlet-msg-info {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-style: italic;
+ color: #000;
+}
- /* Error messages. */
- .portlet-msg-error {
- color: red;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- }
+/* Error messages. */
+.portlet-msg-error {
+ color: red;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+}
- /* Warning messages. */
- .portlet-msg-alert {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- color: #821717;
- }
+/* Warning messages. */
+.portlet-msg-alert {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+ color: #821717;
+}
- /* Verification of the successful completion of a task. */
- .portlet-msg-success {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- font-weight: bold;
- color: #359630;
- }
+/* Verification of the successful completion of a task. */
+.portlet-msg-success {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ font-weight: bold;
+ color: #359630;
+}
- /***********
- * SECTIONS *
- ************/
+/***********
+* SECTIONS *
+************/
- /* Table or section header */
- .portlet-section-header {
- font-weight: bold;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #768591;
- background-color: #f7f7f7; /*background-image: url(interf/head.jpg);*/
- }
+/* Table or section header */
+.portlet-section-header {
+ font-weight: bold;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #768591;
+ background-color: #f7f7f7; /*background-image: url(interf/head.jpg);*/
+}
- /* Normal text in a table cell */
- .portlet-section-body {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+/* Normal text in a table cell */
+.portlet-section-body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- /* Text in every other row in the cell */
- .portlet-section-alternate {
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- background-color: #ececec;
- }
+/* Text in every other row in the cell */
+.portlet-section-alternate {
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ background-color: #ececec;
+}
- /* Text in a selected cell range */
- .portlet-section-selected {
- background-color: #768591;
- font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
- font-size: 11px;
- color: #fff;
- }
+/* Text in a selected cell range */
+.portlet-section-selected {
+ background-color: #768591;
+ font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
+ font-size: 11px;
+ color: #fff;
+}
- /* Text of a subheading */
- .portlet-section-subheader {
- font-weight: bold;
- font-size: 11px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- color: #000;
- /*margin: 3px;
- padding: 3px;*/
- }
+/* Text of a subheading */
+.portlet-section-subheader {
+ font-weight: bold;
+ font-size: 11px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #000;
+ /*margin: 3px;
+ padding: 3px;*/
+}
- /* Table or section footnote */
- .portlet-section-footer {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- background-color: #f7f7f7;
- font-size: 10px;
- }
+/* Table or section footnote */
+.portlet-section-footer {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ background-color: #f7f7f7;
+ font-size: 10px;
+}
- /* Text that belongs to the table but does not fall in one of the other categories
+/* Text that belongs to the table but does not fall in one of the other categories
(e.g. explanatory or help text that is associated with the section. */
- .portlet-section-text {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-style: italic;
- }
+.portlet-section-text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-style: italic;
+}
- /********
- * MENUS *
- *********/
+/********
+* MENUS *
+*********/
- /*General menu settings such as background color, margins, etc. */
- .portlet-menu {
+/*General menu settings such as background color, margins, etc. */
+.portlet-menu {
- }
+}
- /* Normal, unselected menu item. */
- .portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 9px;
- }
+/* Normal, unselected menu item. */
+.portlet-menu-item {
+ color: #242424;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+}
- .portlet-menu-item:hover {
- color: #5699B7;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 9px;
- }
+.portlet-menu-item:hover {
+ color: #5699B7;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+}
- /* Selected menu item. */
- .portlet-menu-item-selected {
+/* Selected menu item. */
+.portlet-menu-item-selected {
- }
+}
- /* Selected menu item when the mouse hovers over it. */
- .portlet-menu-item-selected:hover {
+/* Selected menu item when the mouse hovers over it. */
+.portlet-menu-item-selected:hover {
- }
+}
- /* Normal, unselected menu item that has sub-menus. */
- .portlet-menu-cascade-item {
+/* Normal, unselected menu item that has sub-menus. */
+.portlet-menu-cascade-item {
- }
+}
- /* Selected sub-menu item that has sub-menus */
- .portlet-menu-cascade-item-selected {
+/* Selected sub-menu item that has sub-menus */
+.portlet-menu-cascade-item-selected {
- }
+}
- /* Descriptive text for the menu (e.g. in a help context below the menu) */
- .portlet-menu-description {
+/* Descriptive text for the menu (e.g. in a help context below the menu) */
+.portlet-menu-description {
- }
+}
- /* Menu caption */
- .portlet-menu-caption {
+/* Menu caption */
+.portlet-menu-caption {
- }
+}
- /* A separator bar similar to a horizontal rule, but with styling matching the page */
- .portlet-horizontal-separator {
- }
+/* A separator bar similar to a horizontal rule, but with styling matching the page */
+.portlet-horizontal-separator {
+}
- /* Allows portlets to mimic the title bar when nesting something */
- .portlet-nestedTitle-bar {
- }
+/* Allows portlets to mimic the title bar when nesting something */
+.portlet-nestedTitle-bar {
+}
- /* Allows portlets to match the textual character of the title on the title bar. */
- .portlet-nestedTitle {
- }
+/* Allows portlets to match the textual character of the title on the title bar. */
+.portlet-nestedTitle {
+}
- /* Support portlets having tabs in the same style as the page or other portlets */
- .portlet-tab {
- }
+/* Support portlets having tabs in the same style as the page or other portlets */
+.portlet-tab {
+}
- /* Highlight the tab currently being shown */
- .portlet-tab-active {
- }
+/* Highlight the tab currently being shown */
+.portlet-tab-active {
+}
- /* Highlight the selected tab (not yet active) */
- .portlet-tab-selected {
- }
+/* Highlight the selected tab (not yet active) */
+.portlet-tab-selected {
+}
- /* A tab which can not be currently activated */
- .portlet-tab-disabled {
- }
+/* A tab which can not be currently activated */
+.portlet-tab-disabled {
+}
- /* Top level style for the content of a tab. */
- .portlet-tab-area {
- }
\ No newline at end of file
+/* Top level style for the content of a tab. */
+.portlet-tab-area {
+}
+
+/*****************
+* AJAX Selectors *
+*****************/
+
+.handle {
+ cursor: move;
+}
+
+.emptyPlaceMarker {
+ border-right: red 1px dashed;
+ border-top: red 1px dashed;
+ border-left: red 1px dashed;
+ border-bottom: red 1px dashed;
+ background-color: Transparent;
+}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css 2006-12-22 22:52:04 UTC (rev 8571)
@@ -18,11 +18,11 @@
font-size: 12px;
}
- /*****************
- * Portal Header *
- ******************/
+/*****************
+* Portal Header *
+******************/
- /* spacer to keep header at certain width regardless of display size
+/* spacer to keep header at certain width regardless of display size
done to avoid overlapping of tab navigation in header */
#spacer {
line-height: 0px;
@@ -70,9 +70,9 @@
top: 13px;
}
- /************************
- * Portal Layout Regions *
- *************************/
+/************************
+* Portal Layout Regions *
+*************************/
/* wrapper for entire portal. starts/ends after/before body tag */
#portal-container {
@@ -179,6 +179,7 @@
margin: 0px;
padding: 0px;
min-width: 250px;
+ height: 300px;
}
#regionB {
@@ -190,6 +191,7 @@
padding: 0px; /* test to add 3rd region in layout...*/
width: 68.5%;
float: left;
+ height: 300px;
}
#regionC {
@@ -199,6 +201,7 @@
width: 28%;
float: left; /*hide 3rd region*/
display: none;
+ height: 300px;
}
#footer-container {
@@ -211,9 +214,9 @@
#navigation-container {
}
- /* used to clear float in regionA,B,C divs so that
+/* used to clear float in regionA,B,C divs so that
footer spans bottom of page */
- /* used to clear float in regionA,B,C divs so that
+/* used to clear float in regionA,B,C divs so that
footer spans bottom of page */
hr.cleaner {
clear: both;
@@ -224,9 +227,9 @@
visibility: hidden;
}
- /****************************
- * Tab Navigation for Header *
- *****************************/
+/****************************
+* Tab Navigation for Header *
+*****************************/
UL#tabsHeader {
margin: 0;
@@ -311,10 +314,35 @@
/* fixes IE6 win hack */
- /****************************
- * Portlet Container Windows *
- *****************************/
+/***************************
+* Utility Navigation *
+*****************************/
+#dashboardnav {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #FFFFFF;
+ z-index: 20;
+}
+
+#dashboardnav a {
+ color: #FFFFFF;
+}
+
+#dashboardnav .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
+
+/****************************
+* Portlet Container Windows *
+*****************************/
+
.portlet-container {
padding: 10px;
}
@@ -423,9 +451,9 @@
min-width: 9px;
}
- /***********************
- * Portlet Window Modes *
- ************************/
+/***********************
+* Portlet Window Modes *
+************************/
.portlet-mode-maximized {
background-image: url( images/maximize.gif );
width: 16px;
@@ -506,9 +534,9 @@
cursor: pointer;
}
- /**********************
- * Copyright Selectors *
- ***********************/
+/**********************
+* Copyright Selectors *
+***********************/
.portal-copyright {
font-weight: normal;
font-family: "Monotype Corsiva", Arial, Helvetica, Sans-Serif, sans-serif;
@@ -530,9 +558,9 @@
content: "Theme by Novell";
}
- /*************
- * Elements *
- **************/
+/*************
+* Elements *
+**************/
a {
color: #9F625D;
text-decoration: none;
@@ -598,11 +626,11 @@
vertical-align: middle;
}
- /********
- * FONTS *
- *********/
+/********
+* FONTS *
+*********/
- /* Font attributes for the normal fragment font.
+/* Font attributes for the normal fragment font.
Used for the display of non-accentuated information */
.portlet-font {
color: #000000;
@@ -617,9 +645,9 @@
font-size: 12px;
}
- /********
- * FORMS *
- *********/
+/********
+* FORMS *
+*********/
.portlet-form-label {
color: #000;
text-decoration: none;
@@ -648,7 +676,7 @@
}
- /* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
+/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
not sure if we need this one?.. */
.portlet-dlg-icon-label {
@@ -669,9 +697,9 @@
color: #000;
}
- /********
- * LINKS *
- *********/
+/********
+* LINKS *
+*********/
.portal-links:link {
font-family: Arial, Helvetica, Sans-Serif, sans-serif;
@@ -705,9 +733,9 @@
text-decoration: none;
}
- /***********
- * MESSAGES *
- ************/
+/***********
+* MESSAGES *
+************/
/* Status of the current operation. */
.portlet-msg-status {
@@ -750,9 +778,9 @@
color: #705130;
}
- /********
- * MENUS *
- *********/
+/********
+* MENUS *
+*********/
/*General menu settings such as background color, margins, etc. */
.portlet-menu {
@@ -806,9 +834,9 @@
/* ===== WSRP 2.0 - As of now proposed additions are: ===== */
- /***********
- * SECTIONS *
- ************/
+/***********
+* SECTIONS *
+************/
/* Table or section header */
.portlet-section-header {
@@ -844,7 +872,7 @@
font-size: 11px;
}
- /* Text that belongs to the table but does not fall in one of the other categories
+/* Text that belongs to the table but does not fall in one of the other categories
(e.g. explanatory or help text that is associated with the section. */
.portlet-section-text {
font-size: 12px;
@@ -852,9 +880,9 @@
font-style: italic;
}
- /*******************
- * Table Selectors *
- ********************/
+/*******************
+* Table Selectors *
+********************/
/* Table header */
.portlet-table-header {
font-weight: bold;
@@ -943,14 +971,30 @@
}
- /****************** Not sure about the following selectors:
+/*****************
+* AJAX Selectors *
+*****************/
- PortletHeaderColor
- PortletHeaderText
- LeftCurve
- PortletHeaderLink
- RightCurve
- RegionBorder
- RegionHeaderColor
+.handle {
+ cursor: move;
+}
- **************************************************************/
+.emptyPlaceMarker {
+ border-right: red 1px dashed;
+ border-top: red 1px dashed;
+ border-left: red 1px dashed;
+ border-bottom: red 1px dashed;
+ background-color: Transparent;
+}
+
+/****************** Not sure about the following selectors:
+
+PortletHeaderColor
+PortletHeaderText
+LeftCurve
+PortletHeaderLink
+RightCurve
+RegionBorder
+RegionHeaderColor
+
+**************************************************************/
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,1031 +1,1075 @@
- /******************************************************
- * JBoss Theme :: Novell - "Mission Critical" CSS *
- * By: paul tamaro, 11/15/05 *
- *******************************************************/
+/******************************************************
+* JBoss Theme :: Novell - "Mission Critical" CSS *
+* By: paul tamaro, 11/15/05 *
+*******************************************************/
- #body {
- background-image: url( images/portal_background.jpg );
- background-repeat: repeat-x;
- background-color: #5c5c5a;
- margin: 0px;
- padding: 0px;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #e2e7bf;
- }
+#body {
+ background-image: url( images/portal_background.jpg );
+ background-repeat: repeat-x;
+ background-color: #5c5c5a;
+ margin: 0px;
+ padding: 0px;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #e2e7bf;
+}
- /*****************
- * Portal Header *
- ******************/
+/*****************
+* Portal Header *
+******************/
- /* spacer to keep header at certain width regardless of display size
+/* spacer to keep header at certain width regardless of display size
done to avoid overlapping of tab navigation in header */
- #spacer {
- width: 1024px;
- line-height: 0px;
- font-size: 0px;
- height: 0px;
- }
+#spacer {
+ width: 1024px;
+ line-height: 0px;
+ font-size: 0px;
+ height: 0px;
+}
- /* Wrapper for Header */
- #header-container {
- height: 100%;
- min-width: 1000px;
- width: 100%;
- /* test to reposition header on page
- position: absolute;
- bottom: 5px;*/
- }
+/* Wrapper for Header */
+#header-container {
+ height: 100%;
+ min-width: 1000px;
+ width: 100%;
+ /* test to reposition header on page
+ position: absolute;
+ bottom: 5px;*/
+}
- /* Header background */
- #header {
- padding: 0px;
- }
+/* Header background */
+#header {
+ padding: 0px;
+}
- #logoName {
- /* Logo...*/
- background-image: url( images/portal-header.gif );
- background-repeat: no-repeat;
- width: 440px;
- height: 440px;
- z-index: 0;
- position: absolute;
- left: 0px;
- top: -1px;
- }
+#logoName {
+/* Logo...*/
+ background-image: url( images/portal-header.gif );
+ background-repeat: no-repeat;
+ width: 440px;
+ height: 440px;
+ z-index: 0;
+ position: absolute;
+ left: 0px;
+ top: -1px;
+}
- /************************
- * Portal Layout Regions *
- *************************/
+/************************
+* Portal Layout Regions *
+*************************/
- /* wrapper for entire portal. starts/ends after/before body tag */
- #portal-container {
- /*width: 100%;*/
+/* wrapper for entire portal. starts/ends after/before body tag */
+#portal-container {
+/*width: 100%;*/
- /*part of below IE hack to preserve min-width for portlet regions */
- padding: 0 350px 0 350px;
- }
+/*part of below IE hack to preserve min-width for portlet regions */
+ padding: 0 350px 0 350px;
+}
- /* min width hack for IE */
- #expander {
- margin: 0 -350px 0 -350px;
- position: relative;
- }
+/* min width hack for IE */
+#expander {
+ margin: 0 -350px 0 -350px;
+ position: relative;
+}
- /* min width hack for IE */
- #sizer {
- width: 100%;
- }
+/* min width hack for IE */
+#sizer {
+ width: 100%;
+}
- /* IE Hack \*/
- * html #portal-container,
- * html #sizer,
- * html #expander {
- height: 0;
- }
+/* IE Hack \*/
+* html #portal-container,
+ * html #sizer,
+ * html #expander {
+ height: 0;
+}
- /* end IE min-width hack */
+/* end IE min-width hack */
- /*table that contains all regions. does not include header*/
- #content-container {
- height: 100%;
- width: 99%;
- text-align: left;
- max-width: 1600px;
- min-width: 800px;
- position: absolute;
- top: 100px;
- left: 12px;
- z-index: 2;
- /*part of below IE hack
- padding: 0 350px 0 350px;*/
- }
+/*table that contains all regions. does not include header*/
+#content-container {
+ height: 100%;
+ width: 99%;
+ text-align: left;
+ max-width: 1600px;
+ min-width: 800px;
+ position: absolute;
+ top: 100px;
+ left: 12px;
+ z-index: 2;
+ /*part of below IE hack
+padding: 0 350px 0 350px;*/
+}
- /* Login JSP Selectors */
- #login-container {
- position: relative;
- left: 35%;
- top: 55px;
- right: 45%;
- width: 320px;
- height: 250px;
- margin: 0px;
- }
+/* Login JSP Selectors */
+#login-container {
+ position: relative;
+ left: 35%;
+ top: 55px;
+ right: 45%;
+ width: 320px;
+ height: 250px;
+ margin: 0px;
+}
- #login-container label, #login-container input {
- display: block;
- float: left;
- width: auto;
- margin-top: 15px;
- }
+#login-container label, #login-container input {
+ display: block;
+ float: left;
+ width: auto;
+ margin-top: 15px;
+}
- #login-container label {
- text-align: right;
- padding-right: 20px;
- width: 95px;
- }
+#login-container label {
+ text-align: right;
+ padding-right: 20px;
+ width: 95px;
+}
- #login-container br {
- clear: left;
- }
+#login-container br {
+ clear: left;
+}
- #loginButton {
+#loginButton {
- }
+}
- #login-container legend {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
- color: #768591;
- }
+#login-container legend {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ color: #768591;
+}
- #loginForm {
- margin: 0px;
- padding: 0px;
- }
+#loginForm {
+ margin: 0px;
+ padding: 0px;
+}
- /* end Login Page Selectors */
+/* end Login Page Selectors */
- /* portlet regions within content-container. this includes footer-container. */
- #regionA {
- /* test to swap columns...
- float: right; */
- width: 30%;
- float: left;
- margin: 0px;
- padding: 0px;
- min-width: 250px;
- }
+/* portlet regions within content-container. this includes footer-container. */
+#regionA {
+ /* test to swap columns...
+ float: right; */
+ width: 30%;
+ float: left;
+ margin: 0px;
+ padding: 0px;
+ min-width: 250px;
+ height: 300px;
+}
- #regionB {
- /*test to swap columns...
- margin: 0 30% 0 0; */
+#regionB {
+ /*test to swap columns...
+margin: 0 30% 0 0; */
- /* two column layout*/
- margin: 0 0 0 30%;
- padding: 0;
- width: 69%;
+/* two column layout*/
+ margin: 0 0 0 30%;
+ padding: 0;
+ width: 69%;
+ height: 300px;
- /* test to add 3rd region in layout...
- width: 40%;
- float: left;*/
- }
+ /* test to add 3rd region in layout...
+ width: 40%;
+ float: left;*/
+}
- #regionC {
- /* inclusion of 3rd region - comment out for 2 region testing */
- /* padding: 0px;
- width: 27%;
- float: left; */
- display: none;
- }
+#regionC {
+/* inclusion of 3rd region - comment out for 2 region testing */
+ /* padding: 0px;
+ width: 27%;
+ float: left; */
+ display: none;
+ height: 300px;
+}
- /* give a maximized portlet more space */
- #regionMaximized {
- width: 100%;
- float: left;
- margin: 0px;
- padding: 0px;
- min-width: 400px;
- }
+/* give a maximized portlet more space */
+#regionMaximized {
+ width: 100%;
+ float: left;
+ margin: 0px;
+ padding: 0px;
+ min-width: 400px;
+}
- #footer-container {
- margin: 12px 10px 12px 30%;
- padding: 0px 0px 12px 12px;
- text-align: left;
- }
+#footer-container {
+ margin: 12px 10px 12px 30%;
+ padding: 0px 0px 12px 12px;
+ text-align: left;
+}
- #navigation-container {
- /* no time to get to this yet...
- border: 1px dotted #fff;
- height: 22px;
- width: 400px;
- top: 80px;
- left: 200px;
- z-index: 3; */
- }
+#navigation-container {
+ /* no time to get to this yet...
+ border: 1px dotted #fff;
+ height: 22px;
+ width: 400px;
+ top: 80px;
+ left: 200px;
+ z-index: 3; */
+}
- #sub-navigation-container {
- /* nothing here yet */
- }
+#sub-navigation-container {
+/* nothing here yet */
+}
- /* used to clear float in regionA,B,C divs so that
- footer spans bottom of page */
- hr.cleaner {
- clear: both;
- height: 1px;
- margin: -1px 0 0 0;
- padding: 0;
- border: none;
- visibility: hidden;
- }
+/* used to clear float in regionA,B,C divs so that
+footer spans bottom of page */
+hr.cleaner {
+ clear: both;
+ height: 1px;
+ margin: -1px 0 0 0;
+ padding: 0;
+ border: none;
+ visibility: hidden;
+}
- /****************************
- * Tab Navigation for Header *
- *****************************/
+/****************************
+* Tab Navigation for Header *
+*****************************/
- UL#tabsHeader {
- margin: 0;
- padding-left: 440px;
- min-width: 550px;
- }
+UL#tabsHeader {
+ margin: 0;
+ padding-left: 440px;
+ min-width: 550px;
+}
- UL#tabsHeader li {
- list-style: none;
- float: left;
- margin-left: -1px;
- margin-top: 74px;
- margin-right: 0px;
- line-height: 24px;
- padding: 0px; /* border-right: 1px dotted #8b8d89;*/
- border-left: 1px dotted #8b8d89;
- }
+UL#tabsHeader li {
+ list-style: none;
+ float: left;
+ margin-left: -1px;
+ margin-top: 74px;
+ margin-right: 0px;
+ line-height: 24px;
+ padding: 0px; /* border-right: 1px dotted #8b8d89;*/
+ border-left: 1px dotted #8b8d89;
+}
- UL#tabsHeader li:hover {
- background-image: url( images/highlightedTab.gif );
- background-repeat: repeat-x;
- }
+UL#tabsHeader li:hover {
+ background-image: url( images/highlightedTab.gif );
+ background-repeat: repeat-x;
+}
- /* hover selectors for main header tabs done to deal
+/* hover selectors for main header tabs done to deal
with IE not liking hover pseudo class on li */
- UL#tabsHeader li.hoverOn {
- background-image: url( images/highlightedTab.gif );
- background-repeat: repeat-x;
- }
+UL#tabsHeader li.hoverOn {
+ background-image: url( images/highlightedTab.gif );
+ background-repeat: repeat-x;
+}
- UL#tabsHeader li.hoverOff {
- background-image: none;
- }
+UL#tabsHeader li.hoverOff {
+ background-image: none;
+}
- UL#tabsHeader a {
- display: block;
- float: left;
- padding: 0px 15px 0px 15px;
- text-decoration: none;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- background: 100% 0 no-repeat;
- color: #999999;
- }
+UL#tabsHeader a {
+ display: block;
+ float: left;
+ padding: 0px 15px 0px 15px;
+ text-decoration: none;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ background: 100% 0 no-repeat;
+ color: #999999;
+}
- UL#tabsHeader a:hover {
- text-decoration: underline;
- }
+UL#tabsHeader a:hover {
+ text-decoration: underline;
+}
- UL#tabsHeader #current, UL#tabsHeader #current a {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: 600;
- color: #e1d54b;
- background-image: url( images/activeTab.gif );
- background-repeat: repeat-x;
- }
+UL#tabsHeader #current, UL#tabsHeader #current a {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: 600;
+ color: #e1d54b;
+ background-image: url( images/activeTab.gif );
+ background-repeat: repeat-x;
+}
- /* used for sub navigation if applicable
- UL#tabsHeader #currentSubNav, UL#tabsHeader #currentSubNav a {
- color: #000;
- line-height: 19px;
- padding-top: 0px;
- padding-bottom: 1px;
- margin-bottom: -1px;
- background: #eeeeef;
- }*/
+/* used for sub navigation if applicable
+UL#tabsHeader #currentSubNav, UL#tabsHeader #currentSubNav a {
+ color: #000;
+ line-height: 19px;
+ padding-top: 0px;
+ padding-bottom: 1px;
+ margin-bottom: -1px;
+ background: #eeeeef;
+}*/
- /* Tab background color for selected global nav item */
- li.currentTabBackground {
- background: #fff;
- }
+/* Tab background color for selected global nav item */
+li.currentTabBackground {
+ background: #fff;
+}
- /* used for sub navigation if applicable
- li.currentTabBackgroundSubNav {
- background: #eeeeef;
- }*/
+/* used for sub navigation if applicable
+li.currentTabBackgroundSubNav {
+ background: #eeeeef;
+}*/
- /* backslash hack for IE5-Mac \*/
- UL#tabsHeader a {
- float: none;
- }
+/* backslash hack for IE5-Mac \*/
+UL#tabsHeader a {
+ float: none;
+}
- /* End Mac Hack */
- html>body UL#tabsHeader a {
- width: auto;
- }
+/* End Mac Hack */
+html>body UL#tabsHeader a {
+ width: auto;
+}
- /* fixes IE6 win hack */
+/* fixes IE6 win hack */
- /****************************
- * Portlet Container Windows *
- *****************************/
+/***************************
+* Utility Navigation *
+*****************************/
- .portlet-container {
- /* margin: 10px; */
- padding: 10px 7px 11px 7px;
- }
+#dashboardnav {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #FFFFFF;
+ z-index: 20;
+}
- .portlet-titlebar-title {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 9px;
- font-weight: bold;
- text-transform: uppercase;
- color: #444;
- white-space: nowrap;
- line-height: 100%;
- float: left;
- text-indent: 10px;
- margin: 0px;
- padding: 0px;
- padding-bottom: 1px;
- top: 0px;
- vertical-align: top;
- letter-spacing: 1px;
- word-spacing: 2px; /* border: 1px dashed #fff */
- }
+#dashboardnav a {
+ color: #FFFFFF;
+}
- .portlet-titlebar-decoration {
- background-image: url( images/portlet-win-decoration.gif );
- background-repeat: no-repeat;
- height: 7px;
- width: 7px;
- float: left;
- position: relative;
- top: 4px;
- left: 0px;
- }
+#dashboardnav .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
- /* wrapper for floating portlet window modes */
- .portlet-mode-container {
- float: right;
- background-image: url( images/portlet-mode-bg.gif );
- background-repeat: no-repeat;
- }
+/****************************
+* Portlet Container Windows *
+*****************************/
- .portlet-titlebar-left {
- background-image: url( images/portlet-top-left.gif );
- background-repeat: no-repeat;
- background-position: left;
- height: 15px;
- width: 5px;
- min-width: 5px;
- padding-right: 0px;
- }
+.portlet-container {
+/* margin: 10px; */
+ padding: 10px 7px 11px 7px;
+}
- .portlet-titlebar-center {
- background-image: url( images/portlet-top-middle.gif );
- background-repeat: repeat-x;
- height: 15px;
- }
+.portlet-titlebar-title {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ font-weight: bold;
+ text-transform: uppercase;
+ color: #444;
+ white-space: nowrap;
+ line-height: 100%;
+ float: left;
+ text-indent: 10px;
+ margin: 0px;
+ padding: 0px;
+ padding-bottom: 1px;
+ top: 0px;
+ vertical-align: top;
+ letter-spacing: 1px;
+ word-spacing: 2px; /* border: 1px dashed #fff */
+}
- .portlet-titlebar-right {
- background-image: url( images/portlet-top-right.gif );
- background-repeat: no-repeat;
- width: 5px;
- height: 15px;
- min-width: 5px;
- }
+.portlet-titlebar-decoration {
+ background-image: url( images/portlet-win-decoration.gif );
+ background-repeat: no-repeat;
+ height: 7px;
+ width: 7px;
+ float: left;
+ position: relative;
+ top: 4px;
+ left: 0px;
+}
- .portlet-content-left {
- height: 100%;
- width: 5px;
- min-width: 5px;
- /* background-color: #ffffff;
- border-left: 1px solid #858f8c; */
- background-image: url( images/portlet-left-vertical.gif );
- background-repeat: repeat-y;
- }
+/* wrapper for floating portlet window modes */
+.portlet-mode-container {
+ float: right;
+ background-image: url( images/portlet-mode-bg.gif );
+ background-repeat: no-repeat;
+}
- .portlet-content-center {
- /* background-image: url(images/portlet-background.gif);
- background-repeat: no-repeat; */
- background-color: #7a7b77;
- background-position: bottom left;
- vertical-align: top;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 13px; /* UNCOMMENT FOR TESTING.... border-right: 1px solid #858f8c; */
- margin: 0px;
- padding: 10px;
+.portlet-titlebar-left {
+ background-image: url( images/portlet-top-left.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 15px;
+ width: 5px;
+ min-width: 5px;
+ padding-right: 0px;
+}
- }
+.portlet-titlebar-center {
+ background-image: url( images/portlet-top-middle.gif );
+ background-repeat: repeat-x;
+ height: 15px;
+}
- .portlet-body .portlet-text {
- background-color: #7a7b77;
- color: #eee;
- }
+.portlet-titlebar-right {
+ background-image: url( images/portlet-top-right.gif );
+ background-repeat: no-repeat;
+ width: 5px;
+ height: 15px;
+ min-width: 5px;
+}
- .portlet-content-right {
- height: 100%;
- background-image: url( images/portlet-right-vertical.gif );
- background-repeat: repeat-y;
- background-position: left;
- width: 5px;
- min-width: 5px;
- /*background-color: #ffffff;
- border-right: 1px solid #858f8c;*/
- }
+.portlet-content-left {
+ height: 100%;
+ width: 5px;
+ min-width: 5px;
+ /* background-color: #ffffff;
+border-left: 1px solid #858f8c; */
+ background-image: url( images/portlet-left-vertical.gif );
+ background-repeat: repeat-y;
+}
- .portlet-footer-left {
- background-image: url( images/portlet-bottom-left.gif );
- background-repeat: no-repeat;
- background-position: left;
- height: 6px;
- width: 5px;
- }
+.portlet-content-center {
+ /* background-image: url(images/portlet-background.gif);
+ background-repeat: no-repeat; */
+ background-color: #7a7b77;
+ background-position: bottom left;
+ vertical-align: top;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 13px; /* UNCOMMENT FOR TESTING.... border-right: 1px solid #858f8c; */
+ margin: 0px;
+ padding: 10px;
- .portlet-footer-center {
- background-image: url( images/portlet-bottom-middle.gif );
- background-repeat: repeat-x;
- background-position: left;
- height: 6px;
- /* background-color: #ffffff;
- border-bottom: 1px solid #858f8c; */
- }
+}
- .portlet-footer-right {
- background-image: url( images/portlet-bottom-right.gif );
- background-repeat: no-repeat;
- background-position: right;
- height: 6px;
- width: 5px;
- /* background-color: #ffffff;
- border-right: 1px solid #858f8c;
- border-bottom: 1px solid #858f8c;*/
- }
+.portlet-body .portlet-text {
+ background-color: #7a7b77;
+ color: #eee;
+}
- /***********************
- * Portlet Window Modes *
- ************************/
- .portlet-mode-maximized {
- background-image: url( images/maximize.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-content-right {
+ height: 100%;
+ background-image: url( images/portlet-right-vertical.gif );
+ background-repeat: repeat-y;
+ background-position: left;
+ width: 5px;
+ min-width: 5px;
+ /*background-color: #ffffff;
+border-right: 1px solid #858f8c;*/
+}
- .portlet-mode-minimized {
- background-image: url( images/minimize.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-footer-left {
+ background-image: url( images/portlet-bottom-left.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 6px;
+ width: 5px;
+}
- .portlet-mode-normal {
- background-image: url( images/normal.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-footer-center {
+ background-image: url( images/portlet-bottom-middle.gif );
+ background-repeat: repeat-x;
+ background-position: left;
+ height: 6px;
+ /* background-color: #ffffff;
+border-bottom: 1px solid #858f8c; */
+}
- .portlet-mode-help {
- background-image: url( images/help.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-footer-right {
+ background-image: url( images/portlet-bottom-right.gif );
+ background-repeat: no-repeat;
+ background-position: right;
+ height: 6px;
+ width: 5px;
+ /* background-color: #ffffff;
+border-right: 1px solid #858f8c;
+border-bottom: 1px solid #858f8c;*/
+}
- .portlet-mode-edit {
- background-image: url( images/edit.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+/***********************
+* Portlet Window Modes *
+************************/
+.portlet-mode-maximized {
+ background-image: url( images/maximize.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- .portlet-mode-remove {
- background-image: url( images/remove.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-mode-minimized {
+ background-image: url( images/minimize.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- .portlet-mode-view {
- background-image: url( images/view.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-mode-normal {
+ background-image: url( images/normal.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- .portlet-mode-reload {
- background-image: url( images/reload.gif );
- width: 15px;
- height: 15px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- }
+.portlet-mode-help {
+ background-image: url( images/help.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- /**********************
- * Copyright Selectors *
- ***********************/
- .portal-copyright {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 9px;
- color: #777;
- }
+.portlet-mode-edit {
+ background-image: url( images/edit.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- a.portal-copyright {
- color: #fff799;
- text-decoration: none;
- }
+.portlet-mode-remove {
+ background-image: url( images/remove.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- a.portal-copyright:hover {
- color: #fcc24f;
- text-decoration: underline;
- }
+.portlet-mode-view {
+ background-image: url( images/view.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- #ThemeBy:before {
- content: "Theme by Novell";
- }
+.portlet-mode-reload {
+ background-image: url( images/reload.gif );
+ width: 15px;
+ height: 15px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+}
- /*************
- * Elements *
- **************/
- a:link {
- color: #fff799;
- text-decoration: none;
- }
+/**********************
+* Copyright Selectors *
+***********************/
+.portal-copyright {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ color: #777;
+}
- a:visited {
- color: #fff699;
- text-decoration: none;
- }
+a.portal-copyright {
+ color: #fff799;
+ text-decoration: none;
+}
- a:hover a:active {
- color: #fcc24f;
- text-decoration: underline;
- }
+a.portal-copyright:hover {
+ color: #fcc24f;
+ text-decoration: underline;
+}
- INPUT {
- padding: 0px 2px 0px 2px;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: #444;
- /* background-color: #999;
- background-image: url(images/form-button-bg.gif);
- background-repeat: repeat-x; */
- border: 1px solid #777;
- cursor: pointer;
- }
+#ThemeBy:before {
+ content: "Theme by Novell";
+}
- SELECT {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- background-color: #8b8d89;
- color: #444;
- }
+/*************
+* Elements *
+**************/
+a:link {
+ color: #fff799;
+ text-decoration: none;
+}
- OPTION {
- background-color: #8b8d89;
- }
+a:visited {
+ color: #fff699;
+ text-decoration: none;
+}
- FONT {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #768591;
- }
+a:hover a:active {
+ color: #fcc24f;
+ text-decoration: underline;
+}
- FIELDSET {
- /*background-color: #999;*/
- border: 1px solid #BABDB6;
- padding: 6px;
- background-color: transparent;
- }
+INPUT {
+ padding: 0px 2px 0px 2px;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: normal;
+ color: #444;
+ /* background-color: #999;
+ background-image: url(images/form-button-bg.gif);
+ background-repeat: repeat-x; */
+ border: 1px solid #777;
+ cursor: pointer;
+}
- LEGEND {
- text-transform: uppercase;
- background-color: transparent;
- padding-left: 6px;
- padding-right: 6px;
- padding-bottom: 0px;
- font-size: 13px;
- color: #e1d54b;
- }
+SELECT {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #8b8d89;
+ color: #444;
+}
- UL LI#pagenosub {
- list-style-image: url( images/bullet.gif ) !important;
- }
+OPTION {
+ background-color: #8b8d89;
+}
- UL LI#foldheader {
- list-style-image: url( images/bullet.gif ) !important;
- }
+FONT {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #768591;
+}
- UL#foldinglist LI {
- list-style-image: url( images/bullet.gif ) !important;
- }
+FIELDSET {
+/*background-color: #999;*/
+ border: 1px solid #BABDB6;
+ padding: 6px;
+ background-color: transparent;
+}
- /*******************
- * Table Selectors *
- ********************/
- /* Table header */
- .portlet-table-header {
- font-weight: bold;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #e1d54b;
- }
+LEGEND {
+ text-transform: uppercase;
+ background-color: transparent;
+ padding-left: 6px;
+ padding-right: 6px;
+ padding-bottom: 0px;
+ font-size: 13px;
+ color: #e1d54b;
+}
- /* Normal text in a table cell */
- .portlet-table-body {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+UL LI#pagenosub {
+ list-style-image: url( images/bullet.gif ) !important;
+}
- /* Text in every other row in the table */
- .portlet-table-alternate {
- background-color: #efefef;
- background-image: url( images/portlet-section-alt-bg2.gif );
- background-position: bottom left;
- background-repeat: repeat-x;
- color: #666;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+UL LI#foldheader {
+ list-style-image: url( images/bullet.gif ) !important;
+}
- /* Text in a selected cell range */
- .portlet-table-selected {
- background-color: #999;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #fff;
- }
+UL#foldinglist LI {
+ list-style-image: url( images/bullet.gif ) !important;
+}
- /* Text of a subheading */
- .portlet-table-subheader {
- font-weight: bold;
- font-size: 11px;
- font-family: Arial, Helvetica, sans-serif;
- color: #e1d54b;
- }
+/*******************
+* Table Selectors *
+********************/
+/* Table header */
+.portlet-table-header {
+ font-weight: bold;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #e1d54b;
+}
- /* Table footer */
- .portlet-table-footer {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #e1d54b;
- }
+/* Normal text in a table cell */
+.portlet-table-body {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- /* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
- .portlet-table-text {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-style: italic;
- }
+/* Text in every other row in the table */
+.portlet-table-alternate {
+ background-color: #efefef;
+ background-image: url( images/portlet-section-alt-bg2.gif );
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ color: #666;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- /********
- * FONTS *
- *********/
+/* Text in a selected cell range */
+.portlet-table-selected {
+ background-color: #999;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #fff;
+}
- /* Font attributes for the normal fragment font.
+/* Text of a subheading */
+.portlet-table-subheader {
+ font-weight: bold;
+ font-size: 11px;
+ font-family: Arial, Helvetica, sans-serif;
+ color: #e1d54b;
+}
+
+/* Table footer */
+.portlet-table-footer {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #e1d54b;
+}
+
+/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
+.portlet-table-text {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-style: italic;
+}
+
+/********
+* FONTS *
+*********/
+
+/* Font attributes for the normal fragment font.
Used for the display of non-accentuated information */
- .portlet-font {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #444;
- }
+.portlet-font {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #444;
+}
- /* Font attributes similar to the portlet.font but the color is lighter */
- .portlet-font-dim {
- color: #999c8b;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+/* Font attributes similar to the portlet.font but the color is lighter */
+.portlet-font-dim {
+ color: #999c8b;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- /********
- * FORMS *
- *********/
+/********
+* FORMS *
+*********/
- /* Text used for the descriptive label of the whole form (not the label for fields)...why not call this portlet-form-title? */
- .portlet-form-label {
- color: #444;
- text-decoration: none;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
+/* Text used for the descriptive label of the whole form (not the label for fields)...why not call this portlet-form-title? */
+.portlet-form-label {
+ color: #444;
+ text-decoration: none;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
- /* Text on a form button */
- .portlet-form-button {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: #444;
- background-image: url( images/form-button-bg.gif );
- background-repeat: repeat-x;
- border: 1px solid #777;
- cursor: pointer;
- }
+/* Text on a form button */
+.portlet-form-button {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: normal;
+ color: #444;
+ background-image: url( images/form-button-bg.gif );
+ background-repeat: repeat-x;
+ border: 1px solid #777;
+ cursor: pointer;
+}
- /* Text that appears beside a context dependent action icon */
- .portlet-icon-label {
+/* Text that appears beside a context dependent action icon */
+.portlet-icon-label {
- }
+}
- /* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
+/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
not sure if we need this one?.. */
- .portlet-dlg-icon-label {
+.portlet-dlg-icon-label {
- }
+}
- /* Text for form field labels */
- .portlet-form-field-label {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+/* Text for form field labels */
+.portlet-form-field-label {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- /* Text for a form field */
- .portlet-form-field {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- background-color: #8b8d89;
- border: 1px solid #777;
- margin-top: 10px;
- }
+/* Text for a form field */
+.portlet-form-field {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ background-color: #8b8d89;
+ border: 1px solid #777;
+ margin-top: 10px;
+}
- /* Text of the user-input in an input field. not sure if we need this guy? */
- .portlet-form-input-field {
- color: #444;
- background-color: #8b8d89;
- border: 2px solid #777;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- padding: 0px 4px 0px 4px;
- }
+/* Text of the user-input in an input field. not sure if we need this guy? */
+.portlet-form-input-field {
+ color: #444;
+ background-color: #8b8d89;
+ border: 2px solid #777;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ padding: 0px 4px 0px 4px;
+}
- /********
- * LINKS *
- *********/
+/********
+* LINKS *
+*********/
- .portal-links:link {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #fff799;
- text-decoration: none;
- }
+.portal-links:link {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
+ color: #fff799;
+ text-decoration: none;
+}
- .portal-links:visited {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #fff699;
- text-decoration: none;
- }
+.portal-links:visited {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
+ color: #fff699;
+ text-decoration: none;
+}
- .portal-links:hover .portal-links:active {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: bold;
- color: #fcc24f;
- text-decoration: underline;
- }
+.portal-links:hover .portal-links:active {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
+ color: #fcc24f;
+ text-decoration: underline;
+}
- /***********
- * MESSAGES *
- ************/
+/***********
+* MESSAGES *
+************/
- /* Status of the current operation. */
- .portlet-msg-status {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-style: normal;
- color: #660000;
- }
+/* Status of the current operation. */
+.portlet-msg-status {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-style: normal;
+ color: #660000;
+}
- /* Help messages, general additional information, etc. */
- .portlet-msg-info {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- font-style: italic;
- color: #990000;
- }
+/* Help messages, general additional information, etc. */
+.portlet-msg-info {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-style: italic;
+ color: #990000;
+}
- /* Error messages. */
- .portlet-msg-error {
- color: #990000;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- font-style: oblique;
- }
+/* Error messages. */
+.portlet-msg-error {
+ color: #990000;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ font-style: oblique;
+}
- /* Warning messages. */
- .portlet-msg-alert {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- font-style: oblique;
- color: #cc0000;
- }
+/* Warning messages. */
+.portlet-msg-alert {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ font-style: oblique;
+ color: #cc0000;
+}
- /* Verification of the successful completion of a task. */
- .portlet-msg-success {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- font-style: oblique;
- color: #330000;
- }
+/* Verification of the successful completion of a task. */
+.portlet-msg-success {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ font-style: oblique;
+ color: #330000;
+}
- /***********
- * SECTIONS *
- ************/
+/***********
+* SECTIONS *
+************/
- /* Table or section header */
- .portlet-section-header {
- font-weight: bold;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #e1d54b;
- border-bottom: 1px dotted #8b8d89;
- padding: 12px 0px 0px 0px;
- margin: 12px 0px 4px 0px;
- }
+/* Table or section header */
+.portlet-section-header {
+ font-weight: bold;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #e1d54b;
+ border-bottom: 1px dotted #8b8d89;
+ padding: 12px 0px 0px 0px;
+ margin: 12px 0px 4px 0px;
+}
- /* Normal text in a table cell */
- .portlet-section-body {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+/* Normal text in a table cell */
+.portlet-section-body {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- /* Text in every other row in the cell */
- .portlet-section-alternate {
- background-color: #efefef;
- background-image: url( images/portlet-section-alt-bg2.gif );
- background-position: bottom left;
- background-repeat: repeat-x;
- border: 1px solid #555;
- color: #666;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- padding: 10px;
- }
+/* Text in every other row in the cell */
+.portlet-section-alternate {
+ background-color: #efefef;
+ background-image: url( images/portlet-section-alt-bg2.gif );
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ border: 1px solid #555;
+ color: #666;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ padding: 10px;
+}
- /* This fixes the nesting issue on main screen in alt rows... */
- .portlet-section-alternate {
- color: #666;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- }
+/* This fixes the nesting issue on main screen in alt rows... */
+.portlet-section-alternate {
+ color: #666;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
- .portlet-section-alternate a:link {
- color: #f90;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: bold;
- font-size: 11px;
- }
+.portlet-section-alternate a:link {
+ color: #f90;
+ font-family: Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 11px;
+}
- .portlet-section-alternate a:visited {
- color: #f90;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: bold;
- font-size: 11px;
- text-decoration: line-through;
- }
+.portlet-section-alternate a:visited {
+ color: #f90;
+ font-family: Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 11px;
+ text-decoration: line-through;
+}
- .portlet-section-alternate a:hover, .portlet-section-alternate a:active {
- color: #f60;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: bold;
- font-size: 11px;
- text-decoration: underline;
- }
+.portlet-section-alternate a:hover, .portlet-section-alternate a:active {
+ color: #f60;
+ font-family: Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 11px;
+ text-decoration: underline;
+}
- /* Text in a selected cell range */
- .portlet-section-selected {
- background-color: #999;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #fff;
- padding: 10px;
- border: 1px solid #555;
- }
+/* Text in a selected cell range */
+.portlet-section-selected {
+ background-color: #999;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #fff;
+ padding: 10px;
+ border: 1px solid #555;
+}
- /* Text of a subheading */
- .portlet-section-subheader {
- font-weight: bold;
- font-size: 11px;
- font-family: Arial, Helvetica, sans-serif;
- color: #e1d54b;
- }
+/* Text of a subheading */
+.portlet-section-subheader {
+ font-weight: bold;
+ font-size: 11px;
+ font-family: Arial, Helvetica, sans-serif;
+ color: #e1d54b;
+}
- /* Table or section footnote */
- .portlet-section-footer {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #e1d54b;
- }
+/* Table or section footnote */
+.portlet-section-footer {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #e1d54b;
+}
- /* Text that belongs to the table but does not fall in one of the other categories
+/* Text that belongs to the table but does not fall in one of the other categories
(e.g. explanatory or help text that is associated with the section. */
- .portlet-section-text {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-style: italic;
- }
+.portlet-section-text {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-style: italic;
+}
- /********
- * MENUS *
- *********/
+/********
+* MENUS *
+*********/
- /*General menu settings such as background color, margins, etc. */
- .portlet-menu {
+/*General menu settings such as background color, margins, etc. */
+.portlet-menu {
- }
+}
- /* Normal, unselected menu item. */
- .portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- }
+/* Normal, unselected menu item. */
+.portlet-menu-item {
+ color: #242424;
+ text-decoration: none;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
- .portlet-menu-item:hover {
- color: #fff;
- text-decoration: none;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- }
+.portlet-menu-item:hover {
+ color: #fff;
+ text-decoration: none;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
- /* Selected menu item. */
- .portlet-menu-item-selected {
+/* Selected menu item. */
+.portlet-menu-item-selected {
- }
+}
- /* Selected menu item when the mouse hovers over it. */
- .portlet-menu-item-selected:hover {
+/* Selected menu item when the mouse hovers over it. */
+.portlet-menu-item-selected:hover {
- }
+}
- /* Normal, unselected menu item that has sub-menus. */
- .portlet-menu-cascade-item {
+/* Normal, unselected menu item that has sub-menus. */
+.portlet-menu-cascade-item {
- }
+}
- /* Selected sub-menu item that has sub-menus */
- .portlet-menu-cascade-item-selected {
+/* Selected sub-menu item that has sub-menus */
+.portlet-menu-cascade-item-selected {
- }
+}
- /* Descriptive text for the menu (e.g. in a help context below the menu) */
- .portlet-menu-description {
+/* Descriptive text for the menu (e.g. in a help context below the menu) */
+.portlet-menu-description {
- }
+}
- /* Menu caption */
- .portlet-menu-caption {
+/* Menu caption */
+.portlet-menu-caption {
- }
+}
- /* A separator bar similar to a horizontal rule, but with styling matching the page */
- .portlet-horizontal-separator {
- height: 1px;
- color: #e1d54b;
- }
+/* A separator bar similar to a horizontal rule, but with styling matching the page */
+.portlet-horizontal-separator {
+ height: 1px;
+ color: #e1d54b;
+}
- /* Allows portlets to mimic the title bar when nesting something */
- .portlet-nestedTitle-bar {
- }
+/* Allows portlets to mimic the title bar when nesting something */
+.portlet-nestedTitle-bar {
+}
- /* Allows portlets to match the textual character of the title on the title bar. */
- .portlet-nestedTitle {
- }
+/* Allows portlets to match the textual character of the title on the title bar. */
+.portlet-nestedTitle {
+}
- /* Support portlets having tabs in the same style as the page or other portlets */
- .portlet-tab {
- }
+/* Support portlets having tabs in the same style as the page or other portlets */
+.portlet-tab {
+}
- /* Highlight the tab currently being shown */
- .portlet-tab-active {
- }
+/* Highlight the tab currently being shown */
+.portlet-tab-active {
+}
- /* Highlight the selected tab (not yet active) */
- .portlet-tab-selected {
- }
+/* Highlight the selected tab (not yet active) */
+.portlet-tab-selected {
+}
- /* A tab which can not be currently activated */
- .portlet-tab-disabled {
- }
+/* A tab which can not be currently activated */
+.portlet-tab-disabled {
+}
- /* Top level style for the content of a tab. */
- .portlet-tab-area {
- }
+/* Top level style for the content of a tab. */
+.portlet-tab-area {
+}
+
+/*****************
+* AJAX Selectors *
+*****************/
+
+.handle {
+ cursor: move;
+}
+
+.emptyPlaceMarker {
+ border-right: red 1px dashed;
+ border-top: red 1px dashed;
+ border-left: red 1px dashed;
+ border-bottom: red 1px dashed;
+ background-color: Transparent;
+}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css 2006-12-22 22:52:04 UTC (rev 8571)
@@ -11,11 +11,11 @@
font-size: 12px;
}
- /*****************
- * Portal Header *
- ******************/
+/*****************
+* Portal Header *
+******************/
- /* spacer to keep header at certain width regardless of display size
+/* spacer to keep header at certain width regardless of display size
done to avoid overlapping of tab navigation in header */
#spacer {
/*width: 1024px;*/
@@ -40,6 +40,7 @@
border-top-style: solid;
border-top-width: 2px;
border-top-color: #CFD2CF;
+ margin: 0px -3px 0px 3px;
z-index: 5;
}
@@ -61,20 +62,20 @@
height: 126px;
z-index: 2;
position: absolute;
- left: 2px;
+ left: 0px;
top: 0px;
border-top-style: solid;
border-top-width: 2px;
border-top-color: #CFD2CF;
}
- /************************
- * Portal Layout Regions *
- *************************/
+/************************
+* Portal Layout Regions *
+*************************/
/* wrapper for entire portal. starts/ends after/before body tag */
#portal-container {
- margin: 4px 2% 0 2%;
+ margin: 4px 2% 0px 2%;
background-color: #FEFFFC;
background-image: url( images/page_border_bottom.gif );
background-position: bottom;
@@ -87,6 +88,7 @@
margin: 0 -350px 0 -350px;
position: relative;
min-width: 804px;
+ padding: 0 0 0 0;
}
/* min width hack for IE */
@@ -106,7 +108,8 @@
/* table that contains all regions. does not include header */
#content-container {
height: 100%;
- text-align: left;
+ text-align: left; /* min-width: 800px;*/
+ width: 100%;
min-width: 800px;
border-right-style: solid;
border-right-width: 2px;
@@ -180,6 +183,7 @@
margin: 0px;
padding: 0px;
min-width: 250px;
+ height: 300px;
}
#regionB {
@@ -191,6 +195,7 @@
padding: 0px; /* test to add 3rd region in layout...*/
width: 67%;
float: left;
+ height: 300px;
}
#regionC {
@@ -200,6 +205,7 @@
width: 28%;
float: left; /*hide 3rd region*/
display: none;
+ height: 300px;
}
#footer-container {
@@ -211,9 +217,9 @@
#navigation-container {
}
- /* used to clear float in regionA,B,C divs so that
+/* used to clear float in regionA,B,C divs so that
footer spans bottom of page */
- /* used to clear float in regionA,B,C divs so that
+/* used to clear float in regionA,B,C divs so that
footer spans bottom of page */
hr.cleaner {
clear: both;
@@ -224,9 +230,9 @@
visibility: hidden;
}
- /****************************
- * Tab Navigation for Header *
- *****************************/
+/****************************
+* Tab Navigation for Header *
+*****************************/
UL#tabsHeader {
margin: 0;
@@ -235,6 +241,7 @@
}
UL#tabsHeader li {
+ display: inline;
list-style: none;
float: left;
margin-left: 0px;
@@ -271,12 +278,12 @@
}
UL#tabsHeader a {
- display: block;
+ display: inline;
float: left;
text-decoration: none;
font: 13px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
color: #425261;
- line-height: 20px;
+ line-height: 26px;
padding: 5px 15px 1px 15px;
background-image: url( images/tab_left_unselected.gif );
background-repeat: no-repeat;
@@ -291,30 +298,31 @@
background-image: url( images/tab_left_hover2.gif );
background-repeat: no-repeat;
background-position: top left;
- line-height: 20px;
white-space: nowrap;
+ line-height: 26px;
}
UL#tabsHeader #current {
background-color: #fff;
background-image: url( images/tab_right.gif );
background-repeat: no-repeat;
- background-position: right top;
- margin-bottom: -3px;
- padding-top: 3px;
- border-bottom: 1px solid #fff;
+ background-position: right bottom;
+ /* margin-bottom: -3px;
+padding-top: 3px;
+border-bottom: 1px solid #fff;*/
+ line-height: 26px;
}
UL#tabsHeader #current a, #current a:hover {
font: 13px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: 500;
- color: #000;
- line-height: 20px;
+ color: #000; /* line-height: 20px;*/
background-image: url( images/tab_left.gif );
background-repeat: no-repeat;
background-position: top left;
- margin-top: -3px;
- padding-bottom: 3px;
+ /* margin-top: -3px;
+ padding-bottom: 3px;*/
+ line-height: 26px;
}
UL#tabsHeader #current a:hover {
@@ -338,10 +346,35 @@
/* fixes IE6 win hack */
- /****************************
- * Portlet Container Windows *
- *****************************/
+/***************************
+* Utility Navigation *
+*****************************/
+#dashboardnav {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #FFFFFF;
+ z-index: 20;
+}
+
+#dashboardnav a {
+ color: #FFFFFF;
+}
+
+#dashboardnav .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
+
+/****************************
+* Portlet Container Windows *
+*****************************/
+
.portlet-container {
/* margin: 10px;*/
padding: 10px;
@@ -446,9 +479,9 @@
min-width: 12px;
}
- /***********************
- * Portlet Window Modes *
- ************************/
+/***********************
+* Portlet Window Modes *
+************************/
.portlet-mode-maximized {
background-image: url( images/maximize.gif );
width: 15px;
@@ -529,9 +562,9 @@
cursor: pointer;
}
- /**********************
- * Copyright Selectors *
- ***********************/
+/**********************
+* Copyright Selectors *
+***********************/
.portal-copyright {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
@@ -552,9 +585,9 @@
content: "Theme by Novell";
}
- /*************
- * Elements *
- **************/
+/*************
+* Elements *
+**************/
a {
color: #4566D4;
text-decoration: none;
@@ -595,11 +628,11 @@
font-size: 13px;
}
- /********
- * FONTS *
- *********/
+/********
+* FONTS *
+*********/
- /* Font attributes for the normal fragment font.
+/* Font attributes for the normal fragment font.
Used for the display of non-accentuated information */
.portlet-font {
color: #000000;
@@ -614,9 +647,9 @@
font-size: 12px;
}
- /********
- * FORMS *
- *********/
+/********
+* FORMS *
+*********/
.portlet-form-label {
color: #336699;
text-decoration: none;
@@ -645,7 +678,7 @@
}
- /* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
+/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
not sure if we need this one?.. */
.portlet-dlg-icon-label {
@@ -666,9 +699,9 @@
color: #000; /*margin-top: 10px;*/
}
- /********
- * LINKS *
- *********/
+/********
+* LINKS *
+*********/
.portal-links:link {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
@@ -702,9 +735,9 @@
text-decoration: none;
}
- /***********
- * MESSAGES *
- ************/
+/***********
+* MESSAGES *
+************/
/* Status of the current operation. */
.portlet-msg-status {
@@ -746,9 +779,9 @@
color: #359630;
}
- /***********
- * SECTIONS *
- ************/
+/***********
+* SECTIONS *
+************/
/* Table or section header */
.portlet-section-header {
@@ -781,16 +814,16 @@
font-size: 11px;
}
- /* Text that belongs to the table but does not fall in one of the other categories
+/* Text that belongs to the table but does not fall in one of the other categories
(e.g. explanatory or help text that is associated with the section. */
.portlet-section-text {
font-size: 12px;
font-style: italic;
}
- /*******************
- * Table Selectors *
- ********************/
+/*******************
+* Table Selectors *
+********************/
/* Table header */
.portlet-table-header {
font-weight: bold;
@@ -838,9 +871,9 @@
font-style: italic;
}
- /********
- * MENUS *
- *********/
+/********
+* MENUS *
+*********/
/*General menu settings such as background color, margins, etc. */
.portlet-menu {
@@ -928,3 +961,18 @@
.portlet-tab-area {
}
+/*****************
+* AJAX Selectors *
+*****************/
+
+.handle {
+ cursor: move;
+}
+
+.emptyPlaceMarker {
+ border-right: red 1px dashed;
+ border-top: red 1px dashed;
+ border-left: red 1px dashed;
+ border-bottom: red 1px dashed;
+ background-color: Transparent;
+}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource.properties 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,2 +1,25 @@
+################################################################################
+# 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. #
+################################################################################
+
javax.portlet.preference.description.RssXml=RSS feed URL
javax.portlet.preference.description.expires=Expiration time
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/classes/NewsResource_fr.properties 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,2 +1,25 @@
+################################################################################
+# 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. #
+################################################################################
+
javax.portlet.preference.description.RssXml=URL du flux RSS
javax.portlet.preference.description.expires=Temps d'expiration
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/default-object.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<deployments>
<deployment>
<parent-ref>default</parent-ref>
@@ -6,31 +29,13 @@
<page>
<page-name>Test</page-name>
<listener>test_listener</listener>
+ <properties>
+ <property>
+ <name>theme.ajax.object_disabled</name>
+ <value>true</value>
+ </property>
+ </properties>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>TestPortletWindow</window-name>
<instance-ref>TestPortletInstance</instance-ref>
<region>center</region>
@@ -45,30 +50,6 @@
<page>
<page-name>event test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -90,30 +71,6 @@
<page>
<page-name>secure test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -129,30 +86,6 @@
<page>
<page-name>exception test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -168,30 +101,6 @@
<page>
<page-name>cache test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -213,30 +122,6 @@
<page>
<page-name>session test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -252,30 +137,6 @@
<page>
<page-name>missing portlet</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -291,30 +152,6 @@
<page>
<page-name>URL portlet</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -330,30 +167,6 @@
<page>
<page-name>missing instance</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -369,30 +182,6 @@
<page>
<page-name>charset test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -408,30 +197,6 @@
<page>
<page-name>encoding test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
@@ -447,30 +212,6 @@
<page>
<page-name>header test</page-name>
<window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-app.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-app.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-app.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<jboss-app>
<app-name>samples</app-name>
</jboss-app>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jboss-portlet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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>
<remotable>true</remotable>
<portlet>
@@ -11,7 +34,7 @@
<remotable>false</remotable>
<header-content>
<link rel="stylesheet" type="text/css" href="/portlet-styles/HeaderContent.css" title="" media="screen"/>
- <script type="text/javascript" src="/portlet-styles/HeaderContent.js" title=""/>
+ <script type="text/javascript" src="/portlet-styles/HeaderContent.js"/>
<meta name="description" content="test"/>
</header-content>
</portlet>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/info/view.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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" %>
@@ -6,23 +29,27 @@
<table border="0" cellspacing="2" cellpadding="2">
<tr>
<td align="center"><a href="http://portal.demo.jboss.com"><img
- src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
- alt="Try the latest release of JBoss Portal, live and online."></a>
+ 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>
+ 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>
+ 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></td>
+ </tr>
+ <tr>
<td class="portlet-section-alternate">
<font class="portlet-font">This is a basic installation of JBoss Portal's most recent release. You may log in
at any time, using the User Portlet below 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>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <b>user/user</b> or <b>admin/admin</b>
+ </td>
+ </tr>
</table>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/news/edit.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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" %>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
<!-- this is static markup to test themes for wsrp css selector support -->
<div id="wsrp_section_selectors">
<table border="0" width="100%" cellpadding="2">
@@ -52,11 +75,13 @@
<td class="portlet-table-footer">portlet-table-footer</td>
</tr>
</table>
-</div><br>
+</div>
+<br>
<div id="wsrp_form_selectors">
<form action="">
- <fieldset><legend>A Sample Form:</legend>
+ <fieldset>
+ <legend>A Sample Form:</legend>
<table border="0" width="100%" cellpadding="2">
<tr>
<td class="portlet-form-label" colspan="2">portlet-form-label</td>
@@ -73,8 +98,12 @@
for="select-control">
portlet-form-field-label:</label></td>
<td>
- <select id="select-control" class="portlet-form-field"><option>portlet-form-field</option><option>
- Option 2</option></select>
+ <select id="select-control" class="portlet-form-field">
+ <option>portlet-form-field</option>
+ <option>
+ Option 2
+ </option>
+ </select>
</td>
</tr>
<tr>
@@ -86,7 +115,8 @@
</table>
</fieldset>
</form>
-</div><br>
+</div>
+<br>
<div id="wsrp_message_selectors">
<table border="0" width="100%" cellpadding="2">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/jsp/weather/edit.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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" %>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet-instances.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<deployments>
<deployment>
<instance>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/portlet.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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"
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,9 +1,32 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
- <listener>
- <listener-class> org.jboss.portal.portlet.session.SessionListener </listener-class>
- </listener>
-</web-app>
+<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <listener>
+ <listener-class> org.jboss.portal.portlet.session.SessionListener </listener-class>
+ </listener>
+</web-app>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss1.xsl 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,8 +1,31 @@
<?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">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:output method="html"/>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/news/Rss2.xsl 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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="link-path">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/xsl/weather/Rss.xsl 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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>
@@ -12,7 +35,7 @@
<b>
<xsl:for-each select="rss/channel/location">
<xsl:value-of select="@city"/>, <xsl:value-of select="@region"/>, <xsl:value-of
- select="@country"/>
+ select="@country"/>
</xsl:for-each>
</b>
</font>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<jboss-web>
<security-domain>java:jaas/portal</security-domain>
<context-root>/portal</context-root>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/server-layouts.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/server-layouts.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/server-layouts.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,2 +1,25 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<layouts/>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
@@ -19,7 +42,7 @@
</init-param>
<init-param>
<param-name>controllerName</param-name>
- <param-value>portal:controller=Request</param-value>
+ <param-value>portal:controller=Core</param-value>
<description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
@@ -40,7 +63,7 @@
</init-param>
<init-param>
<param-name>controllerName</param-name>
- <param-value>portal:controller=Request</param-value>
+ <param-value>portal:controller=Core</param-value>
<description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
@@ -74,7 +97,7 @@
<url-pattern>/authsec/*</url-pattern>
</servlet-mapping>
- <!-- Force the mapping of the index.jsp -->
+ <!-- Force the mapping of the index.jsp because of the default servlet replacement -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>/login.jsp</url-pattern>
@@ -162,4 +185,33 @@
<security-role>
<role-name>Authenticated</role-name>
</security-role>
+
+ <!-- AJAX -->
+
+ <!-- The portal servlet for ajax requests -->
+ <servlet>
+ <servlet-name>PortalServletForAjax</servlet-name>
+ <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+ <init-param>
+ <param-name>asDefaultServlet</param-name>
+ <param-value>false</param-value>
+ <description>The servlet needs to know wether it is set as a default servlet or not</description>
+ </init-param>
+ <init-param>
+ <param-name>controllerName</param-name>
+ <param-value>portal:controller=Ajax</param-value>
+ <description>The request controller for the portal servlet</description>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>Authenticated</role-name>
+ <role-link>Authenticated</role-link>
+ </security-role-ref>
+ </servlet>
+
+ <!-- Provide secure access to authenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServletForAjax</servlet-name>
+ <url-pattern>/ajax/*</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/error.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/error.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/error.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -13,7 +36,9 @@
<div id="logoName"></div>
<table border="0" cellpadding="0" cellspacing="0" id="header-container">
<tr>
- <td align="center" valign="top" id="header"><div id="spacer"></div></td>
+ <td align="center" valign="top" id="header">
+ <div id="spacer"></div>
+ </td>
</tr>
</table>
<div id="content-container">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/login.jsp 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -16,9 +39,9 @@
}
table.form {
- background-color: #CCFF99;
+ background-color: #DFE8ED;
border-style: dashed;
- border-color: #000000;
+ border-color: #98B7C6;
border-width: 1px;
}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,37 +1,62 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<server>
<!-- Producer interceptor stack -->
<mbean
- code="org.jboss.portal.wsrp.aspects.portlet.SessionInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Session"
+ code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=WSRP"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- </mbean>
- <mbean
- code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
- name="portal:service=InterceptorStack,type=WSRP"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=Session</depends-list-element>
</depends-list>
</mbean>
- <!-- The state portlet invoker -->
+ <!-- The producer portlet invoker -->
<mbean
- code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
- name="portal:service=WSRPPortletInvoker,type=Stateful"
+ code="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker"
+ name="portal:service=PortletInvoker,type=WSRPProducer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="StateStore" proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
- <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Container</depends>
+ <depends
+ optional-attribute-name="PortletInvoker"
+ proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Container</depends>
+ <depends
+ optional-attribute-name="PersistenceManager"
+ proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+ <depends
+ optional-attribute-name="StateManagementPolicy"
+ proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+ <depends
+ optional-attribute-name="StateConverter"
+ proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
</mbean>
<!-- The portlet container invoker -->
@@ -39,9 +64,9 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=WSRPPortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=WSRP</depends>
+ <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=WSRP</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
</mbean>
@@ -50,9 +75,10 @@
code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
name="portal.wsrp:service=WSRPProducer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Stateful</depends>
+ <depends optional-attribute-name="Invoker"
+ proxy-type="attribute">portal:service=PortletInvoker,type=WSRPProducer</depends>
</mbean>
<!-- Configure a consumer that is the portal itself -->
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,3 +1,31 @@
+<?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//DTD WSRP Remote Producer Configuration 1.0//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portal-wsrp.dtd">-->
+
<deployments>
<deployment>
<wsrp-producer>
@@ -12,12 +40,22 @@
</wsrp-producer>
</deployment>
<!--<deployment>
+ <wsrp-producer>
+ <producer-id>NetUnity</producer-id>
+ <expiration-cache>120</expiration-cache>
+ <endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSRPTestService.asmx?Operation=WSDL</endpoint-wsdl-url>
+ <registration-data>
+ <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
+ </registration-data>
+ </wsrp-producer>
+ </deployment>-->
+ <!--<deployment>
<wsrp-producer>
<producer-id>vignette</producer-id>
<expiration-cache>120</expiration-cache>
<endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url>
<registration-data>
- <consumer-name>JBoss Portal 2.4 Test</consumer-name>
+ <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
<property>
<name>com.vignette.wsrp.registration.username</name>
<lang>en</lang>
@@ -37,7 +75,7 @@
<expiration-cache>120</expiration-cache>
<endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
- <consumer-name>JBoss Portal 2.4 Test</consumer-name>
+ <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
<property>
<name>registration/consumerRole</name>
<lang>en</lang>
@@ -46,4 +84,14 @@
</registration-data>
</wsrp-producer>
</deployment>-->
+ <!--<deployment>
+ <wsrp-producer>
+ <producer-id>oracle</producer-id>
+ <expiration-cache>120</expiration-cache>
+ <endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url>
+ <registration-data>
+ <consumer-name>Change this to something that uniquely identifies your consumer</consumer-name>
+ </registration-data>
+ </wsrp-producer>
+ </deployment>-->
</deployments>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml 2006-12-22 22:52:04 UTC (rev 8571)
@@ -1,4 +1,27 @@
<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<datasources>
<local-tx-datasource>
<jndi-name>PortalDS</jndi-name>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primate.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primate.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -28,7 +28,7 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.AbstractDescriptor;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primates.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primates.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/Primates.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Random;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -24,7 +24,7 @@
import org.apache.xerces.parsers.DOMParser;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
import org.w3c.dom.Document;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -30,7 +30,7 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -25,7 +25,7 @@
import org.jboss.forge.common.ForgeHelper;
import java.io.File;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.tools.Tools;
@@ -73,8 +73,7 @@
/**
* Method returns path to default JSP file.
- *
- * @param portalName
+ *
* @return
*/
public static String getJspCmPath() {
@@ -84,7 +83,6 @@
/**
* Method returns path to the mugshot JSP file.
*
- * @param portalName
* @return
*/
public static String getMugshotJspCmPath() {
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java 2006-12-22 22:53:55 UTC (rev 8570)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java 2006-12-22 22:52:04 UTC (rev 8571)
@@ -33,7 +33,7 @@
import org.jboss.forge.common.soa.primates.PrimateDTO;
import org.jboss.forge.common.soa.primates.PrimatesService;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.context.DelegateContext;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.modules.ModuleException;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.UserModule;
More information about the jboss-svn-commits
mailing list