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 @@ <!-- The federating portlet invoker --> <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 @@ <!-- Register the state portlet invoker on the federating portlet invoker --> <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}"/> <!-- Federation lib jar --> - <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> - <!-- federation --> - <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"/> + <!-- portlet-federation --> + <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> <!-- bridge --> @@ -106,6 +106,13 @@ <pathelement path="${jboss.portal-core-management.lib}/portal-core-management-lib.jar"/> </path> + <!-- core-samples --> + <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> + <!-- theme --> <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 @@ <!-- Register the portlet invoker on the federating portlet invoker --> <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;