Author: taylor
Date: Tue Jun 3 22:41:25 2008
New Revision: 662985
URL: http://svn.apache.org/viewvc?rev=662985&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-883
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=662985&r1=662984&r2=662985&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Tue Jun 3 22:41:25 2008
@@ -1100,9 +1100,9 @@
public PageManager getPageManager()
{
- if(pageManager == null)
+ if (pageManager == null)
{
- pageManager =
(PageManager)Jetspeed.getComponentManager().getComponent("PageManager");
+ pageManager =
(PageManager)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.page.PageManager");
}
return pageManager;
}
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=662985&r1=662984&r2=662985&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Tue Jun 3 22:41:25 2008
@@ -1102,7 +1102,7 @@
{
if(pageManager == null)
{
- pageManager =
(PageManager)Jetspeed.getComponentManager().getComponent("PageManager");
+ pageManager =
(PageManager)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.page.PageManager");
}
return pageManager;
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=662985&r1=662984&r2=662985&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Tue Jun 3 22:41:25 2008
@@ -1102,7 +1102,7 @@
{
if(pageManager == null)
{
- pageManager =
(PageManager)Jetspeed.getComponentManager().getComponent("PageManager");
+ pageManager =
(PageManager)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.page.PageManager");
}
return pageManager;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
