6:54 a.m.
Author: thomas.heute(a)jboss.com
Date: 2007-09-04 07:54:12 -0400 (Tue, 04 Sep 2007)
New Revision: 8144
Modified:
trunk/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java
trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
trunk/core-management/.classpath
trunk/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java
trunk/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml
Log:
- Fix Management mbeans (JBoss ON)
- core-management Eclipse classpath
Modified: trunk/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java 2007-09-04 11:49:24
UTC (rev 8143)
+++ trunk/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java 2007-09-04 11:54:12
UTC (rev 8144)
@@ -30,6 +30,9 @@
import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
+ * Unused. With the introduction of CMS security, this can
+ * no longer count CMS files.
+ *
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
*/
Modified: trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-09-04
11:49:24 UTC (rev 8143)
+++ trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-09-04
11:54:12 UTC (rev 8144)
@@ -24,9 +24,11 @@
<server>
<!-- Management MBean -->
+ <!-- Unused, the bean doesn't bring any interesting value -->
+ <!--
<mbean
code="org.jboss.portal.cms.management.CMSImpl"
- name="portal:service=Management,type=CMS,name=Default"
+ name="portal.management:service=Management,type=CMS,name=Default"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<depends
@@ -34,7 +36,8 @@
proxy-type="attribute">portal:service=CMS</depends>
<xmbean/>
</mbean>
-
+ -->
+
<mbean
code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=CMS"
Modified: trunk/core-management/.classpath
===================================================================
--- trunk/core-management/.classpath 2007-09-04 11:49:24 UTC (rev 8143)
+++ trunk/core-management/.classpath 2007-09-04 11:54:12 UTC (rev 8144)
@@ -9,5 +9,6 @@
<classpathentry combineaccessrules="false" kind="src"
path="/portlet"/>
<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry combineaccessrules="false" kind="src"
path="/portlet-federation"/>
+ <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java
===================================================================
---
trunk/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java 2007-09-04
11:49:24 UTC (rev 8143)
+++
trunk/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java 2007-09-04
11:54:12 UTC (rev 8144)
@@ -22,8 +22,16 @@
******************************************************************************/
package org.jboss.portal.core.management;
-import org.jboss.portal.core.management.Portal;
-import org.jboss.portal.core.model.instance.InstanceContainer;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.jboss.portal.core.impl.model.instance.InstanceContainerContext;
import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
@@ -32,16 +40,31 @@
*/
public class PortalImpl extends AbstractJBossService implements Portal {
- private InstanceContainer instanceContainer;
+ private InstanceContainerContext containerContext;
public int getNbInstances()
{
- return instanceContainer.getDefinitions().size();
+ int nbInstances = -1;
+ try
+ {
+ InitialContext ctx = new InitialContext();
+ UserTransaction tx;
+ tx = (UserTransaction)ctx.lookup("UserTransaction");
+ tx.begin();
+ nbInstances = containerContext.getInstanceDefinitions().size();
+ tx.commit();
+ }
+ catch (Exception e)
+ {
+ // FIXME
+ e.printStackTrace();
+ }
+ return nbInstances;
}
- public void setInstanceContainer(InstanceContainer instanceContainer)
+ public void setContainerContext(InstanceContainerContext containerContext)
{
- this.instanceContainer = instanceContainer;
+ this.containerContext = containerContext;
}
}
Modified:
trunk/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml
===================================================================
---
trunk/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml 2007-09-04
11:49:24 UTC (rev 8143)
+++
trunk/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml 2007-09-04
11:54:12 UTC (rev 8144)
@@ -33,6 +33,7 @@
<attribute name="InitialStartDate">NOW</attribute>
<attribute name="SchedulePeriod">30000</attribute>
<attribute name="InitialRepetitions">-1</attribute>
+ <attribute name="StartAtStartup">true</attribute>
</mbean>
<mbean
@@ -41,8 +42,8 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
+ optional-attribute-name="ContainerContext"
+
proxy-type="attribute">portal:service=InstanceContainerContext</depends>
<xmbean/>
</mbean>