You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by cm...@apache.org on 2012/06/28 15:07:07 UTC
git commit: WICKET-4617 fix jmx resource settings
Updated Branches:
refs/heads/sandbox/resourcefinder a10b71187 -> 5032891ac
WICKET-4617 fix jmx resource settings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5032891a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5032891a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5032891a
Branch: refs/heads/sandbox/resourcefinder
Commit: 5032891aca7d4e0f0b865e3ea46d0ca2697536a9
Parents: a10b711
Author: Carl-Eric Menzel <cm...@wicketbuch.de>
Authored: Thu Jun 28 15:06:43 2012 +0200
Committer: Carl-Eric Menzel <cm...@wicketbuch.de>
Committed: Thu Jun 28 15:06:43 2012 +0200
----------------------------------------------------------------------
.../org/apache/wicket/jmx/ResourceSettings.java | 12 +++++++++---
.../apache/wicket/jmx/ResourceSettingsMBean.java | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5032891a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
index 2b97815..970adc4 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
@@ -20,6 +20,7 @@ import java.util.List;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.resource.loader.IStringResourceLoader;
+import org.apache.wicket.util.file.IResourceFinder;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.time.Duration;
@@ -65,7 +66,7 @@ public class ResourceSettings implements ResourceSettingsMBean
public String getPropertiesFactory()
{
ThreadContext.setApplication(application);
-
+
try
{
return Stringz.className(application.getResourceSettings().getPropertiesFactory());
@@ -79,9 +80,14 @@ public class ResourceSettings implements ResourceSettingsMBean
/**
* {@inheritDoc}
*/
- public String getResourceFinder()
+ public String getResourceFinders()
{
- return Stringz.className(application.getResourceSettings().getResourceFinders());
+ StringBuilder builder = new StringBuilder();
+ for (IResourceFinder rf : application.getResourceSettings().getResourceFinders())
+ {
+ builder.append(Stringz.className(rf));
+ }
+ return builder.toString();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/5032891a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java
index ecdd6bb..a7695fd 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettingsMBean.java
@@ -55,7 +55,7 @@ public interface ResourceSettingsMBean
* @return Returns the resourceFinder.
* @see IResourceSettings#setResourceFinder(IResourceFinder)
*/
- String getResourceFinder();
+ String getResourceFinders();
/**
* @return Returns the resourcePollFrequency.