January 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6124 - in trunk/build: ide/intellij/idea60/modules/core and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-30 08:36:59 -0500 (Tue, 30 Jan 2007) New Revision: 6124 Modified: trunk/build/build.xml trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml trunk/build/ide/intellij/idea60/modules/core/core.iml trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml Log: forgot to rename federation to portlet-federation for javadoc generation Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-30 13:30:11 UTC (rev 6123) +++ trunk/build/build.xml 2007-01-30 13:36:59 UTC (rev 6124) @@ -326,7 +326,7 @@ <packageset dir="../faces/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> - <packageset dir="../federation/src/main"> + <packageset dir="../portlet-federation/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> <packageset dir="../format/src/main"> Modified: trunk/build/ide/intellij/idea60/modules/core/core.iml =================================================================== --- trunk/build/ide/intellij/idea60/modules/core/core.iml 2007-01-30 13:30:11 UTC (rev 6123) +++ trunk/build/ide/intellij/idea60/modules/core/core.iml 2007-01-30 13:36:59 UTC (rev 6124) @@ -228,7 +228,6 @@ </library> </orderEntry> <orderEntry type="module" module-name="jems" /> - <orderEntry type="module" module-name="federation" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -268,6 +267,7 @@ </orderEntry> <orderEntry type="module" module-name="registration" /> <orderEntry type="module" module-name="workflow" /> + <orderEntry type="module" module-name="portlet-federation" /> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml =================================================================== --- trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-01-30 13:30:11 UTC (rev 6123) +++ trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-01-30 13:36:59 UTC (rev 6124) @@ -30,7 +30,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="federation" /> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml =================================================================== --- trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-01-30 13:30:11 UTC (rev 6123) +++ trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-01-30 13:36:59 UTC (rev 6124) @@ -135,7 +135,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="federation" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -156,6 +155,7 @@ </orderEntry> <orderEntry type="module" module-name="jems" /> <orderEntry type="module" module-name="registration" /> + <orderEntry type="module" module-name="portlet-federation" /> <orderEntryProperties /> <javadoc-paths> <root url="http://java.sun.com/j2ee/1.4/docs/api/" />

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6123 - trunk/build/ide/intellij/idea60/modules/portlet-federation.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-30 08:30:11 -0500 (Tue, 30 Jan 2007) New Revision: 6123 Added: trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml Removed: trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml Log: renamed federation.iml to portlet-federation.iml Deleted: trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml =================================================================== --- trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml 2007-01-30 13:29:09 UTC (rev 6122) +++ trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml 2007-01-30 13:30:11 UTC (rev 6123) @@ -1,241 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/../../../../../../portlet-federation/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$/../../../../../../portlet-federation"> - <sourceFolder url="file://$MODULE_DIR$/../../../../../../portlet-federation/src/main" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/../../../../../../portlet-federation/output" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module" module-name="common" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module" module-name="jems" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> - </component> - <component name="VcsManagerConfiguration"> - <option name="ACTIVE_VCS_NAME" value="svn" /> - <option name="USE_PROJECT_VCS" value="false" /> - </component> - <component name="copyright"> - <Base> - <setting name="state" value="1" /> - </Base> - <LanguageOptions name="$TEMPLATE$"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="true" /> - <option name="separateAfter" value="true" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="true" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="JBoss, a division of Red Hat
Copyright &#36;today.year, 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 Fr! anklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="4" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="CSS"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="HTML"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JAVA"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JSP"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JavaScript"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="Properties"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="XML"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - </component> -</module> - Copied: trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml (from rev 6122, trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml) =================================================================== --- trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml (rev 0) +++ trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-01-30 13:30:11 UTC (rev 6123) @@ -0,0 +1,241 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../portlet-federation/classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../../../../portlet-federation"> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../portlet-federation/src/main" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../portlet-federation/output" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="portlet" /> + <orderEntry type="module" module-name="common" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="jems" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> + <component name="VcsManagerConfiguration"> + <option name="ACTIVE_VCS_NAME" value="svn" /> + <option name="USE_PROJECT_VCS" value="false" /> + </component> + <component name="copyright"> + <Base> + <setting name="state" value="1" /> + </Base> + <LanguageOptions name="$TEMPLATE$"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="true" /> + <option name="separateAfter" value="true" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="true" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="JBoss, a division of Red Hat
Copyright &#36;today.year, 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 Fr! anklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="4" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="CSS"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="HTML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JAVA"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JSP"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="JavaScript"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="Properties"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + <LanguageOptions name="XML"> + <option name="templateOptions"> + <value> + <option name="block" value="true" /> + <option name="separateBefore" value="false" /> + <option name="separateAfter" value="false" /> + <option name="prefixLines" value="true" /> + <option name="lenBefore" value="80" /> + <option name="lenAfter" value="80" /> + <option name="box" value="false" /> + <option name="filler" value=" " /> + </value> + </option> + <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." /> + <option name="keyword" value="Copyright" /> + <option name="fileTypeOverride" value="2" /> + <option name="relativeBefore" value="true" /> + <option name="addBlankAfter" value="true" /> + <option name="fileLocation" value="1" /> + <option name="useAlternate" value="false" /> + </LanguageOptions> + </component> +</module> +

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6122 - in trunk/build/ide/intellij/idea60/modules: portlet-federation and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-30 08:29:09 -0500 (Tue, 30 Jan 2007) New Revision: 6122 Added: trunk/build/ide/intellij/idea60/modules/portlet-federation/ Removed: trunk/build/ide/intellij/idea60/modules/federation/ Modified: trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml Log: moved intellij idea module federation to portlet-federation Copied: trunk/build/ide/intellij/idea60/modules/portlet-federation (from rev 6118, trunk/build/ide/intellij/idea60/modules/federation) Modified: trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml =================================================================== --- trunk/build/ide/intellij/idea60/modules/federation/federation.iml 2007-01-30 02:06:15 UTC (rev 6118) +++ trunk/build/ide/intellij/idea60/modules/portlet-federation/federation.iml 2007-01-30 13:29:09 UTC (rev 6122) @@ -2,11 +2,11 @@ <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/../../../../../../federation/classes" /> + <output url="file://$MODULE_DIR$/../../../../../../portlet-federation/classes" /> <exclude-output /> - <content url="file://$MODULE_DIR$/../../../../../../federation"> - <sourceFolder url="file://$MODULE_DIR$/../../../../../../federation/src/main" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/../../../../../../federation/output" /> + <content url="file://$MODULE_DIR$/../../../../../../portlet-federation"> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../portlet-federation/src/main" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/../../../../../../portlet-federation/output" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" />

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6121 - trunk.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-30 08:22:11 -0500 (Tue, 30 Jan 2007) New Revision: 6121 Added: trunk/portlet-federation/ Removed: trunk/federation/ Log: moved federation to portlet-federation (previous operation was a copy) Copied: trunk/portlet-federation (from rev 6118, trunk/federation)

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6120 - trunk.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-30 08:20:39 -0500 (Tue, 30 Jan 2007) New Revision: 6120 Removed: trunk/portlet-federation/ Log: deleted portlet-federation temporarily

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6119 - in trunk: build and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-30 08:18:30 -0500 (Tue, 30 Jan 2007) New Revision: 6119 Added: trunk/portlet-federation/ Modified: trunk/build/build.xml trunk/tools/etc/buildfragments/modules.ent Log: renamed the federation module to portlet-federation Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-30 02:06:15 UTC (rev 6118) +++ trunk/build/build.xml 2007-01-30 13:18:30 UTC (rev 6119) @@ -120,7 +120,7 @@ <module name="server"/> <module name="identity"/> <module name="portlet"/> - <module name="federation"/> + <module name="portlet-federation"/> <module name="theme"/> <module name="bridge"/> <module name="cms"/> @@ -138,7 +138,7 @@ <group name="portal"> <include - modules="common, test, api, faces, jems, server, security, identity, format, portlet, federation, theme, workflow, cms, bridge, samples, registration, wsrp, core, core-cms, core-management, core-samples"/> + modules="common, test, api, faces, jems, server, security, identity, format, portlet, portlet-federation, theme, workflow, cms, bridge, samples, registration, wsrp, core, core-cms, core-management, core-samples"/> </group> <group name="cms"> Copied: trunk/portlet-federation (from rev 6118, trunk/federation) Modified: trunk/tools/etc/buildfragments/modules.ent =================================================================== --- trunk/tools/etc/buildfragments/modules.ent 2007-01-30 02:06:15 UTC (rev 6118) +++ trunk/tools/etc/buildfragments/modules.ent 2007-01-30 13:18:30 UTC (rev 6119) @@ -64,7 +64,7 @@ </path>  - <property name="jboss.portal-portlet-federation.root" value="${project.root}/federation/output"/> + <property name="jboss.portal-portlet-federation.root" value="${project.root}/portlet-federation/output"/> <property name="jboss.portal-portlet-federation.lib" value="${jboss.portal-portlet-federation.root}/lib"/> <path id="jboss.portal-portlet-federation.classpath"> <pathelement path="${jboss.portal-portlet-federation.lib}/portal-portlet-federation-lib.jar"/>

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6118 - in trunk/federation/src/main/org/jboss/portal/portlet: federation and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-29 21:06:15 -0500 (Mon, 29 Jan 2007) New Revision: 6118 Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/ trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/ trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java trunk/federation/src/main/org/jboss/portal/portlet/federation/spi/ trunk/federation/src/main/org/jboss/portal/portlet/federation/spi/PortletInvokerRegistration.java Log: fix svn fuckup Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,50 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation; + +import org.jboss.portal.portlet.PortletInvoker; + +/** + * Provide access to a federated invoker. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + * @since 2.4 + */ +public interface FederatedPortletInvoker extends PortletInvoker +{ + /** + * Return the invoker id. + * + * @return the invoker id + */ + String getId(); + + /** + * Return the underlying portlet invoker. + * + * @return the underlying portlet invoker + * @since 2.6 + */ + PortletInvoker getPortletInvoker(); +} Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,70 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation; + +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.portlet.PortletInvoker; + +import java.util.Collection; + +/** + * A portlet invoker that federates other invokers. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5687 $ + * @since 2.4 + */ +public interface FederatingPortletInvoker extends PortletInvoker +{ + /** + * Register an invoker. + * + * @param registration the invoker to register + * @throws IllegalArgumentException if the invoker is null or already registered + */ + FederatedPortletInvoker registerInvoker(PortletInvokerRegistration registration) throws IllegalArgumentException; + + /** + * Unregister an invoker. + * + * @param registration the invoker to register + * @throws IllegalArgumentException if the invoker is null or already registered + */ + void unregisterInvoker(PortletInvokerRegistration registration) throws IllegalArgumentException; + + /** + * Return a portlet invoker registered or null if not found + * + * @param id the id + * @return the invoker + * @throws IllegalArgumentException if the id is null + */ + FederatedPortletInvoker getFederatedInvoker(String id) throws IllegalArgumentException; + + /** + * Return the registered portlet invokers. + * + * @return a collection that contains the portlet invokers + */ + Collection getFederatedInvokers(); +} Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,70 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation.impl; + +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.info.PortletInfo; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class FederatedPortlet implements Portlet +{ + + /** . */ + final PortletContext compoundContext; + + /** . */ + final Portlet portlet; + + public FederatedPortlet(PortletContext compoundContext, Portlet portlet) + { + if (compoundContext == null) + { + throw new IllegalArgumentException("No null id accepted"); + } + if (portlet == null) + { + throw new IllegalArgumentException("No null portlet accepted"); + } + this.compoundContext = compoundContext; + this.portlet = portlet; + } + + public PortletContext getContext() + { + return compoundContext; + } + + public PortletInfo getInfo() + { + return portlet.getInfo(); + } + + public boolean isRemote() + { + return portlet.isRemote(); + } +} Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,235 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation.impl; + +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.StateEvent; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.InstanceContext; +import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5943 $ + * @since 2.4 + */ +public class FederatedPortletInvokerService implements FederatedPortletInvoker +{ + + /** . */ + private String id; + + /** . */ + private PortletInvoker portletInvoker; + + /** . */ + private FederatingPortletInvoker federatingPortletInvoker; + + public FederatedPortletInvokerService(FederatingPortletInvoker federatingPortletInvoker, PortletInvokerRegistration registration) + { + this.id = registration.getId(); + this.portletInvoker = registration.getPortletInvoker(); + this.federatingPortletInvoker = federatingPortletInvoker; + } + + public PortletInvoker getPortletInvoker() + { + return portletInvoker; + } + + public String getId() + { + return id; + } + + public FederatingPortletInvoker getFederatingPortletInvoker() + { + return federatingPortletInvoker; + } + + public Set getPortlets() throws PortletInvokerException + { + Set federatedPortlets = new LinkedHashSet(); + for (Iterator i = portletInvoker.getPortlets().iterator(); i.hasNext();) + { + Portlet portlet = (Portlet)i.next(); + Portlet federatedPortlet = new FederatedPortlet(reference(portlet.getContext()), portlet); + federatedPortlets.add(federatedPortlet); + } + return federatedPortlets; + } + + public Portlet getPortlet(PortletContext compoundPortletContext) throws IllegalArgumentException, PortletInvokerException + { + // Get portlet context + PortletContext portletContext = dereference(compoundPortletContext); + + // Retrieve wrapped portlet + Portlet portlet = portletInvoker.getPortlet(portletContext); + + // Return correct result + return new FederatedPortlet(compoundPortletContext, portlet); + } + + private class FederatedInstanceContext implements InstanceContext + { + + /** . */ + private InstanceContext ctx; + + public FederatedInstanceContext(InstanceContext ctx) + { + this.ctx = ctx; + } + + public String getId() + { + return ctx.getId(); + } + + public AccessMode getAccessMode() + { + return ctx.getAccessMode(); + } + + public void onStateEvent(StateEvent event) + { + ctx.onStateEvent(new StateEvent(reference(event.getPortletContext()), event.getType())); + } + } + + public PortletInvocationResponse invoke(PortletInvocation invocation) throws InvocationException, PortletInvokerException + { + PortletContext compoundPortletContext = (PortletContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE); + PortletContext portletContext = dereference(compoundPortletContext); + InstanceContext instanceContext = invocation.getInstanceContext(); + try + { + invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portletContext); + invocation.setInstanceContext(new FederatedInstanceContext(instanceContext)); + return portletInvoker.invoke(invocation); + } + finally + { + invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, compoundPortletContext); + invocation.setInstanceContext(instanceContext); + } + } + + public PortletContext createClone(PortletContext compoundPortletContext) throws PortletInvokerException + { + PortletContext portletContext = dereference(compoundPortletContext); + PortletContext cloneContext = portletInvoker.createClone(portletContext); + return reference(cloneContext); + } + + public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + if (portletContexts == null) + { + throw new IllegalArgumentException("Null portlet id list not accepted"); + } + if (portletContexts.size() == 0) + { + return Collections.EMPTY_LIST; + } + + // + List dereferencedList = new ArrayList(portletContexts); + for (int i = 0; i < dereferencedList.size(); i++) + { + PortletContext compoundPortletContext = (PortletContext)dereferencedList.get(i); + PortletContext portletContext = dereference(compoundPortletContext); + dereferencedList.set(i, portletContext); + } + + // + List failures = portletInvoker.destroyClones(dereferencedList); + for (int i = 0; i < failures.size(); i++) + { + DestroyCloneFailure failure = (DestroyCloneFailure)failures.get(i); + String cloneId = failure.getPortletId(); + failure = new DestroyCloneFailure(reference(cloneId)); + failures.set(i, failure); + } + + // + return failures; + } + + public PropertyMap getProperties(PortletContext compoundPortletContext) throws PortletInvokerException + { + PortletContext portletId = dereference(compoundPortletContext); + return portletInvoker.getProperties(portletId); + } + + public PropertyMap getProperties(PortletContext compoundPortletContext, Set keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + PortletContext portletId = dereference(compoundPortletContext); + return portletInvoker.getProperties(portletId, keys); + } + + public PortletContext setProperties(PortletContext compoundPortletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + PortletContext portletContext = dereference(compoundPortletContext); + portletContext = portletInvoker.setProperties(portletContext, changes); + return reference(portletContext); + } + + + private PortletContext dereference(PortletContext compoundPortletContext) + { + String portletId = compoundPortletContext.getId().substring(id.length() + 1); + return PortletContext.createPortletContext(portletId, compoundPortletContext.getState()); + } + + private PortletContext reference(PortletContext portletContext) + { + String compoundPortletId = reference(portletContext.getId()); + return PortletContext.createPortletContext(compoundPortletId, portletContext.getState()); + } + + private String reference(String portletId) + { + return id + FederatingPortletInvokerService.SEPARATOR + portletId; + } +} + \ No newline at end of file Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,258 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation.impl; + +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.portlet.InvokerUnavailableException; +import org.jboss.portal.portlet.NoSuchPortletException; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision: 5918 $ + * @since 2.4 + */ +public class FederatingPortletInvokerService extends AbstractJBossService implements FederatingPortletInvoker +{ + + /** The separator used in the id to route to the correct invoker. */ + static final String SEPARATOR = "."; + + /** The registred FederatedPortletInvokers. */ + private Map registry = new HashMap(); + + public synchronized FederatedPortletInvoker registerInvoker(PortletInvokerRegistration registration) + { + if (registration == null) + { + throw new IllegalArgumentException("No null invoker"); + } + String id = registration.getId(); + if (registry.containsKey(id)) + { + throw new IllegalArgumentException("Attempting dual registration of " + id); + } + Map copy = new HashMap(registry); + FederatedPortletInvokerService invoker = new FederatedPortletInvokerService(this, registration); + copy.put(id, invoker); + registry = copy; + return invoker; + } + + public synchronized void unregisterInvoker(PortletInvokerRegistration registration) + { + if (registration == null) + { + throw new IllegalArgumentException("No null invoker"); + } + String id = registration.getId(); + if (id == null) + { + throw new IllegalArgumentException("No null id accepted"); + } + if (!registry.containsKey(id)) + { + throw new IllegalArgumentException("Attempting to unregister unknown invoker " + id); + } + Map copy = new HashMap(registry); + copy.remove(id); + registry = copy; + } + + public FederatedPortletInvoker getFederatedInvoker(String id) throws IllegalArgumentException + { + if (id == null) + { + throw new IllegalArgumentException("No null id provided"); + } + return (FederatedPortletInvoker)registry.get(id); + } + + public Collection getFederatedInvokers() + { + return registry.values(); + } + + // PortletInvoker implementation ************************************************************************************ + + public Set getPortlets() throws PortletInvokerException + { + LinkedHashSet portlets = new LinkedHashSet(); + for (Iterator iterator = registry.values().iterator(); iterator.hasNext();) + { + FederatedPortletInvoker federated = (FederatedPortletInvoker)iterator.next(); + try + { + Set offeredPortlets = federated.getPortlets(); + portlets.addAll(offeredPortlets); + } + catch (InvokerUnavailableException e) + { + Throwable cause = e.getCause(); + log.debug(e.fillInStackTrace()); + log.warn("PortletInvoker with id: " + federated.getId() + " is not available.\nReason: " + e.getMessage() + + "\nCaused by:\n" + (cause == null ? e : cause)); + } + } + return portlets; + } + + public Portlet getPortlet(PortletContext compoundPortletContext) throws IllegalArgumentException, PortletInvokerException + { + FederatedPortletInvoker federated; + try + { + federated = getFederatedPortletInvokerFor(compoundPortletContext); + } + catch (NoSuchPortletException e) + { + log.warn(e); + return null; + } + + // + Portlet portlet = federated.getPortlet(compoundPortletContext); + + // + return new FederatedPortlet(compoundPortletContext, portlet); + } + + public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException + { + PortletContext compoundPortletContext = (PortletContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE); + FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext); + return federated.invoke(invocation); + } + + public PortletContext createClone(PortletContext compoundPortletContext) throws PortletInvokerException + { + FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext); + return federated.createClone(compoundPortletContext); + } + + public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + if (portletContexts == null) + { + throw new IllegalArgumentException("No null list accepted"); + } + if (portletContexts.size() == 0) + { + return Collections.EMPTY_LIST; + } + + // Get the invoker and check that we address only one invoker (for now) + FederatedPortletInvoker invoker = null; + for (int i = 0; i < portletContexts.size(); i++) + { + PortletContext compoundPortletId = (PortletContext)portletContexts.get(i); + FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletId); + if (invoker == null) + { + invoker = federated; + } + else if (invoker.equals(federated) == false) + { + throw new PortletInvokerException("Cannot destroy portlet lists that requires more than one federated invoker"); + } + } + + // + return invoker.destroyClones(portletContexts); + } + + public PropertyMap getProperties(PortletContext compoundPortletContext, Set keys) throws PortletInvokerException + { + FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext); + return federated.getProperties(compoundPortletContext, keys); + } + + public PropertyMap getProperties(PortletContext compoundPortletContext) throws PortletInvokerException + { + FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext); + return federated.getProperties(compoundPortletContext); + } + + public PortletContext setProperties(PortletContext compoundPortletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext); + return federated.setProperties(compoundPortletContext, changes); + } + + // Support methods ************************************************************************************************** + + /** + * Retrieves the portlet invoker associated with the specified compound portlet id or null if it is not found. + * + * @param compoundPortletContext the portlet context for which the invoker is to be retrieved + * @return the portlet invoker associated with the specified compound portlet id + * @throws IllegalArgumentException if the compound portlet id is not well formed or null + */ + private FederatedPortletInvoker getFederatedPortletInvokerFor(PortletContext compoundPortletContext) throws IllegalArgumentException, NoSuchPortletException + { + if (compoundPortletContext == null) + { + throw new IllegalArgumentException("No null portlet id accepted"); + } + + // + String compoundPortletId = compoundPortletContext.getId(); + + // + int pos = compoundPortletId.indexOf(SEPARATOR); + if (pos == -1) + { + throw new IllegalArgumentException("Bad portlet id format " + compoundPortletId); + } + + // + String invokerId = compoundPortletId.substring(0, pos); + FederatedPortletInvoker federated = (FederatedPortletInvoker)registry.get(invokerId); + if (federated == null) + { + throw new NoSuchPortletException(compoundPortletId); + } + + // + return federated; + } +} Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,88 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation.impl; + +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.portlet.PortletInvoker; + +/** + * Register any portlet invoker into a federating portlet invoker. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + * @since 2.4 + */ +public class PortletInvokerRegistrationService extends AbstractJBossService implements PortletInvokerRegistration +{ + + /** The registration id. */ + private String id; + + /** The portlet invoker to register. */ + private PortletInvoker portletInvoker; + + /** The federating portlet invoker. */ + private FederatingPortletInvoker federatingPortletInvoker; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public PortletInvoker getPortletInvoker() + { + return portletInvoker; + } + + public void setPortletInvoker(PortletInvoker portletInvoker) + { + this.portletInvoker = portletInvoker; + } + + public FederatingPortletInvoker getFederatingPortletInvoker() + { + return federatingPortletInvoker; + } + + public void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker) + { + this.federatingPortletInvoker = federatingPortletInvoker; + } + + protected void startService() throws Exception + { + federatingPortletInvoker.registerInvoker(this); + } + + protected void stopService() throws Exception + { + federatingPortletInvoker.unregisterInvoker(this); + } +} Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/federation/src/main/org/jboss/portal/portlet/federation/spi/PortletInvokerRegistration.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/portlet/federation/spi/PortletInvokerRegistration.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/portlet/federation/spi/PortletInvokerRegistration.java 2007-01-30 02:06:15 UTC (rev 6118) @@ -0,0 +1,46 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.portlet.federation.spi; + +import org.jboss.portal.portlet.PortletInvoker; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface PortletInvokerRegistration +{ + /** + * Return the invoker id. + * + * @return the invoker id + */ + String getId(); + + /** + * Return the invoker. + * + * @return the invoker + */ + PortletInvoker getPortletInvoker(); +} Property changes on: trunk/federation/src/main/org/jboss/portal/portlet/federation/spi/PortletInvokerRegistration.java ___________________________________________________________________ Name: svn:executable + *

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6117 - in trunk: core and 14 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-29 20:57:14 -0500 (Mon, 29 Jan 2007) New Revision: 6117 Added: trunk/federation/src/main/org/jboss/portal/portlet/ Removed: trunk/federation/src/main/org/jboss/portal/federation/ Modified: trunk/build/ide/intellij/idea60/modules/federation/federation.iml trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml trunk/core-management/build.xml trunk/core-management/src/main/org/jboss/portal/core/management/PortletDiscoveryService.java trunk/core/build.xml trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml trunk/federation/build.xml trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java trunk/tools/etc/buildfragments/modules.ent trunk/widget/src/resources/widget-invoker-sar/META-INF/jboss-service.xml trunk/wsrp/build.xml trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java Log: refactor org.jboss.portal.federation to org.jboss.portal.portlet.federation Modified: trunk/build/ide/intellij/idea60/modules/federation/federation.iml =================================================================== --- trunk/build/ide/intellij/idea60/modules/federation/federation.iml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/build/ide/intellij/idea60/modules/federation/federation.iml 2007-01-30 01:57:14 UTC (rev 6117) @@ -49,6 +49,15 @@ </library> </orderEntry> <orderEntry type="module" module-name="jems" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core/build.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -127,7 +127,7 @@ <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-federation.classpath"/> + <path refid="jboss.portal-portlet-federation.classpath"/> <path refid="jboss.portal-identity.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-theme.classpath"/> @@ -323,7 +323,7 @@ <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/> <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/> - <fileset dir="${jboss.portal-federation.root}/lib" includes="portal-federation-lib.jar"/> + <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/> Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -30,8 +30,8 @@ import org.jboss.portal.faces.matrix.Cell; import org.jboss.portal.faces.matrix.Row; import org.jboss.portal.faces.matrix.RowSetModel; -import org.jboss.portal.federation.FederatedPortletInvoker; -import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.Role; import org.jboss.portal.identity.RoleModule; Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -787,7 +787,7 @@  <mbean - code="org.jboss.portal.federation.impl.FederatingPortletInvokerService" + code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService" name="portal:service=PortletInvoker,type=Federating" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> @@ -856,7 +856,7 @@  <mbean - code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService" + code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService" name="portal:service=PortletInvokerRegistration,id=local" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -131,7 +131,7 @@ </service> <service> <service-name>FederatingPortletInvoker</service-name> - <service-class>org.jboss.portal.federation.FederatingPortletInvoker</service-class> + <service-class>org.jboss.portal.portlet.federation.FederatingPortletInvoker</service-class> <service-ref>:service=PortletInvoker,type=Federating</service-ref> </service> <service> Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -98,7 +98,7 @@ </service> <service> <service-name>FederatingPortletInvoker</service-name> - <service-class>org.jboss.portal.federation.FederatingPortletInvoker</service-class> + <service-class>org.jboss.portal.portlet.federation.FederatingPortletInvoker</service-class> <service-ref>:service=PortletInvoker,type=Federating</service-ref> </service> </portlet-app> Modified: trunk/core-management/build.xml =================================================================== --- trunk/core-management/build.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core-management/build.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -124,7 +124,7 @@ <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet.classpath"/> <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-federation.classpath"/> + <path refid="jboss.portal-portlet-federation.classpath"/> <path refid="jboss.portal-identity.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-test.classpath"/> Modified: trunk/core-management/src/main/org/jboss/portal/core/management/PortletDiscoveryService.java =================================================================== --- trunk/core-management/src/main/org/jboss/portal/core/management/PortletDiscoveryService.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/core-management/src/main/org/jboss/portal/core/management/PortletDiscoveryService.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -7,8 +7,8 @@ import javax.management.ObjectName; -import org.jboss.portal.federation.FederatedPortletInvoker; -import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.management.LocalPortletManagement; import org.jboss.portal.portlet.management.PortletContainerManagementInterceptor; Modified: trunk/federation/build.xml =================================================================== --- trunk/federation/build.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/federation/build.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -162,7 +162,7 @@ <mkdir dir="${build.lib}"/>  - <jar jarfile="${build.lib}/portal-federation-lib.jar"> + <jar jarfile="${build.lib}/portal-portlet-federation-lib.jar"> <fileset dir="${build.classes}"> <exclude name="org/jboss/portal/test/**"/> </fileset> @@ -198,7 +198,7 @@ <target name="help" depends="_default:help"/> <target name="package-tests" depends="init"> - <jar jarfile="${build.lib}/portal-federation-test-lib.jar"> + <jar jarfile="${build.lib}/portal-portlet--federation-test-lib.jar"> <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/> </jar> </target> Modified: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -23,9 +23,9 @@ package org.jboss.portal.test.portlet.federation; import junit.framework.TestCase; -import org.jboss.portal.federation.FederatedPortletInvoker; -import org.jboss.portal.federation.FederatingPortletInvoker; -import org.jboss.portal.federation.impl.FederatingPortletInvokerService; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; import org.jboss.portal.portlet.test.support.PortletInvokerSupport; import org.jboss.portal.portlet.test.support.PortletSupport; import org.jboss.portal.portlet.PortletInvokerException; Modified: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -24,8 +24,8 @@ import junit.framework.TestCase; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.federation.FederatingPortletInvoker; -import org.jboss.portal.federation.impl.FederatingPortletInvokerService; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; import java.util.HashSet; import java.util.ArrayList; Modified: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -25,9 +25,9 @@ import junit.framework.TestCase; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.test.support.PortletInvokerSupport; -import org.jboss.portal.federation.FederatingPortletInvoker; -import org.jboss.portal.federation.FederatedPortletInvoker; -import org.jboss.portal.federation.impl.FederatingPortletInvokerService; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; import java.util.HashSet; import java.util.Collection; Modified: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.federation; -import org.jboss.portal.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; import org.jboss.portal.portlet.PortletInvoker; /** Modified: trunk/tools/etc/buildfragments/modules.ent =================================================================== --- trunk/tools/etc/buildfragments/modules.ent 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/tools/etc/buildfragments/modules.ent 2007-01-30 01:57:14 UTC (rev 6117) @@ -63,11 +63,11 @@ <pathelement path="${jboss.portal-portlet.lib}/portal-portlet-testframework-lib.jar"/> </path> -  - <property name="jboss.portal-federation.root" value="${project.root}/federation/output"/> - <property name="jboss.portal-federation.lib" value="${jboss.portal-federation.root}/lib"/> - <path id="jboss.portal-federation.classpath"> - <pathelement path="${jboss.portal-federation.lib}/portal-federation-lib.jar"/> +  + <property name="jboss.portal-portlet-federation.root" value="${project.root}/federation/output"/> + <property name="jboss.portal-portlet-federation.lib" value="${jboss.portal-portlet-federation.root}/lib"/> + <path id="jboss.portal-portlet-federation.classpath"> + <pathelement path="${jboss.portal-portlet-federation.lib}/portal-portlet-federation-lib.jar"/> </path>  @@ -106,6 +106,13 @@ <pathelement path="${jboss.portal-core-management.lib}/portal-core-management-lib.jar"/> </path> +  + <property name="jboss.portal-core-samples.root" value="${project.root}/core-samples/output"/> + <property name="jboss.portal-core-samples.lib" value="${jboss.portal-core-samples.root}/lib"/> + <path id="jboss.portal-core-samples.classpath"> + <pathelement path="${jboss.portal-core-samples.lib}/portal-core-samples-lib.jar"/> + </path> +  <property name="jboss.portal-theme.root" value="${project.root}/theme/output"/> <property name="jboss.portal-theme.lib" value="${jboss.portal-theme.root}/lib"/> Modified: trunk/widget/src/resources/widget-invoker-sar/META-INF/jboss-service.xml =================================================================== --- trunk/widget/src/resources/widget-invoker-sar/META-INF/jboss-service.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/widget/src/resources/widget-invoker-sar/META-INF/jboss-service.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -35,7 +35,7 @@  <mbean - code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService" + code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService" name="portal:service=PortletInvokerRegistration,id=googlewidget" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> Modified: trunk/wsrp/build.xml =================================================================== --- trunk/wsrp/build.xml 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/wsrp/build.xml 2007-01-30 01:57:14 UTC (rev 6117) @@ -135,7 +135,7 @@ <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portlet-api.classpath"/> <path refid="jboss.portal-portlet.classpath"/> - <path refid="jboss.portal-federation.classpath"/> + <path refid="jboss.portal-portlet-federation.classpath"/> <path refid="jboss.portal-test.classpath"/> </path> @@ -407,7 +407,7 @@ <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar, portal-portlet-test-lib.jar"/> - <fileset dir="${jboss.portal-federation.root}/lib" includes="portal-federation-lib.jar"/> + <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-framework-lib.jar"/> @@ -466,7 +466,7 @@ <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/> <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/> - <fileset dir="${jboss.portal-federation.root}/lib" includes="portal-federation-lib.jar"/> + <fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> <fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/> <fileset dir="${junit.junit.lib}" includes="junit.jar"/> Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.wsrp.deployment; -import org.jboss.portal.federation.FederatingPortletInvoker; -import org.jboss.portal.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.wsrp.WSRPConsumer; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.SubDeployerSupport; import org.jboss.portal.common.util.URLTools; -import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -23,7 +23,7 @@ package org.jboss.portal.wsrp.deployment; import org.jboss.deployment.SubDeployerExtMBean; -import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-01-30 01:16:36 UTC (rev 6116) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-01-30 01:57:14 UTC (rev 6117) @@ -24,8 +24,8 @@ package org.jboss.portal.wsrp.portlet.consumers; import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.federation.FederatingPortletInvoker; -import org.jboss.portal.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.wsrp.WSRPConsumer;

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6116 - in trunk: federation/src/main/org/jboss/portal and 5 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-29 20:16:36 -0500 (Mon, 29 Jan 2007) New Revision: 6116 Added: trunk/federation/src/main/org/jboss/portal/test/ trunk/federation/src/main/org/jboss/portal/test/portlet/ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java Modified: trunk/federation/build.xml trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java Log: started to add basic test for portlet invoker federation Modified: trunk/federation/build.xml =================================================================== --- trunk/federation/build.xml 2007-01-29 23:54:59 UTC (rev 6115) +++ trunk/federation/build.xml 2007-01-30 01:16:36 UTC (rev 6116) @@ -196,4 +196,29 @@ <target name="all" depends="_default:all"/> <target name="most" depends="_default:most"/> <target name="help" depends="_default:help"/> + + <target name="package-tests" depends="init"> + <jar jarfile="${build.lib}/portal-federation-test-lib.jar"> + <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/> + </jar> + </target> + + <target name="tests" depends="init, _buildmagic:configure:deployment"> + <execute-tests> + <x-test> + <test todir="${test.reports}" + name="org.jboss.portal.test.portlet.federation.OneInvokerNoPortletsTestCase"/> + <test todir="${test.reports}" + name="org.jboss.portal.test.portlet.federation.NoInvokersTestCase"/> + <test todir="${test.reports}" + name="org.jboss.portal.test.portlet.federation.FederatingPortletInvokerTestCase"/> + </x-test> + <x-classpath> + <pathelement location="${build.lib}/portal-federation-lib.jar"/> + <pathelement location="${build.lib}/portal-federation-test-lib.jar"/> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </x-classpath> + </execute-tests> + </target> </project> Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java 2007-01-29 23:54:59 UTC (rev 6115) +++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -35,14 +35,13 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.common.util.CopyOnWriteRegistry; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -58,27 +57,24 @@ static final String SEPARATOR = "."; /** The registred FederatedPortletInvokers. */ - private Map registry = new HashMap(); + private CopyOnWriteRegistry registry = new CopyOnWriteRegistry(); - public synchronized FederatedPortletInvoker registerInvoker(PortletInvokerRegistration registration) + public FederatedPortletInvoker registerInvoker(PortletInvokerRegistration registration) { if (registration == null) { throw new IllegalArgumentException("No null invoker"); } String id = registration.getId(); - if (registry.containsKey(id)) + FederatedPortletInvokerService invoker = new FederatedPortletInvokerService(this, registration); + if (registry.register(id, invoker) == false) { throw new IllegalArgumentException("Attempting dual registration of " + id); } - Map copy = new HashMap(registry); - FederatedPortletInvokerService invoker = new FederatedPortletInvokerService(this, registration); - copy.put(id, invoker); - registry = copy; return invoker; } - public synchronized void unregisterInvoker(PortletInvokerRegistration registration) + public void unregisterInvoker(PortletInvokerRegistration registration) { if (registration == null) { @@ -89,27 +85,20 @@ { throw new IllegalArgumentException("No null id accepted"); } - if (!registry.containsKey(id)) + if (registry.unregister(id) == false) { throw new IllegalArgumentException("Attempting to unregister unknown invoker " + id); } - Map copy = new HashMap(registry); - copy.remove(id); - registry = copy; } public FederatedPortletInvoker getFederatedInvoker(String id) throws IllegalArgumentException { - if (id == null) - { - throw new IllegalArgumentException("No null id provided"); - } return (FederatedPortletInvoker)registry.get(id); } public Collection getFederatedInvokers() { - return registry.values(); + return registry.getRegistrations(); } // PortletInvoker implementation ************************************************************************************ @@ -117,7 +106,7 @@ public Set getPortlets() throws PortletInvokerException { LinkedHashSet portlets = new LinkedHashSet(); - for (Iterator iterator = registry.values().iterator(); iterator.hasNext();) + for (Iterator iterator = registry.getRegistrations().iterator(); iterator.hasNext();) { FederatedPortletInvoker federated = (FederatedPortletInvoker)iterator.next(); try @@ -127,6 +116,7 @@ } catch (InvokerUnavailableException e) { + // When an invoker is unavailable it does not participate in the set of returned portlets. Throwable cause = e.getCause(); log.debug(e.fillInStackTrace()); log.warn("PortletInvoker with id: " + federated.getId() + " is not available.\nReason: " + e.getMessage() Added: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -0,0 +1,132 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.federation; + +import junit.framework.TestCase; +import org.jboss.portal.federation.FederatedPortletInvoker; +import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.federation.impl.FederatingPortletInvokerService; +import org.jboss.portal.portlet.test.support.PortletInvokerSupport; +import org.jboss.portal.portlet.test.support.PortletSupport; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.support.info.PortletInfoSupport; +import org.jboss.portal.common.util.LocalizedString; + +import java.util.Collection; +import java.util.Set; +import java.util.Locale; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class FederatingPortletInvokerTestCase extends TestCase +{ + + /** . */ + private FederatingPortletInvoker federatingInvoker; + + /** . */ + private PortletInvokerSupport federatedInvoker; + + /** . */ + private PortletSupport federatedPortlet; + + /** . */ + private Portlet portlet; + + /** . */ + private PortletContext portletContext; + + protected void setUp() throws Exception + { + federatingInvoker = new FederatingPortletInvokerService(); + federatedInvoker = new PortletInvokerSupport(); + federatedPortlet = new PortletSupport(); + + // Configure + PortletInfoSupport fooInfo = federatedPortlet.getInfoSupport(); + fooInfo.getMetaSupport().setDisplayName("FooPortlet"); + + // Wire + federatedInvoker.addPortlet("MyPortlet", federatedPortlet); + federatingInvoker.registerInvoker(new PortletInvokerRegistrationImpl("foo", federatedInvoker)); + + // Basic setup + Set portlets = federatingInvoker.getPortlets(); + assertNotNull(portlets); + assertEquals(1, portlets.size()); + portlet = (Portlet)portlets.iterator().next(); + assertNotNull(portlet); + portletContext = portlet.getContext(); + assertNotNull(portletContext); + } + + + protected void tearDown() throws Exception + { + federatedPortlet = null; + federatedInvoker = null; + federatingInvoker = null; + portlet = null; + portletContext = null; + } + + public void testFederation() throws PortletInvokerException + { + Collection federateds = federatingInvoker.getFederatedInvokers(); + assertNotNull(federateds); + assertEquals(1, federateds.size()); + FederatedPortletInvoker federated = (FederatedPortletInvoker)federateds.iterator().next(); + assertNotNull(federated); + assertEquals("foo", federated.getId()); + assertEquals(federatedInvoker, federated.getPortletInvoker()); + } + + public void testInfo() throws PortletInvokerException + { + PortletInfo info = portlet.getInfo(); + assertNotNull(info); + MetaInfo metaInfo = info.getMeta(); + assertNotNull(metaInfo); + LocalizedString description = metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME); + assertNotNull(description); + assertEquals(Locale.ENGLISH, description.getDefaultLocale()); + assertEquals("FooPortlet", description.getDefaultString()); + } + + public void testGetPortlet() throws PortletInvokerException + { + Portlet samePortlet = federatingInvoker.getPortlet(portletContext); + assertNotNull(samePortlet); + assertEquals(samePortlet.getContext(), portletContext); + } + + public void testInvoke() throws PortletInvokerException + { + } +} Added: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -0,0 +1,49 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.federation; + +import junit.framework.TestCase; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.federation.impl.FederatingPortletInvokerService; + +import java.util.HashSet; +import java.util.ArrayList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class NoInvokersTestCase extends TestCase +{ + public void testNoFederated() throws PortletInvokerException + { + FederatingPortletInvoker federating = new FederatingPortletInvokerService(); + + // + assertEquals(new HashSet(), federating.getPortlets()); + + // + assertEquals(new ArrayList(), new ArrayList(federating.getFederatedInvokers())); + } +} Added: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -0,0 +1,59 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.federation; + +import junit.framework.TestCase; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.test.support.PortletInvokerSupport; +import org.jboss.portal.federation.FederatingPortletInvoker; +import org.jboss.portal.federation.FederatedPortletInvoker; +import org.jboss.portal.federation.impl.FederatingPortletInvokerService; + +import java.util.HashSet; +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class OneInvokerNoPortletsTestCase extends TestCase +{ + + public void testOneFederatedWithNoPortlets() throws PortletInvokerException + { + FederatingPortletInvoker federating = new FederatingPortletInvokerService(); + PortletInvokerSupport support = new PortletInvokerSupport(); + federating.registerInvoker(new PortletInvokerRegistrationImpl("foo", support)); + + // + assertEquals(new HashSet(), federating.getPortlets()); + + // + Collection federateds = federating.getFederatedInvokers(); + assertNotNull(federateds); + assertEquals(1, federateds.size()); + FederatedPortletInvoker federated = (FederatedPortletInvoker)federateds.iterator().next(); + assertEquals("foo", federated.getId()); + assertEquals(support, federated.getPortletInvoker()); + } +} Added: trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java (rev 0) +++ trunk/federation/src/main/org/jboss/portal/test/portlet/federation/PortletInvokerRegistrationImpl.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -0,0 +1,56 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.federation; + +import org.jboss.portal.federation.spi.PortletInvokerRegistration; +import org.jboss.portal.portlet.PortletInvoker; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PortletInvokerRegistrationImpl implements PortletInvokerRegistration +{ + + /** . */ + private final String id; + + /** . */ + private final PortletInvoker portletInvoker; + + public PortletInvokerRegistrationImpl(String id, PortletInvoker portletInvoker) + { + this.id = id; + this.portletInvoker = portletInvoker; + } + + public String getId() + { + return id; + } + + public PortletInvoker getPortletInvoker() + { + return portletInvoker; + } +} Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java 2007-01-29 23:54:59 UTC (rev 6115) +++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -173,7 +173,7 @@ public PortletInfo getInfo() { - return support.getInfo(); + return support.getInfoSupport(); } public boolean isRemote() Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java 2007-01-29 23:54:59 UTC (rev 6115) +++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java 2007-01-30 01:16:36 UTC (rev 6116) @@ -56,7 +56,7 @@ this(new PortletInfoSupport()); } - public PortletInfo getInfo() + public PortletInfoSupport getInfoSupport() { return info; }

17 years, 4 months

1
0
0 / 0

JBoss Portal SVN: r6115 - in trunk: federation/src/main/org/jboss/portal/federation/impl and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-29 18:54:59 -0500 (Mon, 29 Jan 2007) New Revision: 6115 Modified: trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java Log: - moved getFederatedInvoker() from FederatedPortletInvokerService implementation to FederatedPortletInvoker interface and avoid to cast to the service implementation in ConsumerRegistryService Modified: trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java 2007-01-29 17:06:21 UTC (rev 6114) +++ trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java 2007-01-29 23:54:59 UTC (rev 6115) @@ -39,4 +39,12 @@ * @return the invoker id */ String getId(); + + /** + * Returns the underlying portlet invoker. Added to be able to access invoker when configuring WSRP consumers. + * + * @return the underlying portlet invoker + * @since 2.6 + */ + PortletInvoker getPortletInvoker(); } Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java =================================================================== --- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java 2007-01-29 17:06:21 UTC (rev 6114) +++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java 2007-01-29 23:54:59 UTC (rev 6115) @@ -70,13 +70,6 @@ this.federatingPortletInvoker = federatingPortletInvoker; } - /** - * Added to be able to access invoker when configuring WSRP consumers. - * - * @return - * @see org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService - * @since 2.6 - */ public PortletInvoker getPortletInvoker() { return portletInvoker; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-01-29 17:06:21 UTC (rev 6114) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-01-29 23:54:59 UTC (rev 6115) @@ -25,7 +25,7 @@ import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.federation.FederatingPortletInvoker; -import org.jboss.portal.federation.impl.FederatedPortletInvokerService; +import org.jboss.portal.federation.FederatedPortletInvoker; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.wsrp.WSRPConsumer; @@ -67,7 +67,7 @@ List result = new ArrayList(invokers.size()); for (Iterator invokersIt = invokers.iterator(); invokersIt.hasNext();) { - WSRPConsumer consumer = getConsumerFrom((FederatedPortletInvokerService)invokersIt.next()); + WSRPConsumer consumer = getConsumerFrom((FederatedPortletInvoker)invokersIt.next()); if (consumer != null) { @@ -81,10 +81,11 @@ public WSRPConsumer getConsumer(String id) { ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer id", null); - return getConsumerFrom((FederatedPortletInvokerService)federatingPortletInvoker.getFederatedInvoker(id)); + return getConsumerFrom(federatingPortletInvoker.getFederatedInvoker(id)); } - private WSRPConsumer getConsumerFrom(FederatedPortletInvokerService service) + private WSRPConsumer getConsumerFrom(FederatedPortletInvoker + service) { PortletInvoker invoker = service.getPortletInvoker(); if (invoker instanceof WSRPConsumer)

17 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits January 2007