You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2011/03/16 18:14:55 UTC
svn commit: r1082220 - in /oodt/trunk: CHANGES.txt pushpull/pom.xml
pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java
Author: bfoster
Date: Wed Mar 16 17:14:55 2011
New Revision: 1082220
URL: http://svn.apache.org/viewvc?rev=1082220&view=rev
Log:
- updated nekohtml version to 1.9.6.2
- updated getTextContext() to use oodt-commons XMLUtils.getSimpleElementText()
---------------------
OODT-161
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/pushpull/pom.xml
oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1082220&r1=1082219&r2=1082220&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Mar 16 17:14:55 2011
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-161 PushPull getTextContext()/getNode() value still poses an issue for some JVMs (bfoster)
+
* OODT-159 Dynamic Queue/Node was not added to command-line usage printout (bfoster)
* OODT-152 Fixed website and download page. Reverted back
Modified: oodt/trunk/pushpull/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/pom.xml?rev=1082220&r1=1082219&r2=1082220&view=diff
==============================================================================
--- oodt/trunk/pushpull/pom.xml (original)
+++ oodt/trunk/pushpull/pom.xml Wed Mar 16 17:14:55 2011
@@ -168,7 +168,7 @@
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>0.9.5</version>
+ <version>1.9.6.2</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
Modified: oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java?rev=1082220&r1=1082219&r2=1082220&view=diff
==============================================================================
--- oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java (original)
+++ oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java Wed Mar 16 17:14:55 2011
@@ -311,14 +311,14 @@ public class RemoteSpecs implements Conf
// determine what element type it is
if (node.getNodeName().equals(USERNAME_TAG)) {
- username = PathUtils.replaceEnvVariables(node
- .getTextContent());
+ username = PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true));
} else if (node.getNodeName().equals(PASSWORD_TAG)) {
- password = PathUtils.replaceEnvVariables(node
- .getTextContent());
+ password = PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true));
} else if (node.getNodeName().equals(CD_TEST_DIR_TAG)) {
- cdTestDir = PathUtils.replaceEnvVariables(node
- .getTextContent());
+ cdTestDir = PathUtils.replaceEnvVariables(
+ XMLUtils.getSimpleElementText((Element) node, true));
}
}
Modified: oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java?rev=1082220&r1=1082219&r2=1082220&view=diff
==============================================================================
--- oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java (original)
+++ oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/filerestrictions/parsers/DirStructXmlParser.java Wed Mar 16 17:14:55 2011
@@ -27,6 +27,7 @@ import org.apache.oodt.cas.pushpull.exce
import org.apache.oodt.cas.pushpull.expressions.GlobalVariables;
import org.apache.oodt.cas.pushpull.expressions.Method;
import org.apache.oodt.cas.pushpull.expressions.Variable;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.FileInputStream;
@@ -222,12 +223,13 @@ public class DirStructXmlParser implemen
// get the Variable's name
if (child.getNodeName().equals("type")) {
- type = child.getTextContent().toLowerCase();
+ type = XMLUtils.getSimpleElementText((Element) child,
+ true).toLowerCase();
// get the Variable's value
} else if (child.getNodeName().equals("value")) {
- value = PathUtils.doDynamicReplacement(child
- .getTextContent());
+ value = PathUtils.doDynamicReplacement(XMLUtils
+ .getSimpleElementText((Element) child, false));
// get the Variable's value's precision infomation
} else if (child.getNodeName().equals("precision")) {
@@ -236,20 +238,21 @@ public class DirStructXmlParser implemen
Node grandChild = grandChildren.item(k);
// get the precision
if (grandChild.getNodeName().equals("locations")) {
- variable.setPrecision(Integer
- .parseInt(grandChild.getTextContent()));
+ variable.setPrecision(Integer.parseInt(XMLUtils
+ .getSimpleElementText((Element) grandChild, true)));
// get the fill character to meet the precision
// [optional]
} else if (grandChild.getNodeName().equals("fill")) {
- variable.setFillString(grandChild
- .getTextContent());
+ variable.setFillString(
+ XMLUtils.getSimpleElementText((Element) grandChild, false));
// get the side for which the fill character
// will be applied [optional]
} else if (grandChild.getNodeName().equals("side")) {
- variable.setFillSide((grandChild
- .getTextContent().toLowerCase()
- .equals("front")) ? variable.FILL_FRONT
- : variable.FILL_BACK);
+ variable.setFillSide(
+ (XMLUtils.getSimpleElementText((Element) grandChild, true)
+ .toLowerCase().equals("front"))
+ ? variable.FILL_FRONT
+ : variable.FILL_BACK);
}
}
}
@@ -285,7 +288,8 @@ public class DirStructXmlParser implemen
// get the Method's behavoir
if (child.getNodeName().equals("action")) {
- method.setBehavoir(child.getTextContent());
+ method.setBehavoir(XMLUtils.getSimpleElementText(
+ (Element) child, false));
// get the Method's arguments
} else if (child.getNodeName().equals("args")) {
@@ -310,8 +314,9 @@ public class DirStructXmlParser implemen
.item(l);
if (greatGrandChild.getNodeName().equals(
"type")) {
- argType = greatGrandChild
- .getTextContent();
+ argType = XMLUtils.getSimpleElementText(
+ (Element) greatGrandChild,
+ true);
}
}