jvanzyl 01/08/01 08:35:08
Modified: src/java/org/apache/turbine/services/pull PullService.java
TurbinePull.java TurbinePullService.java
src/java/org/apache/turbine/services/pull/util
UIManager.java
Log:
- reflect changes in services
Revision Changes Path
1.11 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/pull/PullService.java
Index: PullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/PullService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PullService.java 2001/07/17 11:37:30 1.10
+++ PullService.java 2001/08/01 15:35:08 1.11
@@ -55,7 +55,7 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.services.Service;
+import org.apache.fulcrum.Service;
import org.apache.turbine.services.template.TemplateContext;
/**
@@ -85,7 +85,7 @@
* be specified as well.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: PullService.java,v 1.10 2001/07/17 11:37:30 jvanzyl Exp $
+ * @version $Id: PullService.java,v 1.11 2001/08/01 15:35:08 jvanzyl Exp $
*/
public interface PullService extends Service
{
1.16 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePull.java
Index: TurbinePull.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePull.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbinePull.java 2001/07/17 20:36:06 1.15
+++ TurbinePull.java 2001/08/01 15:35:08 1.16
@@ -56,7 +56,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.services.template.TemplateContext;
-import org.apache.turbine.services.TurbineServices;
+import org.apache.fulcrum.TurbineServices;
/**
* This is a Facade class for PullService.
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbinePull.java,v 1.15 2001/07/17 20:36:06 jmcnally Exp $
+ * @version $Id: TurbinePull.java,v 1.16 2001/08/01 15:35:08 jvanzyl Exp $
*/
public abstract class TurbinePull
{
1.34 +9 -9
jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TurbinePullService.java 2001/07/17 11:37:30 1.33
+++ TurbinePullService.java 2001/08/01 15:35:08 1.34
@@ -59,16 +59,16 @@
import java.util.List;
import java.util.Vector;
import java.util.HashMap;
-import org.apache.turbine.services.template.TemplateContext;
-import org.apache.turbine.services.template.DefaultTemplateContext;
-import org.apache.turbine.services.security.entity.User;
+import org.apache.fulcrum.security.entity.User;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.BaseService;
-import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.factory.FactoryService;
-import org.apache.turbine.services.pool.PoolService;
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.InitializationException;
+import org.apache.fulcrum.TurbineServices;
+import org.apache.fulcrum.factory.FactoryService;
+import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.services.pull.ApplicationTool;
+import org.apache.turbine.services.template.TemplateContext;
+import org.apache.turbine.services.template.DefaultTemplateContext;
//!! this has to go away. there should be an interface
// for Configuration in the commons. i don't even like
@@ -146,7 +146,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: TurbinePullService.java,v 1.33 2001/07/17 11:37:30 jvanzyl Exp $
+ * @version $Id: TurbinePullService.java,v 1.34 2001/08/01 15:35:08 jvanzyl Exp $
*/
public class TurbinePullService
extends BaseService
1.19 +4 -4
jakarta-turbine/src/java/org/apache/turbine/services/pull/util/UIManager.java
Index: UIManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/util/UIManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UIManager.java 2001/07/17 23:01:06 1.18
+++ UIManager.java 2001/08/01 15:35:08 1.19
@@ -59,11 +59,11 @@
import java.util.Properties;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.ContentURI;
-import org.apache.turbine.services.Log;
+import org.apache.turbine.util.Log;
import org.apache.turbine.RunData;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.services.pull.TurbinePull;
-import org.apache.turbine.services.security.entity.User;
+import org.apache.fulcrum.security.entity.User;
/**
* UIManager.java
@@ -101,7 +101,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Coltman</a>
- * @version $Id: UIManager.java,v 1.18 2001/07/17 23:01:06 jvanzyl Exp $
+ * @version $Id: UIManager.java,v 1.19 2001/08/01 15:35:08 jvanzyl Exp $
*/
public class UIManager implements ApplicationTool
{
@@ -136,7 +136,7 @@
* Attribute name of skinName value in User's temp hashmap.
*/
private static final String SKIN_ATTRIBUTE =
- "org.apache.turbine.services.pull.util.UIManager.skin";
+ "org.apache.fulcrum.pull.util.UIManager.skin";
/**
* The actual skin being used for the webapp.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
