Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3960 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . tools
|
From: <jbo...@li...> - 2006-04-25 14:01:12
|
Author: wrzep
Date: 2006-04-25 10:01:01 -0400 (Tue, 25 Apr 2006)
New Revision: 3960
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Log:
JBLAB-599
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -78,14 +78,14 @@
* @param pluginsRoot Node defining Plugins used in the Matrix
*/
public Status(String portalName, Node statusRoot, Node pluginsRoot,
- Node serviceRoot) {
+ org.jboss.shotoku.Node serviceNode) {
log = Logger.getLogger(this.getClass());
// Get configuration
projects = ProjectsHelper.getProjects(portalName);
List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot);
- ServiceConf serviceConf = new ServiceConf(serviceRoot);
+ ServiceConf serviceConf = new ServiceConf(serviceNode);
ScoresManager.init(portalName, serviceConf);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -42,7 +42,7 @@
addWatchedPath(key, Tools.getXmlCmPath(portalName));
addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName));
- addWatchedPath(key, Tools.getXmlServiceCmPath(portalName));
+ addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName));
/* Watch projects.xml file */
addWatchedPath(key, Tools.getProjectsXmlPath(portalName));
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -59,11 +59,11 @@
String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName);
Node pluginsRoot = getRoot(cm, pluginsPath);
- String servicePath = Tools.getXmlServiceCmPath(portalName);
- Node serviceRoot = getRoot(cm, servicePath);
+ String servicePath = Tools.getServicePropertiesCmPath(portalName);
+ org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath);
status = new Status(portalName, statusRoot, pluginsRoot,
- serviceRoot);
+ serviceNode);
fillContext();
@@ -94,7 +94,8 @@
return columnContexts.get(id);
}
- private Node getRoot(ContentManager cm, String path) throws IOException, SAXException, ResourceDoesNotExist {
+ private Node getRoot(ContentManager cm, String path)
+ throws IOException, SAXException, ResourceDoesNotExist {
DOMParser parser = new DOMParser();
parser.parse(new InputSource(cm.getNode(path).getContentInputStream()));
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -55,7 +55,7 @@
isRemote = serviceConf.isRemote();
System.out.println("remote: " + isRemote);
- properties = getServiceProperties();
+ properties = serviceConf.getProperties();
}
public static void save(Projects projects, List<PluginConf> pluginsConf)
@@ -142,17 +142,6 @@
* java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
* java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
* java.naming.provider.url=localhost:1099
+ * jnp.disableDiscovery=true
*/
-
- private static Properties getServiceProperties() {
-
- Properties props = new Properties();
-
- props.put(Context.INITIAL_CONTEXT_FACTORY,"org.jnp.interfaces.NamingContextFactory");
- props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- props.put(Context.PROVIDER_URL, "localhost:1099");
- props.put("jnp.disableDiscovery", true);
-
- return properties;
- }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -24,11 +24,9 @@
import java.util.Properties;
-import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.tools.Tags;
+import org.jboss.shotoku.Node;
-import org.w3c.dom.Node;
-
/**
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
@@ -40,34 +38,42 @@
public ServiceConf(Node serviceNode) {
- remoteService = parseRemote(serviceNode);
+ properties = parseProperties(serviceNode);
- properties = parseProperties(serviceNode);
+ String remoteString = (String) properties.get(Tags.SERVICE_REMOTE_ELEMENT);
+ remoteService = remoteString.equals("true");
+
+ System.out.println("remote " + remoteService + "\n props: " + properties);
}
public boolean isRemote() {
return remoteService;
}
- private boolean parseRemote(Node serviceNode) {
-
- String remoteServiceString =
- XmlTools.getChildNodeValue(serviceNode,
- Tags.SERVICE_REMOTE_ELEMENT);
-
- if (remoteServiceString != null) {
- return (remoteServiceString == "true");
- }
-
- return false;
+ public Properties getProperties() {
+ return properties;
}
private Properties parseProperties(Node serviceNode) {
- Node propsNode =
- XmlTools.getFirstNodeWithName(serviceNode,
- Tags.SERVICE_PROPERTIES_ELEMENT);
+ if (serviceNode == null) {
+ return null;
+ }
- return XmlTools.parseProperties(propsNode);
+ Properties props = new Properties();
+
+ String propsString = serviceNode.getContent();
+ String[] propsArr = propsString.split("\n");
+
+ for (String propString : propsArr) {
+
+ String[] propArr = propString.split("=");
+ if ((propArr != null) && (propArr.length == 2)) {
+ props.put(propArr[0], propArr[1]);
+ }
+
+ }
+
+ return props;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -57,8 +57,7 @@
public static final String METRIC_PLUGIN_ELEMENT = "plugin";
/* service.xml tags */
- public static final String SERVICE_REMOTE_ELEMENT = "remote";
- public static final String SERVICE_PROPERTIES_ELEMENT = "properties";
+ public static final String SERVICE_REMOTE_ELEMENT = "service.remote";
/* plugins.xml tags */
public final static String PLUGIN_ELEMENT = "plugin";
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -22,7 +22,7 @@
/** <code>STATUS_XML<code> - file defining the list of watched feeds */
private final static String STATUS_XML = "status.xml";
private final static String STATUS_PLUGINS_XML = "plugins.xml";
- private final static String STATUS_SERVICE_XML = "service.xml";
+ private final static String STATUS_SERVICE_PROPERTIES = "service.properties";
/** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */
private final static String STATUS_DIR = "status";
@@ -63,8 +63,8 @@
/**
* Path to the xml file defining ejb3 service.
*/
- public static String getXmlServiceCmPath(String portalName) {
- return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_XML;
+ public static String getServicePropertiesCmPath(String portalName) {
+ return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_PROPERTIES;
}
/**
|
