weaver 2004/04/20 12:48:12
Modified: components/page-manager/src/java/org/apache/jetspeed/page/impl
Tag: NANOCONTAINER_DEPLOYER
CastorXmlPageManager.java AbstractPageManager.java
Log:
removed references to o.a.j.Jetspeed object
Revision Changes Path
No revision
No revision
1.1.2.2 +2 -3
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/CastorXmlPageManager.java
Index: CastorXmlPageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/CastorXmlPageManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CastorXmlPageManager.java 20 Apr 2004 03:08:48 -0000 1.1.2.1
+++ CastorXmlPageManager.java 20 Apr 2004 19:48:12 -0000 1.1.2.2
@@ -28,7 +28,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
import org.apache.jetspeed.cache.file.FileCacheEventListener;
@@ -126,7 +125,7 @@
{
try
{
- this.rootDir = new File(Jetspeed.getRealPath(DEFAULT_ROOT));
+ this.rootDir = new File(root+DEFAULT_ROOT);
}
catch (Exception e)
{
1.1.2.2 +2 -3
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/AbstractPageManager.java
Index: AbstractPageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/Attic/AbstractPageManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractPageManager.java 20 Apr 2004 03:08:48 -0000 1.1.2.1
+++ AbstractPageManager.java 20 Apr 2004 19:48:12 -0000 1.1.2.2
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.idgenerator.IdGenerator;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
@@ -53,7 +52,7 @@
public AbstractPageManager(IdGenerator generator, List modelClasses)
{
- this.generator =
(IdGenerator)Jetspeed.getComponentManager().getComponent("IdGenerator");
+ this.generator = generator;
if (modelClasses.size() > 0)
{
this.fragmentClass = (Class)modelClasses.get(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
