[jboss-svn-commits] JBL Code SVN: r14828 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 3 07:16:14 EDT 2007
Author: adamw
Date: 2007-09-03 07:16:14 -0400 (Mon, 03 Sep 2007)
New Revision: 14828
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java
labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java
Log:
Initial values; removing adminsitrated services
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -3,6 +3,7 @@
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.ContentManager;
import org.jboss.logging.Logger;
@@ -28,8 +29,8 @@
return ret;
}
- public Properties init(String key) {
- return getProperties(key);
+ public ValueInit<Properties> init(String key) {
+ return ValueInit.realValue(getProperties(key));
}
protected ValueChange<Properties> update(String key, Properties currentObject, Map<String, ChangeType> changes) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -29,6 +29,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
/**
* DownloadCounterWatcher class which implements NodeWatcher interface
@@ -70,7 +71,7 @@
return ValueChange.changeTo(getDescriptor(key));
}
- public DownloadCountersDescriptor init(String key) {
- return getDescriptor(key);
+ public ValueInit<DownloadCountersDescriptor> init(String key) {
+ return ValueInit.realValue(getDescriptor(key));
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -25,6 +25,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import java.io.Serializable;
import java.util.Map;
@@ -48,8 +49,8 @@
return pd;
}
- public ProjectsDescriptor init(String key) {
- return getProjectsDescriptor(key);
+ public ValueInit<ProjectsDescriptor> init(String key) {
+ return ValueInit.realValue(getProjectsDescriptor(key));
}
protected ValueChange<ProjectsDescriptor> update(String key, ProjectsDescriptor currentObject,
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -24,6 +24,7 @@
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import java.util.Map;
@@ -33,11 +34,11 @@
return new ConDescriptor(getContentManager(key));
}
- public ConDescriptor init(String key) {
+ public ValueInit<ConDescriptor> init(String key) {
addWatchedPath(key, ConServer.AGREEMENTS_XML);
addWatchedPath(key, ConServer.UNCONFIRMED_XML);
- return getDesc(key);
+ return ValueInit.realValue(getDesc(key));
}
protected ValueChange<ConDescriptor> update(String key, ConDescriptor currentObject, Map changes) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -2,6 +2,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.forge.common.projects.portlets.ProjectsPortlets;
import org.apache.log4j.Logger;
@@ -47,8 +48,8 @@
return ValueChange.changeTo(parseProjectsPortlets(key));
}
- public ProjectsPortlets init(String key) {
+ public ValueInit<ProjectsPortlets> init(String key) {
addWatchedPath(key, CONFIGURATION_PATH);
- return parseProjectsPortlets(key);
+ return ValueInit.realValue(parseProjectsPortlets(key));
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -28,6 +28,7 @@
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.tools.Pair;
/**
@@ -37,12 +38,12 @@
protected final static Logger log = Logger.getLogger(LabsKosmosJiraWatcher.class);
- public LabsKosmosJiraDescriptor init(Pair<String,String> key) {
+ public ValueInit<? extends LabsKosmosJiraDescriptor> init(Pair<String,String> key) {
try {
- return getDesc(key);
+ return ValueInit.realValue(getDesc(key));
} catch (Exception e) {
log.warn("Unable to init", e);
- return null;
+ return ValueInit.realValue(null);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -28,6 +28,7 @@
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.tools.Pair;
/**
@@ -37,12 +38,12 @@
protected final static Logger log = Logger.getLogger(LabsKosmosSvnWatcher.class);
- public LabsKosmosSvnDescriptor init(Pair<String,String> key) {
+ public ValueInit<? extends LabsKosmosSvnDescriptor> init(Pair<String,String> key) {
try {
- return getDesc(key);
+ return ValueInit.realValue(getDesc(key));
} catch (KosmosException e) {
log.warn("Unable to init", e);
- return null;
+ return ValueInit.realValue(null);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -27,6 +27,7 @@
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.tools.Pair;
/**
@@ -36,13 +37,13 @@
public class PodcastConfWatcher extends
ShotokuResourceWatcher<Pair<String,String>, PodcastDescriptor> {
- public PodcastDescriptor init(Pair<String, String> key) {
+ public ValueInit<? extends PodcastDescriptor> init(Pair<String, String> key) {
String portalName = key.getFirst();
addWatchedPath(key, PodcastLocations.getXmlCmPath(portalName));
- return new DummyPodcastDescriptor();
+ return ValueInit.dummyValue(new DummyPodcastDescriptor());
//return getDesc(key);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -12,6 +12,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -32,10 +33,10 @@
return ValueChange.changeTo(parseConfiguration(key));
}
- public List<String> init(String key) {
+ public ValueInit<List<String>> init(String key) {
addWatchedPath(key, getPath(key));
- return parseConfiguration(key);
+ return ValueInit.realValue(parseConfiguration(key));
}
private List<String> parseConfiguration(String key) {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -41,6 +41,7 @@
import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.exceptions.DeleteException;
import org.jboss.shotoku.exceptions.NameFormatException;
import org.jboss.shotoku.exceptions.RepositoryException;
@@ -665,10 +666,10 @@
return ValueChange.noChange();
}
- public String init(String key) {
+ public ValueInit<String> init(String key) {
addWatchedPath(key, keyBase.substring(getLangCode().length()));
- return "not changed";
+ return ValueInit.realValue("not changed");
}
protected ContentManager initContentManager(String key) {
Modified: labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -4,6 +4,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.forge.common.projects.ProjectsHelper;
import java.util.Map;
@@ -17,8 +18,8 @@
return ValueChange.changeTo(getDescriptor(key));
}
- public PollsDescriptor init(Pair<String, String> key) {
- return getDescriptor(key);
+ public ValueInit<PollsDescriptor> init(Pair<String, String> key) {
+ return ValueInit.realValue(getDescriptor(key));
}
/**
Modified: labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java 2007-09-03 11:00:08 UTC (rev 14827)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java 2007-09-03 11:16:14 UTC (rev 14828)
@@ -3,6 +3,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ValueChange;
+import org.jboss.shotoku.cache.ValueInit;
import org.jboss.shotoku.tools.Pair;
import java.util.Map;
@@ -15,9 +16,9 @@
return ValueChange.changeTo(new PrimatesDescriptor(key.getFirst(), getContentManager(key)));
}
- public PrimatesDescriptor init(Pair<String, String> key) {
+ public ValueInit<PrimatesDescriptor> init(Pair<String, String> key) {
PrimatesDescriptor desc = new PrimatesDescriptor(key.getFirst(), getContentManager(key));
addWatchedPath(key, PrimatesTools.getXmlCmPath(key.getFirst()));
- return desc;
+ return ValueInit.realValue(desc);
}
}
More information about the jboss-svn-commits
mailing list