[jboss-svn-commits] JBoss Portal SVN: r5138 - in trunk: bridge cms/src/main/org/jboss/portal/cms/impl/cache cms/src/main/org/jboss/portal/cms/impl/jcr common/src/main/org/jboss/portal/common core/src/main/org/jboss/portal/core core/src/main/org/jboss/portal/core/controller core/src/main/org/jboss/portal/core/controller/command/mapper core/src/main/org/jboss/portal/core/event core/src/main/org/jboss/portal/core/impl/model/instance core/src/main/org/jboss/portal/core/impl/model/portal core/src/main/org/jboss/portal/core/impl/portlet/state core/src/main/org/jboss/portal/core/modules core/src/resources/portal-cms-sar/META-INF core/src/resources/portal-core-sar/META-INF federation federation/src/main/org/jboss/portal/federation/impl forums/src/resources/portal-forums-sar/META-INF identity identity/src/main/org/jboss/portal/identity/db jems/src/main/org/jboss/portal/jems jems/src/main/org/jboss/portal/jems/as jems/src/main/org/jboss/portal/jems/as/system jems/src/main/org/jboss/portal/jems/! hibernate portlet portlet/src/main/org/jboss/portal/portlet/container portlet/src/main/org/jboss/portal/portlet/impl/security portlet/src/main/org/jboss/portal/portlet/state/producer portlet/src/main/org/jboss/portal/portlet/test portlet/src/main/org/jboss/portal/portlet/test/support portlet/src/main/org/jboss/portal/portlet/test/support/state portlet/src/resources/tck-sar/META-INF portlet/src/resources/test/info/test-info-sar/META-INF portlet/src/resources/test-sar/META-INF security security/src/main/org/jboss/portal/security/impl security/src/main/org/jboss/portal/security/impl/jacc server server/src/main/org/jboss/portal/server/config server/src/main/org/jboss/portal/server/deployment server/src/main/org/jboss/portal/server/deployment/jboss server/src/main/org/jboss/portal/server/impl server/src/main/org/jboss/portal/server/impl/invocation server/src/main/org/jboss/portal/test/server server/src/resources/portal-server-sar/META-INF server/src/resources/test/test-charset-s! ar/META-INF server/src/resources/test/test-parameters-sar/META-INF server/src/resources/test/test-servlet-sar/META-INF server/src/resources/test/test-session-sar/META-INF theme theme/src/main/org/jboss/portal/theme/impl theme/src/main/org/jboss/portal/theme/impl/page wsrp wsrp/src/main/org/jboss/portal/test/wsrp wsrp/src/mai
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 4 16:57:19 EDT 2006
Author: julien at jboss.com
Date: 2006-09-04 16:55:40 -0400 (Mon, 04 Sep 2006)
New Revision: 5138
Added:
trunk/jems/src/main/org/jboss/portal/jems/as/
trunk/jems/src/main/org/jboss/portal/jems/as/system/
trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java
trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java
trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java
trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java
trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java
Removed:
trunk/common/src/main/org/jboss/portal/common/system/
trunk/core/src/main/org/jboss/portal/core/system/
Modified:
trunk/bridge/build.xml
trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java
trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java
trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java
trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java
trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java
trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
trunk/federation/build.xml
trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java
trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java
trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java
trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java
trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
trunk/portlet/build.xml
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java
trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java
trunk/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java
trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml
trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
trunk/security/build.xml
trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
trunk/server/build.xml
trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java
trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
trunk/server/src/main/org/jboss/portal/server/impl/JBossInterceptorStackFactory.java
trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java
trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java
trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java
trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-session-sar/META-INF/jboss-service.xml
trunk/theme/build.xml
trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java
trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java
trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/TestWSRPProducerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccessService.java
trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
trunk/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml
trunk/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
move jboss AS specific code to jems module.
Modified: trunk/bridge/build.xml
===================================================================
--- trunk/bridge/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/bridge/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -77,6 +77,7 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
</path>
Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -29,7 +29,7 @@
import org.jboss.portal.cms.impl.CMSCacheException;
import org.jboss.portal.cms.impl.CMSTreeCacheService;
import org.jboss.portal.cms.model.File;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.common.util.JNDI;
/**
Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -52,7 +52,7 @@
import org.jboss.portal.cms.util.RepositoryUtil;
import org.jboss.portal.common.net.URLNavigator;
import org.jboss.portal.common.net.URLVisitor;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.util.XML;
import org.jboss.portal.common.invocation.InterceptorStackFactory;
Modified: trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,7 +22,7 @@
package org.jboss.portal.core.controller;
import org.jboss.portal.common.invocation.InterceptorStackFactory;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.core.controller.command.RenderPageCommand;
import org.jboss.portal.core.controller.command.InvokeWindowActionCommand;
import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.core.controller.command.mapper;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.core.controller.ControllerCommand;
Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.core.controller.command.mapper;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.core.event;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Map;
import java.util.HashMap;
Modified: trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.core.event;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
*
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -25,14 +25,12 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.exception.ConstraintViolationException;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.core.model.instance.DuplicateInstanceException;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.instance.InstancePermission;
import org.jboss.portal.core.model.instance.NoSuchInstanceException;
-import org.jboss.portal.portlet.InvokerUnavailableException;
-import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.state.DestroyCloneFailure;
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -23,7 +23,7 @@
import org.jboss.portal.core.event.PortalEventListenerRegistry;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -28,7 +28,7 @@
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.portlet.state.SimplePropertyMap;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.hibernate.SessionFactory;
import org.hibernate.Session;
import org.hibernate.Query;
Modified: trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -24,7 +24,7 @@
import javax.naming.CompositeName;
import org.jboss.naming.NonSerializableFactory;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* Base class for modules. Provides JNDI facilities.
Modified: trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -58,7 +58,7 @@
code="@cms.service.code@"
name="portal:service=CMS"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!-- The datasource hibernate depends on, it can be commented when the file store is used -->
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
@@ -228,7 +228,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=CMS"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<attribute name="DoChecking">true</attribute>
@@ -241,7 +241,7 @@
code="org.jboss.portal.core.cms.CMSObjectCommandFactory"
name="portal:commandFactory=CMSObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="TargetWindowRef">default.default.DefaultCMSPortletWindow</attribute>
<depends optional-attribute-name="CMSService" proxy-type="attribute">portal:service=CMS</depends>
@@ -250,7 +250,7 @@
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
name="portal:commandFactory=Delegate,prefix=content"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Prefix">content</attribute>
<depends
@@ -265,7 +265,7 @@
code="org.jboss.portal.core.cms.CMSObjectURLFactory"
name="portal:urlFactory=CMSObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Prefix">content</attribute>
<depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
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 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -6,7 +6,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,14 +16,14 @@
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
name="portal:service=AuthorizationDomainRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
name="portal:service=PortalAuthorizationManagerFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="AuthorizationDomainRegistry"
@@ -33,7 +33,7 @@
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
name="portal:service=PortletSecurityService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
@@ -48,7 +48,7 @@
code="org.jboss.portal.core.impl.portlet.state.PersistentStateStore"
name="portal:service=StateStore,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Portlet</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
@@ -59,21 +59,21 @@
code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
name="portal:service=Interceptor,type=Server,name=Transaction"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.server.UserInterceptor"
name="portal:service=Interceptor,type=Server,name=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="UserModule"
@@ -83,21 +83,21 @@
code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
name="portal:service=Interceptor,type=Server,name=Locale"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
name="portal:service=Interceptor,type=Server,name=ContentType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Server,name=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -105,7 +105,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
@@ -122,21 +122,21 @@
code="org.jboss.portal.core.aspects.controller.PageNavigationInterceptor"
name="portal:service=Interceptor,type=Command,name=PageNavigation"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.controller.PortalNodeInterceptor"
name="portal:service=Interceptor,type=Command,name=PortalNode"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
@@ -144,14 +144,14 @@
code="org.jboss.portal.core.aspects.controller.EventBroadcasterInterceptor"
name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Command"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
@@ -166,7 +166,7 @@
code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
@@ -174,21 +174,21 @@
code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
@@ -202,84 +202,84 @@
code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Valve"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.bridge.BridgeInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Bridge"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=WindowStates"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Modes"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Transaction"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Header"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
@@ -301,21 +301,21 @@
code="org.jboss.portal.theme.impl.ThemeServiceImpl"
name="portal:service=ThemeService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.LayoutServiceImpl"
name="portal:service=LayoutService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.theme.impl.page.PageServiceImpl"
name="portal:service=PageService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="LayoutService"
@@ -352,7 +352,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
@@ -367,7 +367,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
@@ -382,7 +382,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
@@ -396,7 +396,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Portlet"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
@@ -412,7 +412,7 @@
code="org.jboss.portal.identity.db.UserModuleImpl"
name="portal:service=Module,type=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<attribute name="JNDIName">java:/portal/UserModule</attribute>
@@ -422,7 +422,7 @@
code="org.jboss.portal.identity.db.RoleModuleImpl"
name="portal:service=Module,type=Role"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
<attribute name="JNDIName">java:/portal/RoleModule</attribute>
@@ -432,7 +432,7 @@
code="org.jboss.portal.core.impl.mail.MailModuleImpl"
name="portal:service=Module,type=Mail"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss:service=Mail</depends>
<depends>portal:service=Module,type=User</depends>
@@ -458,7 +458,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -467,7 +467,7 @@
code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
name="portal:service=ListenerRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -476,7 +476,7 @@
code="org.jboss.portal.core.event.PortalEventListenerServiceImpl"
name="portal:service=ListenerService,type=test_listener"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Registry"
@@ -490,7 +490,7 @@
code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
name="portal:container=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Instance</depends>
<depends
@@ -508,7 +508,7 @@
code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
name="portal:container=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=PortalObject</depends>
<depends
@@ -528,14 +528,14 @@
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
name="portal:commandFactory=DefaultPortal"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="NextFactory"
@@ -548,7 +548,7 @@
code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
name="portal:commandFactory=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Container"
@@ -558,7 +558,7 @@
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
name="portal:commandFactory=Delegate,prefix=portal"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Prefix">portal</attribute>
<depends
@@ -574,14 +574,14 @@
code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
name="portal:urlFactory=Delegating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
name="portal:urlFactory=PortalObject"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Prefix">portal</attribute>
<depends
@@ -594,7 +594,7 @@
code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
name="portal:service=PortletInvoker,type=Federating"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -603,7 +603,7 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="StackFactory"
@@ -618,7 +618,7 @@
code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
name="portal:service=PortletInvoker,type=Stateful"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PortletInvoker"
@@ -633,7 +633,7 @@
code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
name="portal:service=PortletInvokerRegistration,id=local"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Id">local</attribute>
<depends
@@ -649,7 +649,7 @@
code="org.jboss.portal.portlet.test.TestPortletInvoker"
name="portal:service=PortletInvoker,type=Instance"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Producer"
@@ -665,7 +665,7 @@
code="org.jboss.portal.core.controller.CoreController"
name="portal:controller=Request"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="PageService"
@@ -692,7 +692,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Config"
@@ -734,7 +734,7 @@
code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
name="portal:deploymentFactory=Object"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -770,7 +770,7 @@
code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!-- @portal.single.xml.close@
<depends>jboss.ha:service=HASingletonDeployer</depends>
@@ -800,7 +800,7 @@
code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
name="portal:deploymentFactory=Layout"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -813,7 +813,7 @@
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
name="portal:deploymentFactory=LayoutFeatures"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -826,7 +826,7 @@
code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
name="portal:deploymentFactory=Theme"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
optional-attribute-name="Deployer"
@@ -839,7 +839,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
<depends
Modified: trunk/federation/build.xml
===================================================================
--- trunk/federation/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/federation/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -86,6 +86,7 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
<path refid="jboss.portal-test.classpath"/>
Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,6 @@
*/
package org.jboss.portal.federation.impl;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.federation.FederatedPortletInvoker;
@@ -32,6 +31,7 @@
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.HashMap;
import java.util.Iterator;
Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,10 +21,10 @@
*/
package org.jboss.portal.federation.impl;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.federation.FederatingPortletInvoker;
import org.jboss.portal.federation.spi.PortletInvokerRegistration;
import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* Register any portlet invoker into a federating portlet invoker.
Modified: trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -4,7 +4,7 @@
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal.forums:service=Hibernate"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<attribute name="DoChecking">true</attribute>
@@ -15,7 +15,7 @@
code="org.jboss.portlet.forums.impl.ForumsModuleImpl"
name="portal.forums:service=Module,type=Forums"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!-- Flood interval in seconds -->
<attribute name="FloodInterval">30</attribute>
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/identity/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -84,6 +84,7 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portal-test.classpath"/>
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
</path>
<!--+=======================================+-->
@@ -215,6 +216,7 @@
<path refid="cglib.cglib.classpath"/>
<path refid="jboss.portal-test.classpath"/>
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
</x-classpath>
</execute-tests>
</target>
Modified: trunk/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/RoleModuleImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -28,13 +28,13 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.criterion.Restrictions;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.util.JNDI;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.identity.User;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.naming.InitialContext;
import java.util.Collections;
Modified: trunk/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/UserModuleImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -30,13 +30,13 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.util.JNDI;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.NoSuchUserException;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet </a>
Copied: trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java (from rev 5136, trunk/common/src/main/org/jboss/portal/common/system/AbstractJBossService.java)
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/system/AbstractJBossService.java 2006-09-04 15:00:38 UTC (rev 5136)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -0,0 +1,84 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., 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.jems.as.system;
+
+import org.jboss.logging.Logger;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * JBoss service integration helper.
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public class AbstractJBossService extends ServiceMBeanSupport
+{
+
+ public AbstractJBossService()
+ {
+ }
+
+ public AbstractJBossService(final Class type)
+ {
+ super(type);
+ }
+
+ public AbstractJBossService(final String category)
+ {
+ super(category);
+ }
+
+ public AbstractJBossService(final Logger log)
+ {
+ super(log);
+ }
+
+ public final int getState()
+ {
+ return super.getState();
+ }
+
+ public final String getStateString()
+ {
+ return super.getStateString();
+ }
+
+ public final void create() throws Exception
+ {
+ super.create();
+ }
+
+ public final void start() throws Exception
+ {
+ super.start();
+ }
+
+ public final void stop()
+ {
+ super.stop();
+ }
+
+ public final void destroy()
+ {
+ super.destroy();
+ }
+}
Property changes on: trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java (from rev 5136, trunk/common/src/main/org/jboss/portal/common/system/JBossService.java)
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/system/JBossService.java 2006-09-04 15:00:38 UTC (rev 5136)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., 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.jems.as.system;
+
+public interface JBossService {
+
+ public void create() throws Exception;
+
+ public void start() throws Exception;
+
+ public void stop();
+
+ public void destroy();
+}
Property changes on: trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java (from rev 5136, trunk/common/src/main/org/jboss/portal/common/system/JBossServiceModelMBean.java)
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/system/JBossServiceModelMBean.java 2006-09-04 15:00:38 UTC (rev 5136)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -0,0 +1,104 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., 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.jems.as.system;
+
+import org.jboss.mx.modelmbean.ModelMBeanInvoker;
+import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.portal.common.mx.JavaBeanModelMBeanBuilder;
+import org.w3c.dom.Element;
+import org.apache.log4j.Logger;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.modelmbean.InvalidTargetObjectTypeException;
+import javax.management.modelmbean.ModelMBeanInfo;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public class JBossServiceModelMBean extends ModelMBeanInvoker
+{
+
+// Attributes ----------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(JBossServiceModelMBean.class);
+
+ // Constructors --------------------------------------------------
+
+ public JBossServiceModelMBean(Object resource, ModelMBeanInfo info) throws MBeanException
+ {
+ try
+ {
+ setManagedResource(resource, "ObjectReference");
+ setModelMBeanInfo(info);
+ }
+ catch (InstanceNotFoundException e)
+ {
+ throw new MBeanException(e);
+ }
+ catch (InvalidTargetObjectTypeException e)
+ {
+ throw new MBeanException(e, "Unsupported resource type: " + resourceType);
+ }
+ }
+
+ public JBossServiceModelMBean(Object resource) throws MBeanException
+ {
+ this(resource, null, null);
+ }
+
+ public JBossServiceModelMBean(Object resource, Element config, String version) throws MBeanException
+ {
+ try
+ {
+ setManagedResource(resource, "ObjectReference");
+ ModelMBeanInfo info = JavaBeanModelMBeanBuilder.build(resource.getClass(), ServiceMBeanSupport.class);
+ setModelMBeanInfo(info);
+ }
+ catch (InstanceNotFoundException e)
+ {
+ throw new MBeanException(e);
+ }
+ catch (InvalidTargetObjectTypeException e)
+ {
+ throw new MBeanException(e, "Unsupported resource type: " + resourceType);
+ }
+ catch (Exception e)
+ {
+ throw new MBeanException(e);
+ }
+ }
+
+ // ModelMBean implementation -------------------------------------
+
+ public boolean isSupportedResourceType(Object resource, String resourceType)
+ {
+ return "ObjectReference".equals(resourceType);
+ }
+
+ public MBeanInfo getMBeanInfo()
+ {
+ return info;
+ }
+}
Property changes on: trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java (from rev 5136, trunk/common/src/main/org/jboss/portal/common/system/LifeCycleAdapter.java)
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/system/LifeCycleAdapter.java 2006-09-04 15:00:38 UTC (rev 5136)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -0,0 +1,242 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., 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.jems.as.system;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.management.AttributeChangeNotification;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerNotification;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+
+import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.ObjectNameFactory;
+import org.jboss.portal.common.util.JMX;
+import org.jboss.system.ServiceController;
+import org.jboss.system.ServiceControllerMBean;
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Adapts JBoss lifecycle event handling and multiplex event from
+ * different sources into one source.
+ *
+ * It requires an MBeanServer and a ServiceController plugged
+ * into the MBeanServer.
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public class LifeCycleAdapter
+{
+
+ /** The name of the server delegate. */
+ private static final ObjectName MBEAN_SERVER_DELEGATE = ObjectNameFactory.create("JMImplementation:type=MBeanServerDelegate");
+
+ /** The logger. */
+ protected Logger log;
+
+ /** The service controller name. */
+ protected ServiceControllerMBean controller;
+
+ /** The server. */
+ protected MBeanServer server;
+
+ /** The delegated listener. */
+ private Listener listener;
+
+ /** The watched mbeans. */
+ private Set watched;
+
+ /**
+ * Create the rule for the given server.
+ */
+ public LifeCycleAdapter(MBeanServer server)
+ {
+ try
+ {
+ this.log = Logger.getLogger(getClass());
+ this.controller = (ServiceControllerMBean)MBeanProxy.get(ServiceControllerMBean.class, ServiceController.OBJECT_NAME, server);
+ this.server = server;
+ this.listener = new Listener();
+ this.watched = Collections.synchronizedSet(new HashSet());
+ }
+ catch (MBeanProxyCreationException ignored)
+ {
+ }
+ }
+
+ /**
+ * Start the adapter.
+ *
+ * @exception IllegalStateException if the service controller is missing
+ */
+ public void start() throws IllegalStateException
+ {
+ JMX.addNotificationListener(server, MBEAN_SERVER_DELEGATE, listener, listener, null);
+ if (!JMX.addNotificationListener(server, ServiceControllerMBean.OBJECT_NAME, listener, listener, null))
+ {
+ throw new IllegalStateException("The service controller is not here");
+ }
+ }
+
+ /**
+ * Stop the adapter
+ */
+ public void stop()
+ {
+ JMX.removeNotificationListener(server, ServiceControllerMBean.OBJECT_NAME, listener);
+ JMX.removeNotificationListener(server, MBEAN_SERVER_DELEGATE, listener);
+ server = null;
+ watched.clear();
+ }
+
+ public void addStateListener(ObjectName name)
+ {
+ try
+ {
+ server.addNotificationListener(name, listener, listener, name);
+ watched.add(name);
+ }
+ catch (Exception e)
+ {
+ log.error("Cannot become a listener of " + name, e);
+ }
+ }
+
+ public void removeStateListener(ObjectName name)
+ {
+ try
+ {
+ server.removeNotificationListener(name, listener);
+ watched.remove(name);
+ }
+ catch (Exception ignored)
+ {
+ }
+ }
+
+// protected void registered(ObjectName name)
+// {
+// }
+//
+// protected void unregistered(ObjectName name)
+// {
+// }
+
+ protected void created(ObjectName name)
+ {
+ }
+
+ protected void starting(ObjectName name)
+ {
+ }
+
+ protected void started(ObjectName name)
+ {
+ }
+
+ protected void stopping(ObjectName name)
+ {
+ }
+
+ protected void stopped(ObjectName name)
+ {
+ }
+
+ protected void destroyed(ObjectName name)
+ {
+ }
+
+ private class Listener implements NotificationListener, NotificationFilter
+ {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 4049015398272819164L;
+ public boolean isNotificationEnabled(Notification notification)
+ {
+ return true;
+ }
+ public void handleNotification(Notification notification, Object handback)
+ {
+ String type = notification.getType();
+ if (type == MBeanServerNotification.REGISTRATION_NOTIFICATION)
+ {
+ MBeanServerNotification msn = (MBeanServerNotification)notification;
+ ObjectName name = msn.getMBeanName();
+ // registered(name);
+ }
+ else if (type == MBeanServerNotification.UNREGISTRATION_NOTIFICATION)
+ {
+ MBeanServerNotification msn = (MBeanServerNotification)notification;
+ ObjectName name = msn.getMBeanName();
+ // unregistered(name);
+ }
+ else if (type == AttributeChangeNotification.ATTRIBUTE_CHANGE)
+ {
+ AttributeChangeNotification acn = (AttributeChangeNotification)notification;
+ ObjectName name = (ObjectName)handback;
+ if ("State".equals(acn.getAttributeName()))
+ {
+ int state = ((Integer)acn.getNewValue()).intValue();
+ switch(state)
+ {
+ case ServiceMBean.STARTING:
+ starting(name);
+ break;
+ case ServiceMBean.STARTED:
+ started(name);
+ break;
+ case ServiceMBean.STOPPING:
+ stopping(name);
+ break;
+ case ServiceMBean.STOPPED:
+ stopped(name);
+ break;
+ default:
+ }
+ }
+ }
+ else if (type == ServiceMBean.CREATE_EVENT)
+ {
+ ObjectName name = (ObjectName)notification.getUserData();
+ if (watched.contains(name))
+ {
+ created(name);
+ }
+ }
+ else if (type == ServiceMBean.DESTROY_EVENT)
+ {
+ ObjectName name = (ObjectName)notification.getUserData();
+ if (watched.contains(name))
+ {
+ destroyed(name);
+ }
+ }
+ }
+ }
+}
Property changes on: trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java (from rev 5136, trunk/core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java)
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java 2006-09-04 15:00:38 UTC (rev 5136)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -0,0 +1,156 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., 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.jems.as.system;
+
+import javax.management.ObjectName;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.ReflectionException;
+
+/**
+ * A jmx method invoker based on the lifecycle.
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public class LifecycleInvoker extends AbstractJBossService
+{
+
+ /** . */
+ private ObjectName target;
+
+ /** . */
+ private String onCreate;
+
+ /** . */
+ private String onStart;
+
+ /** . */
+ private String onStop;
+
+ /** . */
+ private String onDestroy;
+
+ public ObjectName getTarget()
+ {
+ return target;
+ }
+
+ public void setTarget(ObjectName target)
+ {
+ this.target = target;
+ }
+
+ public String getOnCreate()
+ {
+ return onCreate;
+ }
+
+ public void setOnCreate(String onCreate)
+ {
+ this.onCreate = onCreate;
+ }
+
+ public String getOnStart()
+ {
+ return onStart;
+ }
+
+ public void setOnStart(String onStart)
+ {
+ this.onStart = onStart;
+ }
+
+ public String getOnStop()
+ {
+ return onStop;
+ }
+
+ public void setOnStop(String onStop)
+ {
+ this.onStop = onStop;
+ }
+
+ public String getOnDestroy()
+ {
+ return onDestroy;
+ }
+
+ public void setOnDestroy(String onDestroy)
+ {
+ this.onDestroy = onDestroy;
+ }
+
+ private void invoke(String methodName)
+ {
+ try
+ {
+ log.debug("About to invoke " + methodName + " on mbean " + target);
+ server.invoke(target, methodName, new Object[0], new String[0]);
+ }
+ catch (InstanceNotFoundException e)
+ {
+ log.debug("The mbean " + target + " does not exist and " + methodName + " cannot be invoked");
+ }
+ catch (MBeanException e)
+ {
+ Throwable t = e.getCause();
+ log.error("The mbean " + target + " threw an exception during the invocation of the method " + methodName, t);
+ }
+ catch (ReflectionException e)
+ {
+ log.error("The mbean " + target + " invocation of method " + methodName, e);
+ }
+ }
+
+ protected void createService() throws Exception
+ {
+ if (onCreate != null)
+ {
+ invoke(onCreate);
+ }
+ }
+
+ protected void startService() throws Exception
+ {
+ if (onStart != null)
+ {
+ invoke(onStart);
+ }
+ }
+
+ protected void stopService() throws Exception
+ {
+ if (onStop != null)
+ {
+ invoke(onStop);
+ }
+ }
+
+ protected void destroyService() throws Exception
+ {
+ if (onDestroy != null)
+ {
+ invoke(onDestroy);
+ }
+ }
+}
Property changes on: trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,7 +22,7 @@
package org.jboss.portal.jems.hibernate;
import org.jboss.cache.TreeCache;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.management.ObjectName;
Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -32,7 +32,7 @@
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.common.util.CLLoader;
import org.jboss.portal.common.util.LoaderResource;
import org.jboss.portal.common.util.Tools;
Modified: trunk/portlet/build.xml
===================================================================
--- trunk/portlet/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -86,6 +86,7 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
@@ -254,6 +255,7 @@
<!-- TCK sar -->
<copy todir="${build.resources}/tck-sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-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"/>
@@ -275,6 +277,7 @@
</jar>
<copy todir="${build.resources}/test-sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,13 +21,11 @@
*/
package org.jboss.portal.portlet.container;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.impl.jsr168.PortletContextImpl;
import org.jboss.portal.portlet.impl.jsr168.APIFactory;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
-import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.portlet.PortletContext;
import java.util.HashSet;
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.portlet.container;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Collection;
import java.util.Collections;
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,6 @@
*/
package org.jboss.portal.portlet.container;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.common.invocation.InterceptorStackFactory;
import org.jboss.portal.common.invocation.Invocation;
@@ -34,6 +33,7 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Set;
import java.util.Collection;
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -10,7 +10,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.security.PortletPermission;
import org.jboss.portal.portlet.security.PortletSecurityService;
import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistry;
@@ -25,6 +24,7 @@
import org.jboss.portal.security.spi.provider.DomainConfigurator;
import org.jboss.portal.security.spi.provider.PermissionFactory;
import org.jboss.portal.security.spi.provider.PermissionRepository;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
@@ -34,7 +34,7 @@
* @version $Revision$
* @since Mar 17, 2006
*/
-public class JBossPortletSecurityService extends AbstractJBossService
+public class JBossPortletSecurityService extends AbstractJBossService
implements PortletSecurityService,
AuthorizationDomain, DomainConfigurator, PermissionRepository, PermissionFactory
{
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,7 +22,6 @@
package org.jboss.portal.portlet.state.producer;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.portlet.state.PropertyMap;
@@ -40,6 +39,7 @@
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Iterator;
import java.util.Set;
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -23,7 +23,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.util.URLTools;
import org.jboss.portal.portlet.ActionURL;
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,6 @@
*/
package org.jboss.portal.portlet.test;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.invocation.InterceptorStackFactory;
import org.jboss.portal.common.invocation.InvocationHandler;
import org.jboss.portal.common.invocation.Invocation;
@@ -32,6 +31,7 @@
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Set;
import java.util.List;
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 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -33,7 +33,7 @@
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Map;
import java.util.HashMap;
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/state/StateStoreSupport.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,13 +21,13 @@
*/
package org.jboss.portal.portlet.test.support.state;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.portlet.state.producer.StateStore;
import org.jboss.portal.portlet.state.producer.State;
import org.jboss.portal.portlet.state.producer.NoSuchStateException;
import org.jboss.portal.portlet.state.producer.InvalidStateIdException;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Map;
import java.util.HashMap;
Modified: trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -6,35 +6,35 @@
code="org.jboss.portal.portlet.test.UserInterceptor"
name="portal:service=Interceptor,type=Server,name=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.LocaleInterceptor"
name="portal:service=Interceptor,type=Server,name=Locale"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
name="portal:service=Interceptor,type=Server,name=ContentType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.NavigationInterceptor"
name="portal:service=Interceptor,type=Server,name=Navigation"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
name="portal:service=InterceptorStack,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
@@ -49,14 +49,14 @@
code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
name="portal:service=InterceptorStack,type=Consumer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
@@ -68,49 +68,49 @@
code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Valve"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=WindowStates"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Modes"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack"
name="portal:service=InterceptorStack,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<!--<depends-list-element>portal:service=Interceptor,type=Portlet,name=Security</depends-list-element>-->
@@ -130,7 +130,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -139,7 +139,7 @@
code="org.jboss.portal.portlet.test.TestPortletInvoker"
name="portal:service=PortletInvoker,type=Consumer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Producer" proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
<depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=Consumer</depends>
@@ -150,7 +150,7 @@
code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
name="portal:service=PortletInvoker,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
<depends optional-attribute-name="StateStore" proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
@@ -161,7 +161,7 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=Container</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -172,7 +172,7 @@
code="org.jboss.portal.portlet.tck.TCKPortletController"
name="portal:controller=Request,redirect=true"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Consumer</depends>
<attribute name="RedirectAfterAction">true</attribute>
@@ -181,7 +181,7 @@
code="org.jboss.portal.portlet.test.PortletController"
name="portal:controller=Request,redirect=false"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Consumer</depends>
<attribute name="RedirectAfterAction">false</attribute>
@@ -192,7 +192,7 @@
code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -205,7 +205,7 @@
code="org.jboss.portal.portlet.test.support.state.StateStoreSupport"
name="portal:service=StateStore,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!--
@@ -223,14 +223,14 @@
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
name="portal:service=AuthorizationDomainRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
name="portal:service=PortalAuthorizationManagerFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
</mbean>
@@ -238,7 +238,7 @@
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
name="portal:service=PortletSecurityService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
<depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
@@ -252,7 +252,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -263,7 +263,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -281,7 +281,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
@@ -292,7 +292,7 @@
code="org.jboss.portal.server.deployment.WebAppEnhancer"
name="portal:service=Deployer,type=Enhancer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
</mbean>
Modified: trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -5,7 +5,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -14,7 +14,7 @@
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Server,name=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -22,7 +22,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=Controller</depends-list-element>
@@ -42,7 +42,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
@@ -53,7 +53,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -62,7 +62,7 @@
code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -73,7 +73,7 @@
code="org.jboss.portal.test.server.RequestControllerTestImpl"
name="portal:controller=Request"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -82,7 +82,7 @@
code="org.jboss.portal.test.portlet.info.MetaInfoTest"
name="portal:test=MetaInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -92,7 +92,7 @@
code="org.jboss.portal.test.portlet.info.PreferenceInfoTest"
name="portal:test=PreferenceInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -102,7 +102,7 @@
code="org.jboss.portal.test.portlet.info.CapabilitiesInfoTest"
name="portal:test=CapabilitiesInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -112,7 +112,7 @@
code="org.jboss.portal.test.portlet.info.CacheInfoTest"
name="portal:test=CacheInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -122,7 +122,7 @@
code="org.jboss.portal.test.portlet.info.ModeInfoTest"
name="portal:test=ModeInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -132,7 +132,7 @@
code="org.jboss.portal.test.portlet.info.PortletInfoTest"
name="portal:test=PortletInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -142,7 +142,7 @@
code="org.jboss.portal.test.portlet.info.SessionInfoTest"
name="portal:test=SessionInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -152,7 +152,7 @@
code="org.jboss.portal.test.portlet.info.SecurityInfoTest"
name="portal:test=SecurityInfo"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
Modified: trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -6,28 +6,28 @@
code="org.jboss.portal.portlet.test.UserInterceptor"
name="portal:service=Interceptor,type=Server,name=User"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.LocaleInterceptor"
name="portal:service=Interceptor,type=Server,name=Locale"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
name="portal:service=Interceptor,type=Server,name=ContentType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Server,name=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request,redirect=true</depends>
</mbean>
@@ -35,7 +35,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
@@ -50,21 +50,21 @@
code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Consumer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
@@ -77,56 +77,56 @@
code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Valve"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=WindowStates"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Modes"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<!--<depends-list-element>portal:service=Interceptor,type=Portlet,name=Security</depends-list-element>-->
@@ -145,7 +145,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -154,7 +154,7 @@
code="org.jboss.portal.portlet.test.TestPortletInvoker"
name="portal:service=PortletInvoker,type=Consumer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Producer" proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
<depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Consumer</depends>
@@ -165,7 +165,7 @@
code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
name="portal:service=PortletInvoker,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
<depends optional-attribute-name="StateStore" proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
@@ -176,7 +176,7 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Container</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -187,7 +187,7 @@
code="org.jboss.portal.portlet.test.PortletController"
name="portal:controller=Request,redirect=true"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Consumer</depends>
<attribute name="RedirectAfterAction">true</attribute>
@@ -196,7 +196,7 @@
code="org.jboss.portal.portlet.test.PortletController"
name="portal:controller=Request,redirect=false"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Consumer</depends>
<attribute name="RedirectAfterAction">false</attribute>
@@ -207,7 +207,7 @@
code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -220,7 +220,7 @@
code="org.jboss.portal.portlet.test.support.state.StateStoreSupport"
name="portal:service=StateStore,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -229,14 +229,14 @@
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
name="portal:service=AuthorizationDomainRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
name="portal:service=PortalAuthorizationManagerFactory"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
</mbean>
@@ -244,7 +244,7 @@
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
name="portal:service=PortletSecurityService"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
<depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
@@ -258,7 +258,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -268,7 +268,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -286,7 +286,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
@@ -297,7 +297,7 @@
code="org.jboss.portal.server.deployment.WebAppEnhancer"
name="portal:service=Deployer,type=Enhancer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
</mbean>
Modified: trunk/security/build.xml
===================================================================
--- trunk/security/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/security/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -76,6 +76,7 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
</path>
<!--+=======================================+-->
Modified: trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.security.impl;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.security.spi.provider.AuthorizationDomain;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Map;
import java.util.HashMap;
Modified: trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,11 +21,11 @@
*/
package org.jboss.portal.security.impl.jacc;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
import org.jboss.portal.security.AuthorizationDomainRegistry;
import org.jboss.portal.security.PortalPermission;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.security.jacc.SubjectPolicyContextHandler;
import org.jboss.security.jacc.DelegatingPolicy;
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -89,6 +89,7 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-test.classpath"/>
</path>
@@ -146,6 +147,7 @@
<copy todir="${build.resources}/portal-server-sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${build.lib}/" includes="portal-server-lib.jar"/>
</copy>
<jar jarfile="${build.lib}/portal-server.sar">
@@ -166,6 +168,7 @@
<jar jarfile="${build.lib}/test-parameters.sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
@@ -185,6 +188,7 @@
<jar jarfile="${build.lib}/test-servlet.sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
@@ -201,6 +205,7 @@
<jar jarfile="${build.lib}/test-session.sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
@@ -212,6 +217,7 @@
<jar jarfile="${build.lib}/test-charset.sar">
<fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
Modified: trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,9 +21,9 @@
*/
package org.jboss.portal.server.config;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.util.LoaderResource;
import org.jboss.portal.common.util.CLLoader;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Map;
import java.util.HashMap;
Modified: trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -23,7 +23,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.SubDeployer;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.web.WebApplication;
import javax.management.Notification;
Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.server.deployment.jboss;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.net.URL;
Modified: trunk/server/src/main/org/jboss/portal/server/impl/JBossInterceptorStackFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/JBossInterceptorStackFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/server/impl/JBossInterceptorStackFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,10 +21,10 @@
*/
package org.jboss.portal.server.impl.invocation;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.invocation.Interceptor;
import org.jboss.portal.common.invocation.InterceptorStackFactory;
import org.jboss.portal.common.invocation.InterceptorStack;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.management.ObjectName;
import java.util.List;
Modified: trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,15 +21,12 @@
*/
package org.jboss.portal.server.impl;
-import org.jboss.portal.common.system.AbstractJBossService;
-import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.util.Version;
import org.jboss.portal.server.Server;
import org.jboss.portal.server.PortalConstants;
import org.jboss.portal.server.config.ServerConfig;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
-import java.io.InputStream;
-
/**
* Should bootstrap the microcontainer in the (near) future.
*
Modified: trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,10 +21,10 @@
*/
package org.jboss.portal.server.impl.invocation;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.invocation.Interceptor;
import org.jboss.portal.common.invocation.Invocation;
import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -23,7 +23,7 @@
import org.jboss.portal.test.framework.container.result.Result;
import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,11 +21,11 @@
*/
package org.jboss.portal.test.server;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.ServerException;
import org.jboss.portal.test.framework.container.TestCaseContext;
import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import java.util.Map;
import java.util.HashMap;
Modified: trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -5,7 +5,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,7 +16,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -34,7 +34,7 @@
code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
@@ -45,7 +45,7 @@
code="org.jboss.portal.server.deployment.WebAppEnhancer"
name="portal:service=Deployer,type=Enhancer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
</mbean>
Modified: trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -5,7 +5,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,7 +16,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -26,7 +26,7 @@
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -34,7 +34,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
@@ -46,7 +46,7 @@
code="org.jboss.portal.test.server.RequestControllerTestImpl"
name="portal:controller=Request"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -55,7 +55,7 @@
code="org.jboss.portal.test.server.charset.GetTest"
name="portal:test=Get"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -63,7 +63,7 @@
code="org.jboss.portal.test.server.charset.PostTest"
name="portal:test=Post"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -71,7 +71,7 @@
code="org.jboss.portal.test.server.charset.PostXWWWFormURLEncodedNoCharsetTest"
name="portal:test=PostXWWWFormURLEncodedNoCharsetType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -79,7 +79,7 @@
code="org.jboss.portal.test.server.charset.PostXWWWFormURLEncodedUTF8Test"
name="portal:test=PostXWWWFormURLEncodedUTF8Type"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -87,7 +87,7 @@
code="org.jboss.portal.test.server.charset.PostMultipartFormDataNoCharsetTest"
name="portal:test=PostMultipartFormDataNoCharsetType"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -95,7 +95,7 @@
code="org.jboss.portal.test.server.charset.PostMultipartFormDataUTF8Test"
name="portal:test=PostMultipartFormDataUTF8Type"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
Modified: trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -5,7 +5,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -15,7 +15,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -25,7 +25,7 @@
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -33,7 +33,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
@@ -45,7 +45,7 @@
code="org.jboss.portal.test.server.RequestControllerTestImpl"
name="portal:controller=Request"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -54,7 +54,7 @@
code="org.jboss.portal.test.server.parameters.GetTest"
name="portal:test=Get"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -62,7 +62,7 @@
code="org.jboss.portal.test.server.parameters.PostApplicationXWWWFormURLEncodedTest"
name="portal:test=PostApplicationXWWWFormURLEncodedTest"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -70,7 +70,7 @@
code="org.jboss.portal.test.server.parameters.PostMultipartFormDataTest"
name="portal:test=PostMultipartFormDataTest"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
Modified: trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -5,7 +5,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,7 +16,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -27,7 +27,7 @@
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -35,7 +35,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
@@ -47,7 +47,7 @@
code="org.jboss.portal.test.server.RequestControllerTestImpl"
name="portal:controller=Request"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -56,7 +56,7 @@
code="org.jboss.portal.test.server.servlet.RootPathMappingTest"
name="portal:test=Bilto"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -64,7 +64,7 @@
code="org.jboss.portal.test.server.servlet.PathMappingTest"
name="portal:test=Bilto2"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -72,7 +72,7 @@
code="org.jboss.portal.test.server.servlet.DefaultServletMappingTest"
name="portal:test=Bilto3"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
Modified: trunk/server/src/resources/test/test-session-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-session-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/server/src/resources/test/test-session-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -5,7 +5,7 @@
code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
@@ -16,7 +16,7 @@
code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -26,7 +26,7 @@
code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
name="portal:service=Interceptor,type=Controller"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
@@ -34,7 +34,7 @@
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
@@ -46,7 +46,7 @@
code="org.jboss.portal.test.server.RequestControllerTestImpl"
name="portal:controller=Request"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -55,7 +55,7 @@
code="org.jboss.portal.test.server.session.SessionTest"
name="portal:test=Session"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
</mbean>
Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/theme/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -84,6 +84,7 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
</path>
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -23,7 +23,6 @@
import org.apache.log4j.Logger;
import org.jboss.portal.common.MediaType;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.server.util.HTTPStreamInfo;
import org.jboss.portal.theme.LayoutException;
import org.jboss.portal.theme.LayoutInfo;
@@ -39,6 +38,7 @@
import org.jboss.portal.theme.render.MarkupResult;
import org.jboss.portal.theme.render.PortalRenderSet;
import org.jboss.portal.theme.strategy.LayoutStrategy;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.system.Service;
import java.util.ArrayList;
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,7 +22,6 @@
package org.jboss.portal.theme.impl;
import org.apache.log4j.Logger;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.theme.PortalTheme;
import org.jboss.portal.theme.ServerRegistrationID;
import org.jboss.portal.theme.ThemeException;
@@ -30,6 +29,7 @@
import org.jboss.portal.theme.ThemeService;
import org.jboss.portal.theme.RuntimeContext;
import org.jboss.portal.theme.metadata.PortalThemeMetaData;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.system.Service;
import java.util.ArrayList;
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,10 +21,10 @@
*/
package org.jboss.portal.theme.impl.page;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.theme.ThemeService;
import org.jboss.portal.theme.page.PageService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/build.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -108,6 +108,7 @@
<path id="dependentmodule.classpath">
<path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/TestWSRPProducerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/TestWSRPProducerImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/TestWSRPProducerImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,7 +22,6 @@
package org.jboss.portal.test.wsrp;
import org.jboss.invocation.Invocation;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.test.wsrp.v1.consumer.SOF;
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.WSRPTypeFactory;
@@ -76,6 +75,7 @@
import org.jboss.portal.wsrp.core.UnsupportedModeFault;
import org.jboss.portal.wsrp.core.UnsupportedWindowStateFault;
import org.jboss.portal.wsrp.core.UpdateResponse;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,7 +22,6 @@
package org.jboss.portal.wsrp.consumer;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.InvokerUnavailableException;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.Portlet;
@@ -54,6 +53,7 @@
import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType;
import org.jboss.portal.wsrp.services.ServiceFactory;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,11 +21,11 @@
*/
package org.jboss.portal.wsrp.deployment;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.federation.FederatingPortletInvoker;
import org.jboss.portal.federation.spi.PortletInvokerRegistration;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -24,7 +24,6 @@
import org.jboss.invocation.Invocation;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
@@ -76,6 +75,7 @@
import org.jboss.portal.wsrp.core.UnsupportedModeFault;
import org.jboss.portal.wsrp.core.UnsupportedWindowStateFault;
import org.jboss.portal.wsrp.servlet.ServletAccess;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -22,8 +22,8 @@
package org.jboss.portal.wsrp.services;
import org.jboss.logging.Logger;
-import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.naming.InitialContext;
import java.util.Iterator;
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -25,7 +25,7 @@
import java.util.Map;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* A service factory that statically cache implementations. It is mainly used in
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccessService.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccessService.java 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/servlet/ServletAccessService.java 2006-09-04 20:55:40 UTC (rev 5138)
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.wsrp.servlet;
-import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.management.ObjectName;
import java.lang.reflect.Proxy;
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -6,14 +6,14 @@
code="org.jboss.portal.wsrp.aspects.portlet.SessionInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Session"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=WSRP"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
@@ -28,7 +28,7 @@
code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
name="portal:service=WSRPPortletInvoker,type=Stateful"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="StateStore" proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
<depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Container</depends>
@@ -39,7 +39,7 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=WSRPPortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=WSRP</depends>
<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -50,7 +50,7 @@
code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
name="portal.wsrp:service=WSRPProducer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=WSRPPortletInvoker,type=Stateful</depends>
</mbean>
Modified: trunk/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/resources/test-wsrp-consumer-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -6,7 +6,7 @@
code="org.jboss.portal.test.wsrp.TestWSRPProducerImpl"
name="portal.wsrp:service=WSRPProducer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -16,7 +16,7 @@
code="org.jboss.portal.wsrp.servlet.ServletAccessService"
name="portal.wsrp:service=ServletAccess"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
Modified: trunk/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml 2006-09-04 15:13:55 UTC (rev 5137)
+++ trunk/wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml 2006-09-04 20:55:40 UTC (rev 5138)
@@ -6,7 +6,7 @@
code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
name="portal:service=WebAppRegistry"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -15,7 +15,7 @@
code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory"
name="portal:deploymentFactory=PortletApp"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
<depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
@@ -27,35 +27,35 @@
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=WindowStates"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Modes"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.wsrp.aspects.portlet.SessionInterceptor"
name="portal:service=Interceptor,type=Portlet,name=Session"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
@@ -70,7 +70,7 @@
code="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker"
name="portal:service=PortletInvoker,type=Stateful"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="StateStore"
proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
@@ -82,7 +82,7 @@
code="org.jboss.portal.portlet.container.PortletContainerInvoker"
name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="StackFactory"
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Container</depends>
@@ -94,7 +94,7 @@
code="org.jboss.portal.portlet.test.support.state.StateStoreSupport"
name="portal:service=StateStore,type=Producer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
@@ -103,7 +103,7 @@
code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
name="portal.wsrp:service=WSRPProducer"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Invoker"
proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
@@ -116,7 +116,7 @@
code="org.jboss.portal.wsrp.servlet.ServletAccessService"
name="portal.wsrp:service=ServletAccess"
xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
More information about the jboss-svn-commits
mailing list