taylor 01/07/07 14:10:56
Modified: src/java/org/apache/jetspeed/portal/controllers
VelocityPortletController.java
src/java/org/apache/jetspeed/portal/controls
VelocityPortletControl.java
src/java/org/apache/jetspeed/portal/portlets
VelocityPortlet.java
src/java/org/apache/jetspeed/portal/portlets/customize
CustomizePortlet.java
Log:
- References to Profiler.locate* changed to TemplateLocator.locate*
Revision Changes Path
1.3 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java
Index: VelocityPortletController.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocityPortletController.java 2001/06/25 10:53:51 1.2
+++ VelocityPortletController.java 2001/07/07 21:10:49 1.3
@@ -63,7 +63,7 @@
// Jetspeed stuff
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletException;
-import org.apache.jetspeed.services.Profiler;
+import org.apache.jetspeed.services.TemplateLocator;
// Ecs stuff
import org.apache.ecs.ConcreteElement;
@@ -131,7 +131,7 @@
template = template + ".vm";
}
- String templatePath = Profiler.locateControllerTemplate(rundata,
template);
+ String templatePath = TemplateLocator.locateControllerTemplate(rundata,
template);
s = TurbineVelocity.handleRequest(context, templatePath);
}
catch( Exception e)
1.8 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java
Index: VelocityPortletControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocityPortletControl.java 2001/06/25 10:53:59 1.7
+++ VelocityPortletControl.java 2001/07/07 21:10:50 1.8
@@ -68,7 +68,7 @@
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.portal.PortletCustomizer;
import org.apache.jetspeed.portal.PortalState;
-import org.apache.jetspeed.services.Profiler;
+import org.apache.jetspeed.services.TemplateLocator;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.util.MimeType;
@@ -152,7 +152,7 @@
String s = null;
try
{
- String template = Profiler.locateControlTemplate(rundata,theme);
+ String template = TemplateLocator.locateControlTemplate(rundata,theme);
s = TurbineVelocity.handleRequest(context, template);
}
catch( Exception e )
1.5 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/VelocityPortlet.java
Index: VelocityPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/VelocityPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VelocityPortlet.java 2001/06/07 21:59:18 1.4
+++ VelocityPortlet.java 2001/07/07 21:10:53 1.5
@@ -64,7 +64,7 @@
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.portlets.AbstractPortlet;
import org.apache.jetspeed.portal.PortletException;
-import org.apache.jetspeed.services.Profiler;
+import org.apache.jetspeed.services.TemplateLocator;
// Ecs stuff
import org.apache.ecs.ConcreteElement;
@@ -139,7 +139,7 @@
{
if (-1 == template.indexOf(".vm"))
template = template + ".vm";
- String templatePath = Profiler.locatePortletTemplate(rundata, template);
+ String templatePath = TemplateLocator.locatePortletTemplate(rundata,
template);
s = TurbineVelocity.handleRequest(context, templatePath);
}
catch( Exception e)
1.17 +2 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java
Index: CustomizePortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CustomizePortlet.java 2001/07/02 07:38:11 1.16
+++ CustomizePortlet.java 2001/07/07 21:10:54 1.17
@@ -63,6 +63,7 @@
import org.apache.jetspeed.portal.*;
import org.apache.jetspeed.services.Profiler;
+import org.apache.jetspeed.services.TemplateLocator;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.PortletFactory;
@@ -313,7 +314,7 @@
String template = this.getPortletConfig().getInitParameter(
VM_PARAMETER );
if (-1 == template.indexOf(".vm"))
template = template + ".vm";
- String templatePath = Profiler.locatePortletTemplate(data,
template);
+ String templatePath = TemplateLocator.locatePortletTemplate(data,
template);
s = TurbineVelocity.handleRequest(context, templatePath);
}
catch( Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
