ate 2004/10/17 03:37:47
Modified: fusion/src/java/org/apache/jetspeed/fusion/services/fusion
FusionServiceImpl.java
Log:
Fix for cps removed from J2
http://issues.apache.org/jira/browse/JS2-148?page=comments#action_53999
Revision Changes Path
1.4 +3 -5
jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/services/fusion/FusionServiceImpl.java
Index: FusionServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/services/fusion/FusionServiceImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FusionServiceImpl.java 23 Jul 2004 07:06:53 -0000 1.3
+++ FusionServiceImpl.java 17 Oct 2004 10:37:47 -0000 1.4
@@ -22,7 +22,6 @@
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
-import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
import org.apache.jetspeed.services.logging.JetspeedLogger;
@@ -35,6 +34,7 @@
// Fusion
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.engine.Engine;
+import org.apache.jetspeed.engine.JetspeedEngineConstants;
import org.apache.jetspeed.engine.SpringEngine;
import org.apache.jetspeed.exception.JetspeedException;
@@ -56,8 +56,6 @@
private boolean debug = false;
private String propertiesFile = "/WEB-INF/conf/fusion.properties";
- protected CommonPortletServices cps = null;
-
// Jetspeed engine
private Engine jetspeed = null;
@@ -90,7 +88,7 @@
applicationRoot = conf.getServletContext().getRealPath("/");
String realPath = conf.getServletContext().getRealPath(propertiesFile);
properties = (Configuration) new PropertiesConfiguration(realPath);
- properties.setProperty(CommonPortletServices.APPLICATION_ROOT_KEY,
applicationRoot);
+ properties.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY,
applicationRoot);
System.out.println("APP ROOT = " + applicationRoot);
System.out.println("PROP FILE = " + realPath);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
