You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2001/06/09 17:37:35 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry RegistryWatcher.java
raphael 01/06/09 08:37:35
Modified: src/java/org/apache/jetspeed/services Profiler.java
src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java ProfilerService.java
src/java/org/apache/jetspeed/services/registry
RegistryWatcher.java
Log:
add locator methods in Profiler for handling Controls and Controllers
templates
Revision Changes Path
1.6 +17 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/services/Profiler.java
Index: Profiler.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/Profiler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Profiler.java 2001/06/07 05:45:48 1.5
+++ Profiler.java 2001/06/09 15:37:31 1.6
@@ -71,7 +71,7 @@
* @see org.apache.jetspeed.services.profiler.Profiler
* @see org.apache.jetspeed.services.profiler.ProfilerService
* @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
- * @version $Id: Profiler.java,v 1.5 2001/06/07 05:45:48 taylor Exp $
+ * @version $Id: Profiler.java,v 1.6 2001/06/09 15:37:31 raphael Exp $
*/
public class Profiler
{
@@ -244,6 +244,22 @@
public static String locatePortletTemplate(RunData data, String template)
{
return getService().locatePortletTemplate(data, template);
+ }
+
+ /**
+ * @see ProfilerService#locateControlTemplate
+ */
+ public static String locateControlTemplate(RunData data, String template)
+ {
+ return getService().locateControlTemplate(data, template);
+ }
+
+ /**
+ * @see ProfilerService#locateControllerTemplate
+ */
+ public static String locateControllerTemplate(RunData data, String template)
+ {
+ return getService().locateControllerTemplate(data, template);
}
1.6 +35 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JetspeedProfilerService.java 2001/06/06 22:29:07 1.5
+++ JetspeedProfilerService.java 2001/06/09 15:37:32 1.6
@@ -110,7 +110,7 @@
*
* @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
- * @version $Id: JetspeedProfilerService.java,v 1.5 2001/06/06 22:29:07 raphael Exp $
+ * @version $Id: JetspeedProfilerService.java,v 1.6 2001/06/09 15:37:32 raphael Exp $
*/
public class JetspeedProfilerService extends TurbineBaseService
@@ -976,6 +976,40 @@
path = locateTemplate(data, "/portlets", path, template);
return "/portlets"+path;
+ }
+
+ /**
+ * Locate a controller template using the Profiler's fallback algorithm
+ *
+ * @param data the rundata for the request.
+ * @param template the name of the template
+ *
+ * @return the exact path to the portlet template, or null if not found
+ */
+ public String locateControlTemplate(RunData data, String template)
+ {
+ String path = localizeTemplateName(data);
+
+ path = locateTemplate(data, "/controls", path, template);
+
+ return "/controls"+path;
+ }
+
+ /**
+ * Locate a controller template using the Profiler's fallback algorithm
+ *
+ * @param data the rundata for the request.
+ * @param template the name of the template
+ *
+ * @return the exact path to the portlet template, or null if not found
+ */
+ public String locateControllerTemplate(RunData data, String template)
+ {
+ String path = localizeTemplateName(data);
+
+ path = locateTemplate(data, "/controllers", path, template);
+
+ return "/controllers"+path;
}
/**
1.5 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java
Index: ProfilerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/ProfilerService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProfilerService.java 2001/06/06 22:29:08 1.4
+++ ProfilerService.java 2001/06/09 15:37:33 1.5
@@ -68,7 +68,7 @@
*
* @see org.apache.jetspeed.om.profile.Profile
* @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
- * @version $Id: ProfilerService.java,v 1.4 2001/06/06 22:29:08 raphael Exp $
+ * @version $Id: ProfilerService.java,v 1.5 2001/06/09 15:37:33 raphael Exp $
*/
public interface ProfilerService extends Service
@@ -213,5 +213,7 @@
public String locateScreenTemplate(RunData data, String template);
public String locateLayoutTemplate(RunData data, String template);
public String locatePortletTemplate(RunData data, String template);
+ public String locateControlTemplate(RunData data, String template);
+ public String locateControllerTemplate(RunData data, String template);
}
1.3 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/RegistryWatcher.java
Index: RegistryWatcher.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/RegistryWatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegistryWatcher.java 2001/05/02 14:17:30 1.2
+++ RegistryWatcher.java 2001/06/09 15:37:34 1.3
@@ -65,7 +65,7 @@
* of file updates.
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: RegistryWatcher.java,v 1.2 2001/05/02 14:17:30 raphael Exp $
+ * @version $Id: RegistryWatcher.java,v 1.3 2001/06/09 15:37:34 raphael Exp $
*/
public class RegistryWatcher extends Thread
{
@@ -326,9 +326,10 @@
}
- if (needRefresh == true)
+ if (needRefresh)
{
subscriber.refresh();
+ needRefresh = false;
}
sleep( refreshRate );
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org