[portal-commits] JBoss Portal SVN: r13012 - in branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss: portlet/content and 1 other directory.
Author: mwringe
Date: 2009-03-10 17:08:55 -0400 (Tue, 10 Mar 2009)
New Revision: 13012
Modified:
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java
Log:
Temporary fix to get it widgets working on AS5.
Modified:
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java 2009-03-10
05:40:46 UTC (rev 13011)
+++
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java 2009-03-10
21:08:55 UTC (rev 13012)
@@ -106,7 +106,6 @@
DuplicateInstanceException, PortletInvokerException
{
log.debug("Creating portlet instance " + instanceMD.getInstanceId());
- System.out.println("LOCAL :" + appId + " : " +
instanceMD.getPortletRef());
instanceMD.setPortletRef("local." + appId + "." +
instanceMD.getPortletRef());
Instance instance = instanceContainer.createDefinition(instanceMD.getInstanceId(),
instanceMD.getPortletRef());
Modified:
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2009-03-10
05:40:46 UTC (rev 13011)
+++
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2009-03-10
21:08:55 UTC (rev 13012)
@@ -132,7 +132,8 @@
dependencies.add(contentProviderRegistryON);
dependencies.add(instanceContainerON);
dependencies.add(pamfON);
- mbeanServer.invoke(scObjectName, "register", new Object[]{objectName,
dependencies}, new String[]{"javax.management.ObjectName",
"java.util.Collection"});
+ // TODO: the mbean appears to be already registered, figure out what changed in
AS5 to make this happen
+ //mbeanServer.invoke(scObjectName, "register", new
Object[]{objectName, dependencies}, new String[]{"javax.management.ObjectName",
"java.util.Collection"});
// Start the mbean
mbeanServer.invoke(scObjectName, "start", new
ObjectName[]{objectName}, new String[]{"javax.management.ObjectName"});