Author: roy.russo(a)jboss.com
Date: 2007-01-22 11:24:53 -0500 (Mon, 22 Jan 2007)
New Revision: 6066
Modified:
trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
Log:
fixed workflow service not found bug due to dependency.
Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
---
trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2007-01-22
16:18:18 UTC (rev 6065)
+++
trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2007-01-22
16:24:53 UTC (rev 6066)
@@ -40,8 +40,8 @@
import org.jboss.portal.cms.security.PermissionManager;
import org.jboss.portal.cms.util.FileUtil;
import org.jboss.portal.cms.util.NodeUtil;
+import org.jboss.portal.core.cms.command.StreamContentCommand;
import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.cms.command.StreamContentCommand;
import org.jboss.portal.identity.AnnonymousRole;
import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.MembershipModule;
@@ -245,11 +245,11 @@
}
//get the unapproved content for this file
- if (this.approvePublish != null)
+ if (this.getApprovePublish() != null)
{
try
{
- Collection pendingQueue = this.approvePublish.getPendingQueue(sPath);
+ Collection pendingQueue =
this.getApprovePublish().getPendingQueue(sPath);
rReq.setAttribute("pendingQueue", pendingQueue);
}
catch (WorkflowException we)
@@ -1052,7 +1052,7 @@
try
{
- this.approvePublish.processManagerResponse(Long.parseLong(sPID), sManager,
true);
+ this.getApprovePublish().processManagerResponse(Long.parseLong(sPID),
sManager, true);
}
catch (Exception e)
{
@@ -1068,7 +1068,7 @@
try
{
- this.approvePublish.processManagerResponse(Long.parseLong(sPID), sManager,
false);
+ this.getApprovePublish().processManagerResponse(Long.parseLong(sPID),
sManager, false);
}
catch (Exception e)
{
@@ -1334,11 +1334,25 @@
try
{
InitialContext context = new InitialContext();
- this.approvePublish =
(ApprovePublish)context.lookup("java:portal/ApprovePublishWorkflow");
+
this.setApprovePublish((ApprovePublish)context.lookup("java:portal/ApprovePublishWorkflow"));
}
catch (Exception e)
{
- this.approvePublish = null;
+ this.setApprovePublish(null);
}
}
+
+ public ApprovePublish getApprovePublish()
+ {
+ if (this.approvePublish == null)
+ {
+ this.initializeApprovePublishWorkflow();
+ }
+ return approvePublish;
+ }
+
+ public void setApprovePublish(ApprovePublish approvePublish)
+ {
+ this.approvePublish = approvePublish;
+ }
}
\ No newline at end of file
Show replies by date