[portal-commits] JBoss Portal SVN: r8142 - in branches/JBoss_Portal_Branch_2_6/core-management/src: resources/portal-management-sar/META-INF and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2007-09-04 07:48:52 -0400 (Tue, 04 Sep 2007)
New Revision: 8142
Modified:
branches/JBoss_Portal_Branch_2_6/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java
branches/JBoss_Portal_Branch_2_6/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml
Log:
- Fix Management mbeans (JBoss ON) (Nb of instances)
Modified:
branches/JBoss_Portal_Branch_2_6/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java 2007-09-04
10:55:50 UTC (rev 8141)
+++
branches/JBoss_Portal_Branch_2_6/core-management/src/main/org/jboss/portal/core/management/PortalImpl.java 2007-09-04
11:48:52 UTC (rev 8142)
@@ -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:
branches/JBoss_Portal_Branch_2_6/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml 2007-09-04
10:55:50 UTC (rev 8141)
+++
branches/JBoss_Portal_Branch_2_6/core-management/src/resources/portal-management-sar/META-INF/jboss-service.xml 2007-09-04
11:48:52 UTC (rev 8142)
@@ -42,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>