diff --git a/extensions/transformiix/source/base/NamedMap.cpp b/extensions/transformiix/source/base/NamedMap.cpp
index 483b29673ea0..56cc21168ffc 100644
--- a/extensions/transformiix/source/base/NamedMap.cpp
+++ b/extensions/transformiix/source/base/NamedMap.cpp
@@ -25,13 +25,13 @@
  *    -- fixed memory leak in NamedMap::hashKey method by deleting
  *       up char[] chars;
  *
- * $Id: NamedMap.cpp,v 1.7 2001/04/08 14:36:06 peterv%netscape.com Exp $
+ * $Id: NamedMap.cpp,v 1.8 2001/06/20 06:00:31 margaret.chan%sun.com Exp $
  */
 
 /**
  * A Named Map for TxObjects
  * @author <a href="kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.7 $ $Date: 2001/04/08 14:36:06 $
+ * @version $Revision: 1.8 $ $Date: 2001/06/20 06:00:31 $
 **/
 
 #include "NamedMap.h"
@@ -122,8 +122,8 @@ void NamedMap::clear(MBool deleteObjects) {
 } //-- clear
 
 void NamedMap::dumpMap() {
-
-
+#if 0
+    // XXX DEBUG OUTPUT
     cout << "#NamedMap -------- { "<<endl;
 
     for (int i = 0; i < numberOfBuckets; i++) {
@@ -143,6 +143,7 @@ void NamedMap::dumpMap() {
         cout << "}"<<endl;
     }
     cout <<"} #NamedMap"<<endl;
+#endif
 } //-- dumpMap
 
 /**
diff --git a/extensions/transformiix/source/base/SimpleErrorObserver.cpp b/extensions/transformiix/source/base/SimpleErrorObserver.cpp
index 21c73c2c685b..b1ce72b7a60a 100644
--- a/extensions/transformiix/source/base/SimpleErrorObserver.cpp
+++ b/extensions/transformiix/source/base/SimpleErrorObserver.cpp
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: SimpleErrorObserver.cpp,v 1.2 1999/11/15 07:12:41 nisheeth%netscape.com Exp $
+ * $Id: SimpleErrorObserver.cpp,v 1.3 2001/06/20 06:00:31 margaret.chan%sun.com Exp $
  */
 
 #include "ErrorObserver.h"
@@ -31,7 +31,9 @@
  * All errors will be printed to the console (cout).
 **/
 SimpleErrorObserver::SimpleErrorObserver() {
+#ifdef TX_EXE
     errStream = &cout;
+#endif
     hideWarnings = MB_FALSE;
 } //-- SimpleErrorObserver
 
@@ -49,16 +51,17 @@ SimpleErrorObserver::SimpleErrorObserver(ostream& errStream) {
  *  level of NORMAL
 **/
 void SimpleErrorObserver::recieveError(String& errorMessage) {
+#ifdef TX_EXE
     *errStream << "error: " << errorMessage << endl;
     errStream->flush();
+#endif
 } //-- recieveError
 
 /**
  *  Notifies this Error observer of a new error using the given error level
 **/
 void SimpleErrorObserver::recieveError(String& errorMessage, ErrorLevel level) {
-
-
+#ifdef TX_EXE
     switch ( level ) {
         case ErrorObserver::FATAL :
             *errStream << "fatal error: ";
@@ -74,9 +77,9 @@ void SimpleErrorObserver::recieveError(String& errorMessage, ErrorLevel level) {
 
     *errStream << errorMessage << endl;
     errStream->flush();
+#endif
 } //-- recieveError
 
 void SimpleErrorObserver::supressWarnings(MBool supress) {
     this->hideWarnings = supress;
 } //-- supressWarnings
-
diff --git a/extensions/transformiix/source/xpath/ExprParser.cpp b/extensions/transformiix/source/xpath/ExprParser.cpp
index a39fed219d6e..b85126425cd6 100644
--- a/extensions/transformiix/source/xpath/ExprParser.cpp
+++ b/extensions/transformiix/source/xpath/ExprParser.cpp
@@ -30,7 +30,7 @@
  *   -- fixed bug in ::parsePredicates,
  *      made sure we continue looking for more predicates.
  *
- * $Id: ExprParser.cpp,v 1.11 2001/05/12 11:59:59 peterv%netscape.com Exp $
+ * $Id: ExprParser.cpp,v 1.12 2001/06/20 06:00:32 margaret.chan%sun.com Exp $
  */
 
 /**
@@ -38,7 +38,7 @@
  * This class is used to parse XSL Expressions
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
  * @see ExprLexer
- * @version $Revision: 1.11 $ $Date: 2001/05/12 11:59:59 $
+ * @version $Revision: 1.12 $ $Date: 2001/06/20 06:00:32 $
 **/
 
 #include "ExprParser.h"
@@ -615,10 +615,11 @@ LocationStep* ExprParser::createLocationStep(ExprLexer& lexer) {
  *
 **/
 NodeExpr* ExprParser::createNodeExpr(ExprLexer& lexer) {
-
-    //cout << "creating NodeExpr: "<<endl;
-    if (!lexer.hasMoreTokens() )  cout << "Lexer has no Tokens"<<endl;
-
+#if 0
+    // XXX DEBUG OUTPUT
+    cout << "creating NodeExpr: "<<endl;
+    if (!lexer.hasMoreTokens() ) cout << "Lexer has no Tokens"<<endl;
+#endif
     if (!lexer.hasMoreTokens() )  return 0;
 
     NodeExpr* nodeExpr = 0;
@@ -734,7 +735,10 @@ PatternExpr* ExprParser::createPatternExpr(ExprLexer& lexer) {
         pExpr = createFilterExpr(lexer);
     }
     else {
+#if 0
+        // XXX DEBUG OUTPUT
         cout << "invalid token: " << tok->value << endl;
+#endif
         //-- eat token for now
         lexer.nextToken();
     }
diff --git a/extensions/transformiix/source/xpath/LocationStep.cpp b/extensions/transformiix/source/xpath/LocationStep.cpp
index d2105becbf9b..83d097039afe 100644
--- a/extensions/transformiix/source/xpath/LocationStep.cpp
+++ b/extensions/transformiix/source/xpath/LocationStep.cpp
@@ -21,12 +21,12 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: LocationStep.cpp,v 1.6 2001/05/14 14:22:47 axel%pike.org Exp $
+ * $Id: LocationStep.cpp,v 1.7 2001/06/20 06:00:33 margaret.chan%sun.com Exp $
  */
 
 /*
   Implementation of an XPath LocationStep
-  @version $Revision: 1.6 $ $Date: 2001/05/14 14:22:47 $
+  @version $Revision: 1.7 $ $Date: 2001/06/20 06:00:33 $
 */
 
 #include "Expr.h"
@@ -170,7 +170,10 @@ ExprResult* LocationStep::evaluate(Node* context, ContextState* cs) {
             }
             break;
         case NAMESPACE_AXIS : //-- not yet implemented
+#if 0
+            // XXX DEBUG OUTPUT
             cout << "namespace axis not yet implemented"<<endl;
+#endif
             break;
         case PARENT_AXIS :
         {
diff --git a/extensions/transformiix/source/xpath/PredicateList.cpp b/extensions/transformiix/source/xpath/PredicateList.cpp
index 406a54f8e3ef..cb28b07f898b 100644
--- a/extensions/transformiix/source/xpath/PredicateList.cpp
+++ b/extensions/transformiix/source/xpath/PredicateList.cpp
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: PredicateList.cpp,v 1.2 2001/04/03 12:36:07 peterv%netscape.com Exp $
+ * $Id: PredicateList.cpp,v 1.3 2001/06/20 06:00:33 margaret.chan%sun.com Exp $
  */
 
 #include "Expr.h"
@@ -30,7 +30,7 @@
  * Represents an ordered list of Predicates,
  * for use with Step and Filter Expressions
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.2 $ $Date: 2001/04/03 12:36:07 $
+ * @version $Revision: 1.3 $ $Date: 2001/06/20 06:00:33 $
 **/
 //-- PredicateList Implementation --/
 
@@ -82,7 +82,10 @@ void PredicateList::evaluatePredicates(NodeSet* nodes, ContextState* cs) {
             //-- then we can keep it, otherwise add to remove list
             ExprResult* exprResult = expr->evaluate(node,cs);
             if ( !exprResult ) {
+#if 0
+                // XXX DEBUG OUTPUT
                 cout << "ExprResult == null" << endl;
+#endif
             }
             else {
                 switch(exprResult->getResultType()) {
diff --git a/extensions/transformiix/source/xslt/ProcessorState.cpp b/extensions/transformiix/source/xslt/ProcessorState.cpp
index 983e97f5d276..5dcda1e505a7 100644
--- a/extensions/transformiix/source/xslt/ProcessorState.cpp
+++ b/extensions/transformiix/source/xslt/ProcessorState.cpp
@@ -30,7 +30,7 @@
 /**
  * Implementation of ProcessorState
  * Much of this code was ported from XSL:P
- * @version $Revision: 1.29 $ $Date: 2001/06/10 16:41:35 $
+ * @version $Revision: 1.30 $ $Date: 2001/06/20 06:00:35 $
 **/
 
 #include "ProcessorState.h"
@@ -126,7 +126,10 @@ void ProcessorState::addAttributeSet(Element* attributeSet) {
     if ( !attributeSet ) return;
     String name = attributeSet->getAttribute(NAME_ATTR);
     if ( name.length() == 0 ) {
+#if 0
+        // XXX DEBUG OUTPUT
         cout << "missing required name attribute for xsl:" << ATTRIBUTE_SET <<endl;
+#endif
         return;
     }
     //-- get attribute set, if already exists, then merge
diff --git a/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/extensions/transformiix/source/xslt/XSLTProcessor.cpp
index 7cfb35007cb0..11c432544bd1 100644
--- a/extensions/transformiix/source/xslt/XSLTProcessor.cpp
+++ b/extensions/transformiix/source/xslt/XSLTProcessor.cpp
@@ -72,7 +72,7 @@
 /**
  * XSLTProcessor is a class for Processing XSL stylesheets
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.53 $ $Date: 2001/06/20 03:27:25 $
+ * @version $Revision: 1.54 $ $Date: 2001/06/20 06:00:35 $
 **/
 
 /**
@@ -1206,7 +1206,10 @@ void XSLTProcessor::processAction
                 delete dfrag;
 
                 //-- we should add a MessageObserver class
+#if 0 
+		// XXX DEBUG OUTPUT
                 cout << "xsl:message - "<< message << endl;
+#endif
                 break;
             }
             //-- xsl:number
@@ -1282,20 +1285,35 @@ void XSLTProcessor::processAction
                 ExprResult* exprResult = expr->evaluate(node, ps);
                 String data("expr debug: ");
                 expr->toString(data);
+#if 0
+                // XXX DEBUG OUTPUT
                 cout << data << endl;
+#endif
                 data.clear();
+#if 0
+                // XXX DEBUG OUTPUT
                 cout << "result: ";
+#endif
                 if ( exprResult ) {
                     switch ( exprResult->getResultType() ) {
                         case  ExprResult::NODESET:
+#if 0
+                            // XXX DEBUG OUTPUT
                             cout << "#NodeSet - ";
+#endif
                         default:
                             exprResult->stringValue(data);
+#if 0
+                            // XXX DEBUG OUTPUT
                             cout << data;
+#endif
                             break;
                     }
                 }
+#if 0
+                // XXX DEBUG OUTPUT
                 cout << endl;
+#endif
 
                 delete exprResult;
                 break;
diff --git a/extensions/transformiix/source/xslt/util/NodeStack.cpp b/extensions/transformiix/source/xslt/util/NodeStack.cpp
index 862813a6eadd..09309ebbbbb3 100644
--- a/extensions/transformiix/source/xslt/util/NodeStack.cpp
+++ b/extensions/transformiix/source/xslt/util/NodeStack.cpp
@@ -33,7 +33,7 @@
 
 /**
  * @author <a href="kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2001/06/10 16:45:36 $
+ * @version $Revision: 1.6 $ $Date: 2001/06/20 06:00:37 $
 **/
 
 
@@ -124,9 +124,15 @@ void NodeStack::clear() {
  * @return true if specified Node is contained in the NodeStack
 **/
 MBool NodeStack::contains(Node* node) {
+#if 0
+    // XXX DEBUG OUTPUT
     cout << "NodeStack#contains [enter]\n";
+#endif
     MBool retVal = (indexOf(node) >= 0) ? MB_TRUE : MB_FALSE;
+#if 0
+    // XXX DEBUG OUTPUT
     cout << "NodeStack#contains [exit]\n";
+#endif
     return retVal;
 
 } //-- contains