Author: bfoster
Date: Mon Dec 13 17:20:10 2010
New Revision: 1045238
URL: http://svn.apache.org/viewvc?rev=1045238&view=rev
Log:
- resource manager's node ip addresses are now envReplace-able
-----------------
OODT-82
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
oodt/trunk/resource/src/main/resources/examples/nodes.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1045238&r1=1045237&r2=1045238&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Mon Dec 13 17:20:10 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.2 (Current Development)
--------------------------------------------
+* OODT-82 Make resource manager's node ip addresses envReplace-able (bfoster)
+
* OODT-83 the artifactid for pushpull should change to cas-pushpull (Faranak
Davoodi via mattmann)
* OODT-76 Commons TimeEventWeightedHash throws a StackOverthrow Error when
epsilon is large and event duration is small (bfoster)
Modified:
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java?rev=1045238&r1=1045237&r2=1045238&view=diff
==============================================================================
---
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
(original)
+++
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
Mon Dec 13 17:20:10 2010
@@ -30,6 +30,7 @@ import org.w3c.dom.Element;
//OODT imports
import org.apache.oodt.commons.xml.XMLUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.cas.resource.structs.Job;
import org.apache.oodt.cas.resource.structs.JobInput;
import org.apache.oodt.cas.resource.structs.JobSpec;
@@ -37,6 +38,7 @@ import org.apache.oodt.cas.resource.stru
/**
* @author woollard
+ * @author bfoster
* @version $Revsion$
*
* <p>
@@ -64,7 +66,10 @@ public final class XmlStructFactory {
try {
id = resourceNodeRoot.getAttribute("nodeId");
- ip = new URL(resourceNodeRoot.getAttribute("ip"));
+ ip = new URL(Boolean.parseBoolean(resourceNodeRoot
+ .getAttribute("envReplace")) ? PathUtils
+
.doDynamicReplacement(resourceNodeRoot.getAttribute("ip"))
+ : resourceNodeRoot.getAttribute("ip"));
capacity = new Integer(resourceNodeRoot.getAttribute("capacity"))
.intValue();
} catch (Exception e) {
Modified: oodt/trunk/resource/src/main/resources/examples/nodes.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/resources/examples/nodes.xml?rev=1045238&r1=1045237&r2=1045238&view=diff
==============================================================================
--- oodt/trunk/resource/src/main/resources/examples/nodes.xml (original)
+++ oodt/trunk/resource/src/main/resources/examples/nodes.xml Mon Dec 13
17:20:10 2010
@@ -17,4 +17,7 @@ the License.
-->
<cas:resourcenodes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas";>
<node nodeId="localhost" ip="http://localhost:2001"; capacity="8"/>
+ <!-- EnvReplace Example
+ <node nodeId="somehost" ip="http://somehost:[BATCH_STUB_PORT]";
capacity="8" envReplace="true"/>
+ -->
</cas:resourcenodes>
