Author: vkumar
Date: Mon Apr 27 14:32:42 2009
New Revision: 769004
URL: http://svn.apache.org/viewvc?rev=769004&view=rev
Log:
Fixing JS2-936 https://issues.apache.org/jira/browse/JS2-936 and aligning
profile portlet with other Wicket Portlets
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java?rev=769004&r1=769003&r2=769004&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java
Mon Apr 27 14:32:42 2009
@@ -21,14 +21,11 @@
import java.util.Iterator;
import java.util.List;
-import javax.portlet.PortletRequest;
-
-import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.portlets.AdminPortletWebPage;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.profiler.ProfilerException;
import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.profiler.rules.RuleCriterion;
-import org.apache.wicket.RequestContext;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
@@ -36,7 +33,6 @@
import
org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import
org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
@@ -53,19 +49,15 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-public class WicketProfilerAdmin extends WebPage {
+public class WicketProfilerAdmin extends AdminPortletWebPage {
- List<ProfilingRule> rules;
protected ProfilingRule profilingRule;
public WicketProfilerAdmin() {
final RuleEditPanel ruleEditPanel = new RuleEditPanel("ruleEditPanel");
- rules = new ArrayList<ProfilingRule>(getProfiler().getRules());
-
Form rulesForm = new Form("rulesForm");
// list of existing rules
@@ -101,7 +93,7 @@
@Override
public void onSubmit() {
System.out.println("newRuleButton.onSubmit");
- Profiler profiler = getProfiler();
+ Profiler profiler = getServiceLocator().getProfiler();
try
{
Class defaultClass =
profiler.getClass().getClassLoader().loadClass("org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule");
@@ -135,16 +127,7 @@
public void setProfilingRule(ProfilingRule profilingRule) {
this.profilingRule = profilingRule;
}
-
- protected PortletRequest getPortletRequest() {
- return ((PortletRequestContext)
RequestContext.get()).getPortletRequest();
- }
-
- protected Profiler getProfiler() {
- return (Profiler)
getPortletRequest().getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT);
- }
-
-
+
/**
* A panel containing a link with a label.
*/
@@ -194,11 +177,11 @@
@Override
public void onSubmit() {
- Profiler profiler = getProfiler();
+ Profiler profiler = getServiceLocator().getProfiler();
try {
profiler.storeProfilingRule(profilingRule);
- if (!rules.contains(profilingRule)) {
- rules.add(profilingRule);
+ if (!getRules().contains(profilingRule)) {
+ getRules().add(profilingRule);
}
} catch (ProfilerException e) {
System.out.println("Failed to UPDATE: rule = " +
profilingRule.getId());
@@ -213,10 +196,10 @@
@Override
public void onSubmit() {
- Profiler profiler = getProfiler();
+ Profiler profiler = getServiceLocator().getProfiler();
try {
- if (rules.contains(profilingRule)) {
- rules.remove(profilingRule);
+ if (getRules().contains(profilingRule)) {
+ getRules().remove(profilingRule);
}
profiler.deleteProfilingRule(profilingRule);
profilingRule = null;
@@ -288,7 +271,7 @@
@Override
public void onSubmit() {
- Profiler profiler = getProfiler();
+ Profiler profiler = getServiceLocator().getProfiler();
try {
criterion = profiler.createRuleCriterion();
criterionEditPanel.setVisible(true);
@@ -419,7 +402,7 @@
profilingRule.getRuleCriteria().add(criterion);
}
try {
- Profiler profiler = getProfiler();
+ Profiler profiler =
getServiceLocator().getProfiler();
profiler.storeProfilingRule(profilingRule);
}
catch (ProfilerException e) {
@@ -439,7 +422,7 @@
profilingRule.getRuleCriteria().remove(criterion);
}
try {
- Profiler profiler = getProfiler();
+ Profiler profiler =
getServiceLocator().getProfiler();
profiler.storeProfilingRule(profilingRule);
}
catch (ProfilerException e) {
@@ -489,4 +472,14 @@
}
}
+
+ /**
+ * @return the rules
+ */
+ public List<ProfilingRule> getRules()
+ {
+ return new
ArrayList<ProfilingRule>(getServiceLocator().getProfiler().getRules());
+ }
+
+
}
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml?rev=769004&r1=769003&r2=769004&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
Mon Apr 27 14:32:42 2009
@@ -350,7 +350,11 @@
<description>This parameter sets the template used in help
mode.</description>
<name>HelpPage</name>
<value>/WEB-INF/view/profiler-help.html</value>
- </init-param>
+ </init-param>
+ <init-param>
+ <name>serviceComponentNames</name>
+ <value>cps:Profiler</value>
+ </init-param>
<init-param>
<name>portlet-icon</name>
<value>preferences-system.png</value>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
