Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 46158 invoked from network); 29 Apr 2009 12:06:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Apr 2009 12:06:41 -0000 Received: (qmail 31231 invoked by uid 500); 29 Apr 2009 12:06:40 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 31183 invoked by uid 500); 29 Apr 2009 12:06:40 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 31173 invoked by uid 99); 29 Apr 2009 12:06:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2009 12:06:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2009 12:06:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C829A238896D; Wed, 29 Apr 2009 12:06:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r769766 - in /portals/jetspeed-2/applications/j2-admin/trunk: ./ src/main/java/org/apache/jetspeed/portlets/profiler/ src/main/java/org/apache/jetspeed/portlets/profiler/resources/ Date: Wed, 29 Apr 2009 12:06:15 -0000 To: jetspeed-dev@portals.apache.org From: vkumar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090429120616.C829A238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vkumar Date: Wed Apr 29 12:06:13 2009 New Revision: 769766 URL: http://svn.apache.org/viewvc?rev=769766&view=rev Log: Fixing issue http://issues.apache.org/jira/browse/JS2-486 Adding multilingual support portlet Removing old JSF code Removing JSF bridge dependency from j2-admin Removed: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/ProfilerAdminPortlet.java Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html 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/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdminApplication.java portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources.properties portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources_en.properties Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=769766&r1=769765&r2=769766&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Wed Apr 29 12:06:13 2009 @@ -71,7 +71,6 @@ 2.2-SNAPSHOT 1.0.4 1.0.4 - 1.0.4 1.0.4 1.0.4 1.0-SNAPSHOT @@ -180,17 +179,6 @@ org.apache.portals.bridges - portals-bridges-jsf - ${org.apache.portals.bridges.jsf.version} - - - commons-logging - commons-logging - - - - - org.apache.portals.bridges portals-bridges-portletfilter ${org.apache.portals.bridges.portletfilter.version} Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin%24RuleEditPanel%24CriterionEditPanel.html?rev=769766&r1=769765&r2=769766&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html Wed Apr 29 12:06:13 2009 @@ -71,8 +71,8 @@ - - + + Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin%24RuleEditPanel.html?rev=769766&r1=769765&r2=769766&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html Wed Apr 29 12:06:13 2009 @@ -52,12 +52,12 @@ rule criteria
- +
criterionEditPanel
- - + + 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=769766&r1=769765&r2=769766&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 Wed Apr 29 12:06:13 2009 @@ -49,6 +49,9 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.ResourceModel; +import org.apache.wicket.validation.IValidatable; +import org.apache.wicket.validation.validator.AbstractValidator; public class WicketProfilerAdmin extends AdminPortletWebPage { @@ -88,11 +91,10 @@ add(rulesForm); // button the create a new rule - Button newRuleButton = new Button("newRuleButton") { + Button newRuleButton = new Button("newRuleButton", new ResourceModel("profiler.rule.new")) { @Override public void onSubmit() { - System.out.println("newRuleButton.onSubmit"); Profiler profiler = getServiceLocator().getProfiler(); try { @@ -104,7 +106,7 @@ } catch (Exception e) { - System.out.println("Failed to CREATE NEW: rule = " + profilingRule.getId()); + e.printStackTrace(); // TODO add error message to feedback panel } } @@ -162,18 +164,20 @@ FeedbackPanel feedbackPanel = new FeedbackPanel("feedbackPanel"); ruleEditForm.add(feedbackPanel); - ruleEditForm.add(new Label("ruleIdLabel", "Rule ID")); - ruleEditForm.add(new Label("ruleTitleLabel", "Rule Title")); - ruleEditForm.add(new Label("ruleClassLabel", "Rule Class")); + ruleEditForm.add(new Label("ruleIdLabel", new ResourceModel("profiler.rule.id"))); + ruleEditForm.add(new Label("ruleTitleLabel", new ResourceModel("profiler.rule.title"))); + ruleEditForm.add(new Label("ruleClassLabel", new ResourceModel("profiler.rule.class"))); ruleIdField = new TextField("ruleIdField", new PropertyModel(WicketProfilerAdmin.this, "profilingRule.id")); ruleIdField.setRequired(true); + ruleIdField.add(new ProfileRuleValidator()); + TextField ruleTitleField = new TextField("ruleTitleField", new PropertyModel(WicketProfilerAdmin.this, "profilingRule.title")); DropDownChoice ruleClassField = new DropDownChoice("ruleClassField", classNames); ruleClassField.setModel(new PropertyModel(WicketProfilerAdmin.this, "profilingRule.classname")); - Button ruleSaveButton = new Button("ruleSaveButton") { + Button ruleSaveButton = new Button("ruleSaveButton", new ResourceModel("profiler.rule.save")) { @Override public void onSubmit() { @@ -192,7 +196,7 @@ }; - Button ruleRemoveButton = new Button("ruleRemoveButton") { + Button ruleRemoveButton = new Button("ruleRemoveButton", new ResourceModel("profiler.rule.remove")) { @Override public void onSubmit() { @@ -222,7 +226,7 @@ // the list of criteria for the selected rule - ruleEditForm.add(new Label("ruleCriteriaLabel", "Rule Criteria")); + ruleEditForm.add(new Label("ruleCriteriaLabel",new ResourceModel("criteria.title"))); SortableDataProvider dataProvider = new SortableDataProvider() { @@ -267,7 +271,7 @@ ruleCriteriaTable.addBottomToolbar(new NavigationToolbar(ruleCriteriaTable)); ruleEditForm.add(ruleCriteriaTable); - Button newCriterionButton = new Button("newCriterionButton") { + Button newCriterionButton = new Button("newCriterionButton",new ResourceModel("criteria.new")) { @Override public void onSubmit() { @@ -357,11 +361,11 @@ FeedbackPanel feedbackPanel = new FeedbackPanel("feedbackPanel"); criterionEditForm.add(feedbackPanel); - criterionEditForm.add(new Label("criterionNameLabel", "Name")); - criterionEditForm.add(new Label("criterionValueLabel", "Value")); - criterionEditForm.add(new Label("criterionResolverTypeLabel", "Resolver Type")); - criterionEditForm.add(new Label("criterionFallbackLabel", "Fallback")); - criterionEditForm.add(new Label("criterionOrderLabel", "Order")); + criterionEditForm.add(new Label("criterionNameLabel", new ResourceModel("criterion.name"))); + criterionEditForm.add(new Label("criterionValueLabel", new ResourceModel("criterion.value"))); + criterionEditForm.add(new Label("criterionResolverTypeLabel", new ResourceModel("criterion.resolver"))); + criterionEditForm.add(new Label("criterionFallbackLabel", new ResourceModel("criterion.fallback.type"))); + criterionEditForm.add(new Label("criterionOrderLabel", new ResourceModel("criterion.fallback.order"))); TextField criterionNameField = new TextField("criterionNameField", new PropertyModel(RuleEditPanel.this, "criterion.name")); criterionNameField.setRequired(true); @@ -385,7 +389,7 @@ criterionEditForm.add(criterionFallbackField); criterionEditForm.add(criterionOrderField); - Button saveCriterionButton = new Button("saveCriterionButton") { + Button saveCriterionButton = new Button("saveCriterionButton",new ResourceModel("profiler.rule.save")) { @Override public void onSubmit() { @@ -414,7 +418,7 @@ }; - Button removeCriterionButton = new Button("removeCriterionButton") { + Button removeCriterionButton = new Button("removeCriterionButton",new ResourceModel("criteria.remove")) { @Override public void onSubmit() { @@ -481,5 +485,18 @@ return new ArrayList(getServiceLocator().getProfiler().getRules()); } - + private class ProfileRuleValidator extends AbstractValidator{ + //private static final String ERROR_KEY = "rule.exits"; + @Override + protected void onValidate(IValidatable validatable) + { + String ruleName = (String)validatable.getValue(); + if(getServiceLocator().getProfiler().getRule(ruleName)!=null) + { + error(validatable); + } + } + + + } } Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdminApplication.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdminApplication.java?rev=769766&r1=769765&r2=769766&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdminApplication.java (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdminApplication.java Wed Apr 29 12:06:13 2009 @@ -1,12 +1,19 @@ package org.apache.jetspeed.portlets.profiler; import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication; +import org.apache.wicket.resource.loader.BundleStringResourceLoader; -public class WicketProfilerAdminApplication extends AbstractAdminWebApplication { - +public class WicketProfilerAdminApplication extends AbstractAdminWebApplication +{ @Override - public Class getHomePage() { + public Class getHomePage() + { return WicketProfilerAdmin.class; } + @Override + protected void init() + { + getResourceSettings().addStringResourceLoader(new BundleStringResourceLoader("org.apache.jetspeed.portlets.profiler.resources.ProfilerResources")); + } } Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources.properties?rev=769766&r1=769765&r2=769766&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources.properties Wed Apr 29 12:06:13 2009 @@ -30,4 +30,5 @@ criterion.value=Value criterion.fallback.order=Order criterion.resolver=Resolver Type -criterion.fallback.type=Fallback \ No newline at end of file +criterion.fallback.type=Fallback +WicketProfilerAdmin$ProfileRuleValidator= Rule already exits \ No newline at end of file Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources_en.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources_en.properties?rev=769766&r1=769765&r2=769766&view=diff ============================================================================== --- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources_en.properties (original) +++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/resources/ProfilerResources_en.properties Wed Apr 29 12:06:13 2009 @@ -30,4 +30,5 @@ criterion.value=Value criterion.fallback.order=Order criterion.resolver=Resolver Type -criterion.fallback.type=Fallback \ No newline at end of file +criterion.fallback.type=Fallback +WicketProfilerAdmin$ProfileRuleValidator= Rule already exits \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org