Author: julien(a)jboss.com
Date: 2007-08-17 10:09:05 -0400 (Fri, 17 Aug 2007)
New Revision: 7975
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml
branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java
Log:
make portlet-federation module not depend on jems
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-17
14:04:29 UTC (rev 7974)
+++
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-17
14:09:05 UTC (rev 7975)
@@ -140,6 +140,15 @@
</orderEntry>
<orderEntry type="module" module-name="jems" />
<orderEntry type="module" module-name="api" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-08-17
14:04:29 UTC (rev 7974)
+++
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-08-17
14:09:05 UTC (rev 7975)
@@ -57,6 +57,24 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml 2007-08-17 14:04:29 UTC
(rev 7974)
+++ branches/JBoss_Portal_Branch_2_6/portlet-federation/build.xml 2007-08-17 14:09:05 UTC
(rev 7975)
@@ -110,8 +110,6 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
</path>
Modified:
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2007-08-17
14:04:29 UTC (rev 7974)
+++
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2007-08-17
14:09:05 UTC (rev 7975)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.portlet.federation.impl;
-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;
@@ -35,6 +34,7 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
+import org.apache.log4j.Logger;
import java.util.Collection;
import java.util.Collections;
@@ -51,9 +51,12 @@
* @version $Revision: 5918 $
* @since 2.4
*/
-public class FederatingPortletInvokerService extends AbstractJBossService implements
FederatingPortletInvoker
+public class FederatingPortletInvokerService implements FederatingPortletInvoker
{
+ /** . */
+ private static final Logger log =
Logger.getLogger(FederatingPortletInvokerService.class);
+
/** The separator used in the id to route to the correct invoker. */
static final String SEPARATOR = ".";
Modified:
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java 2007-08-17
14:04:29 UTC (rev 7974)
+++
branches/JBoss_Portal_Branch_2_6/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java 2007-08-17
14:09:05 UTC (rev 7975)
@@ -23,7 +23,6 @@
package org.jboss.portal.portlet.federation.impl;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.portlet.PortletInvoker;
/**
@@ -33,7 +32,7 @@
* @version $Revision: 5448 $
* @since 2.4
*/
-public class PortletInvokerRegistrationService extends AbstractJBossService
+public class PortletInvokerRegistrationService
{
/** The registration id. */
Show replies by date