Common subdirectories: ./xalan-j_2_7_1_comsun/build and /export/home/xalan271_comsun/build
diff -uNw ./xalan-j_2_7_1_comsun/build.xml /export/home/xalan271_comsun/build.xml
--- ./xalan-j_2_7_1_comsun/build.xml	Mon Nov 14 16:41:35 2011
+++ /export/home/xalan271_comsun/build.xml	Thu Aug 11 18:14:17 2011
@@ -86,10 +86,10 @@
   <property name="tools.dir"              value="./tools"/> 
   <property name="xdocs.dir"              value="./xdocs"/>
     
-  <property name="apachexml.reldir"       value="org/apache/xml"/>
-  <property name="serializer.reldir"      value="org/apache/xml/serializer"/>
-  <property name="xpath.reldir"           value="org/apache/xpath"/>
-  <property name="xalan.reldir"           value="org/apache/xalan"/>
+  <property name="apachexml.reldir"       value="com/sun/xalan/org/apache/xml"/>
+  <property name="serializer.reldir"      value="com/sun/xalan/org/apache/xml/serializer"/>
+  <property name="xpath.reldir"           value="com/sun/xalan/org/apache/xpath"/>
+  <property name="xalan.reldir"           value="com/sun/xalan/org/apache/xalan"/>
   <property name="domxpath.reldir"        value="org/w3c/dom/xpath"/>
   <property name="xsltc.reldir"           value="${xalan.reldir}/xsltc"/>  
 
@@ -122,7 +122,7 @@
   <property name="manifest.mf"            value="./src/MANIFEST.MF"/>
   <property name="manifest.xsltc.mf"      value="./src/manifest.xsltc"/>
   <property name="manifest.xalan-interpretive.mf" value="./src/manifest.xalan-interpretive"/>  
-  <property name="XSLTInfo.props"         value="./src/org/apache/xalan/res/XSLTInfo.properties"/>  
+  <property name="XSLTInfo.props"         value="./src/com/sun/xalan/org/apache/xalan/res/XSLTInfo.properties"/>  
   <property name="generated.xpathparser"  value="${src.dir}/${xsltc.reldir}/compiler/XPathParser.java"/>
   <property name="generated.xpathlexer"   value="${src.dir}/${xsltc.reldir}/compiler/XPathLexer.java"/>
   <property name="generated.xpathsym"     value="${src.dir}/${xsltc.reldir}/compiler/sym.java"/>
@@ -160,7 +160,7 @@
   <property name="xdocs.style"                  value="${xdocs.dir}/style"/>
   <property name="xalanonly-styledocs"
             value="dtd/xsl-html40s.dtd,dtd/spec.dtd,stylesheets/patterns.xsl,stylesheets/notice.xsl,stylesheets/spec.xsl,stylesheets/done.xsl,loaderdesign.xml,stylesheets/design2project.xsl,stylesheets/designdoc2html.xsl,stylesheets/xml2fo.xsl"/>
-  <property name="xalan.cmdline.class"          value="org.apache.xalan.xslt.Process"/>
+  <property name="xalan.cmdline.class"          value="com.sun.xalan.org.apache.xalan.xslt.Process"/>
   <property name="doc.generator"                value="org.apache.stylebook.StyleBook"/>
   <property name="doc.generator.styletargz"     value="${xdocs.dir}/xml-site-style.tar.gz"/>
   <property name="doc.generator.styletar"       value="${xdocs.dir}/xml-site-style.tar"/>
@@ -237,7 +237,7 @@
     <pathelement path="${sun.boot.class.path}" />
   </path>
   <path id="compile.source.path">
-    <dirset dir="${src.dir}" includes="/org/apache/**" />
+    <dirset dir="${src.dir}" includes="/com/sun/xalan/org/apache/**" />
   </path>
 
   <!-- patternsets for source and binary distribution packages -->
@@ -413,7 +413,7 @@
       <fileset dir="${src.dir}" includes="**/*.properties,META-INF/services/*" excludes="**/XSLTInfo.properties"/>
     </copy>  
     <filter token="impl.version" value="${impl.version}"/>
-    <copy todir="${build.classes}/org/apache/xalan/res" file="${XSLTInfo.props}" filtering="true"/>
+    <copy todir="${build.classes}/com/sun/xalan/org/apache/xalan/res" file="${XSLTInfo.props}" filtering="true"/>
   </target>
   
   <!-- Compile all java sources (Xalan interpretive and XSLTC) -->
@@ -466,7 +466,7 @@
     <available file="${build.classes}/JLex"                type="dir" property="xsltc.jlex_jar.not_needed" />
     <available file="${build.classes}/java_cup/Main.class" type="file" property="xsltc.java_cup_jar.not_needed" />
     <available file="${build.classes}/java_cup/runtime"    type="dir" property="xsltc.runtime_jar.not_needed" />
-    <available file="${build.classes}/org/apache/regexp"   type="dir" property="xsltc.regexp_jar.not_needed" />
+    <available file="${build.classes}/com/sun/xalan/org/apache/regexp"   type="dir" property="xsltc.regexp_jar.not_needed" />
   </target>
 
   <!-- Generate the XPath parser sources for xsltc if needed -->
@@ -537,9 +537,9 @@
     <copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/>
     <jar jarfile="${build.xsltc.jar}" manifest="${build.dir}/manifest.xsltc" basedir="${build.classes}" >
       <patternset><!-- relative to jar/@basedir -->
-        <include name="org/apache/xml/**" />
+        <include name="com/sun/xalan/org/apache/xml/**" />
         <include name="${xsltc.reldir}/**/*" />
-        <exclude name="org/apache/xalan/xsltc/util/JavaCupRedirect*" />
+        <exclude name="com/sun/xalan/org/apache/xalan/xsltc/util/JavaCupRedirect*" />
       </patternset>
     </jar>
   </target>
@@ -622,15 +622,15 @@
     <!-- make bundled jar named xsltc.jar -->
     <jar jarfile="${build.dir}/xsltc.jar" manifest="${build.dir}/manifest.xsltc" >
       <fileset dir="${build.classes}">
-        <include name="org/apache/xalan/xsltc/**"/>
-        <exclude name="org/apache/xalan/xsltc/util/JavaCupRedirect*" />
+        <include name="com/sun/xalan/org/apache/xalan/xsltc/**"/>
+        <exclude name="com/sun/xalan/org/apache/xalan/xsltc/util/JavaCupRedirect*" />
       </fileset>
-      <fileset dir="${build.classes}" includes="org/apache/xml/**" 
+      <fileset dir="${build.classes}" includes="com/sun/xalan/org/apache/xml/**" 
                                       excludes="${serializer.reldir}/**" />
-      <fileset dir="${build.classes}" includes="org/apache/bcel/**" />
+      <fileset dir="${build.classes}" includes="com/sun/xalan/org/apache/bcel/**" />
       <fileset dir="${build.classes}" includes="JLex/**" />
       <fileset dir="${build.classes}" includes="java_cup/**" />
-      <fileset dir="${build.classes}" includes="org/apache/regexp/**" />
+      <fileset dir="${build.classes}" includes="com/sun/xalan/org/apache/regexp/**" />
     </jar>
 
   </target>
@@ -1031,7 +1031,7 @@
          public="true"
          sourcepath="${src.dir}"
          overview="${src.dir}/javadocOverview.html"
-         packagenames="org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
+         packagenames="com.sun.xalan.org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
          author="true"
          version="true"
          use="true"
@@ -1043,17 +1043,17 @@
           <group title="Transformations API for XML (TrAX)" packages="javax.xml.transform*"/>
           <group title="Java API for XML Parsing" packages="javax.xml.parsers"/>
           <group title="Xalan Core"
-                 packages="org.apache.xalan.processor:org.apache.xalan.templates:org.apache.xalan.transformer"/>
-          <group title="XPath" packages="org.apache.xpath*"/>
-          <group title="Document Table Model (DTM)" packages="org.apache.xml.dtm*"/>          
-          <group title="Utilities" packages="org.apache.xml.utils*"/>
-          <group title="Xalan Other" packages="org.apache.xalan.client:org:org.apache.xalan.extensions:org.apache.xalan.res:org.apache.xalan.stree:org.apache.xalan.trace:org.apache.xalan.xslt"/>
-          <group title="Xalan Extensions" packages="org.apache.xalan.lib*"/>
-          <group title="Serializers" packages="org.apache.xml.serialize*, org.apache.xalan.serialize"/>
+                 packages="com.sun.xalan.org.apache.xalan.processor:com.sun.xalan.org.apache.xalan.templates:com.sun.xalan.org.apache.xalan.transformer"/>
+          <group title="XPath" packages="com.sun.xalan.org.apache.xpath*"/>
+          <group title="Document Table Model (DTM)" packages="com.sun.xalan.org.apache.xml.dtm*"/>          
+          <group title="Utilities" packages="com.sun.xalan.org.apache.xml.utils*"/>
+          <group title="Xalan Other" packages="com.sun.xalan.org.apache.xalan.client:org:com.sun.xalan.org.apache.xalan.extensions:com.sun.xalan.org.apache.xalan.res:com.sun.xalan.org.apache.xalan.stree:com.sun.xalan.org.apache.xalan.trace:com.sun.xalan.org.apache.xalan.xslt"/>
+          <group title="Xalan Extensions" packages="com.sun.xalan.org.apache.xalan.lib*"/>
+          <group title="Serializers" packages="com.sun.xalan.org.apache.xml.serialize*, com.sun.xalan.org.apache.xalan.serialize"/>
           <group title="SAX 2" packages="org.xml.sax*"/>
           <group title="DOM 2" packages="org.w3c.dom*"/>
           <group title="XSLTC Core"
-                 packages="org.apache.xalan.xsltc*"/>
+                 packages="com.sun.xalan.org.apache.xalan.xsltc*"/>
     </javadoc>
   </target>
 
@@ -1064,7 +1064,7 @@
          public="true"
          sourcepath="${src.dir}"
          overview="${src.dir}/javadocOverview.html"
-         packagenames="org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
+         packagenames="com.sun.xalan.org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
          author="true"
          version="true"
          use="true"
@@ -1078,17 +1078,17 @@
           <group title="Transformations API for XML (TrAX)" packages="javax.xml.transform*"/>
           <group title="Java API for XML Parsing" packages="javax.xml.parsers"/>
           <group title="Xalan Core"
-                 packages="org.apache.xalan.processor:org.apache.xalan.templates:org.apache.xalan.transformer"/>
-          <group title="XPath" packages="org.apache.xpath*"/>
-          <group title="Document Table Model (DTM)" packages="org.apache.xml.dtm*"/>          
-          <group title="Utilities" packages="org.apache.xml.utils*"/>
-          <group title="Xalan Other" packages="org.apache.xalan.client:org:org.apache.xalan.extensions:org.apache.xalan.res:org.apache.xalan.stree:org.apache.xalan.trace:org.apache.xalan.xslt"/>
-          <group title="Xalan Extensions" packages="org.apache.xalan.lib*"/>
-          <group title="Serializers" packages="org.apache.xml.serialize*, org.apache.xalan.serialize"/>
+                 packages="com.sun.xalan.org.apache.xalan.processor:com.sun.xalan.org.apache.xalan.templates:com.sun.xalan.org.apache.xalan.transformer"/>
+          <group title="XPath" packages="com.sun.xalan.org.apache.xpath*"/>
+          <group title="Document Table Model (DTM)" packages="com.sun.xalan.org.apache.xml.dtm*"/>          
+          <group title="Utilities" packages="com.sun.xalan.org.apache.xml.utils*"/>
+          <group title="Xalan Other" packages="com.sun.xalan.org.apache.xalan.client:org:com.sun.xalan.org.apache.xalan.extensions:com.sun.xalan.org.apache.xalan.res:com.sun.xalan.org.apache.xalan.stree:com.sun.xalan.org.apache.xalan.trace:com.sun.xalan.org.apache.xalan.xslt"/>
+          <group title="Xalan Extensions" packages="com.sun.xalan.org.apache.xalan.lib*"/>
+          <group title="Serializers" packages="com.sun.xalan.org.apache.xml.serialize*, com.sun.xalan.org.apache.xalan.serialize"/>
           <group title="SAX 2" packages="org.xml.sax*"/>
           <group title="DOM 2" packages="org.w3c.dom*"/>
           <group title="XSLTC Core"
-                 packages="org.apache.xalan.xsltc*"/>
+                 packages="com.sun.xalan.org.apache.xalan.xsltc*"/>
     </javadoc>
   </target>
 
@@ -1689,7 +1689,7 @@
          destdir="${build.apidocs}"
          public="true"
          sourcepath="${src.dir}"
-         packagenames="org.apache.*"
+         packagenames="com.sun.xalan.org.apache.*"
          author="true"
          version="true"
          use="true"
@@ -1698,7 +1698,7 @@
          bottom="Copyright &#169; ${year} Apache XML Project. All Rights Reserved.">
           <classpath refid="docs.class.path" />
           <taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/>
-          <group title="Serializer" packages="org.apache.xml.serialize*"/>
+          <group title="Serializer" packages="com.sun.xalan.org.apache.xml.serialize*"/>
     </javadoc>
   </target>
 
@@ -1707,7 +1707,7 @@
     <javadoc
          public="true"
          sourcepath="${src.dir}"
-         packagenames="org.apache.*"
+         packagenames="com.sun.xalan.org.apache.*"
          author="true"
          version="true"
          use="true"
@@ -1718,7 +1718,7 @@
           <doclet name="xalanjdoc.Standard" path="${doclet.jar}">
             <param name="-d" value="${build.apidocs}"/>
           </doclet>
-          <group title="Serializer" packages="org.apache.xml.serialize*"/>
+          <group title="Serializer" packages="com.sun.xalan.org.apache.xml.serialize*"/>
     </javadoc>
   </target>
 
diff -uNw ./xalan-j_2_7_1_comsun/fixcrlf.pl /export/home/xalan271_comsun/fixcrlf.pl
--- ./xalan-j_2_7_1_comsun/fixcrlf.pl	Mon Nov 14 16:40:49 2011
+++ /export/home/xalan271_comsun/fixcrlf.pl	Thu Aug 11 18:14:03 2011
@@ -3,7 +3,7 @@
 # search for a file in all subdirectories
 #
 if ($#ARGV != 0){
-        print "usage: fixcrlf dirname\n";
+        print "usage: processDir filename\n";
         exit;
 }
 $dir = $ARGV[0];
@@ -40,7 +40,7 @@
                 $line =~ /\s+(\S+)$/;
                 $file = $dir.'/'.$1;
                 print "line is2: $file\n";
-                if ($file =~ m/\.java$/i || $file =~ m/\.sh$/i || $file =~ m/\.xml$/i || $file =~ m/\.properties$/i) {
+                if ($file =~ m/\.java$/i || $file =~ m/\.sh$/i || $file =~ m/\.xml$/i) {
                     `perl -p -i.bak -e "s/
//g" $file`;
                     $backup = $file."\.bak";
                     `rm $backup`;
Common subdirectories: ./xalan-j_2_7_1_comsun/lib and /export/home/xalan271_comsun/lib
Common subdirectories: ./xalan-j_2_7_1_comsun/samples and /export/home/xalan271_comsun/samples
Common subdirectories: ./xalan-j_2_7_1_comsun/src and /export/home/xalan271_comsun/src
Common subdirectories: ./xalan-j_2_7_1_comsun/tools and /export/home/xalan271_comsun/tools
Common subdirectories: ./xalan-j_2_7_1_comsun/xdocs and /export/home/xalan271_comsun/xdocs
diff -uNwr ./xalan-j_2_7_1_comsun/src/MANIFEST.MF /export/home/xalan271_comsun/src/MANIFEST.MF
--- ./xalan-j_2_7_1_comsun/src/MANIFEST.MF	Fri Nov 23 03:13:54 2007
+++ /export/home/xalan271_comsun/src/MANIFEST.MF	Fri Aug 12 13:26:27 2011
@@ -1,39 +1,39 @@
 Manifest-Version: 1.0

 Created-By: @java.version@ (@java.vendor@)

-Main-Class: org.apache.xalan.xslt.Process

+Main-Class: com.sun.xalan.org.apache.xalan.xslt.Process
 Class-Path: xercesImpl.jar xml-apis.jar serializer.jar

 

 

-Name: org/apache/xalan/

+Name: com/sun/xalan/org/apache/xalan/
 Comment: Main Xalan engine implementing TrAX/JAXP

 Specification-Title: Java API for XML Processing

 Specification-Vendor: Sun Microsystems Inc.

 Specification-Version: 1.3

-Implementation-Title: org.apache.xalan

+Implementation-Title: com.sun.xalan.org.apache.xalan
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/

 

-Name: org/apache/xpath/

+Name: com/sun/xalan/org/apache/xpath/
 Comment: XPath engine

-Implementation-Title: org.apache.xpath

+Implementation-Title: com.sun.xalan.org.apache.xpath
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/

 

-Name: org/apache/xml/

+Name: com/sun/xalan/org/apache/xml/
 Comment: DTM implementation and utilities

-Implementation-Title: org.apache.xml

+Implementation-Title: com.sun.xalan.org.apache.xml
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/

 

-Name: org/apache/xalan/xsltc/

+Name: com/sun/xalan/org/apache/xalan/xsltc/
 Comment: Main XSLTC engine implementing TrAX/JAXP

 Specification-Title: Java API for XML Processing

 Specification-Vendor: Sun Microsystems Inc.

 Specification-Version: 1.3

-Implementation-Title: org.apache.xalan.xsltc

+Implementation-Title: com.sun.xalan.org.apache.xalan.xsltc
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/

@@ -48,22 +48,22 @@
 Implementation-Vendor: Princeton University  

 Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 

 

-Name: org/apache/bcel/

+Name: com/sun/xalan/org/apache/bcel/
 Comment: Byte Code Engineering Library 

 Specification-Title: Byte Code Engineering Library 

 Specification-Vendor: Markus Dahm 

 Specification-Version: 5.0 rc1 

-Implementation-Title: org.apache.bcel

+Implementation-Title: com.sun.xalan.org.apache.bcel
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://jakarta.apache.org/bcel

 

-Name: org/apache/regexp/

+Name: com/sun/xalan/org/apache/regexp/
 Comment: Java Regular Expression package 

 Specification-Title: Java Regular Expression package 

 Specification-Vendor: Apache Software Foundation 

 Specification-Version: 1.2

-Implementation-Title: org.apache.regexp

+Implementation-Title: com.sun.xalan.org.apache.regexp
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://jakarta.apache.org/regexp

diff -uNwr ./xalan-j_2_7_1_comsun/src/MANIFEST.SERIALIZER /export/home/xalan271_comsun/src/MANIFEST.SERIALIZER
--- ./xalan-j_2_7_1_comsun/src/MANIFEST.SERIALIZER	Fri Nov 23 03:13:54 2007
+++ /export/home/xalan271_comsun/src/MANIFEST.SERIALIZER	Fri Aug 12 13:27:09 2011
@@ -3,18 +3,18 @@
 Main-Class: org.apache.xml.serializer.Version

 Class-Path: xml-apis.jar

 

-Name: org/apache/xml/serializer/

+Name: com/sun/xalan/org/apache/xml/serializer/
 Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.

 Specification-Title: XSL Transformations (XSLT), at http://www.w3.org/TR/xslt

 Specification-Vendor: W3C Recommendation 16 November 1999

 Specification-Version: 1.0

-Implementation-Title: org.apache.xml.serializer

+Implementation-Title: com.sun.xalan.org.apache.xml.serializer
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/usagepatterns.html

 

-Name: org/apache/xml/serializer/utils/

+Name: com/sun/xalan/org/apache/xml/serializer/utils/
 Comment: Utilities used internally by the Serializer. Not for external use.

-Implementation-Title: org.apache.xml.serializer.utils

+Implementation-Title: com/sun/xalan/org.apache.xml.serializer.utils
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

diff -uNwr ./xalan-j_2_7_1_comsun/src/META-INF/services/com.sun.xalan.org.apache.xalan.extensions.bsf.BSFManager /export/home/xalan271_comsun/src/META-INF/services/com.sun.xalan.org.apache.xalan.extensions.bsf.BSFManager
--- ./xalan-j_2_7_1_comsun/src/META-INF/services/com.sun.xalan.org.apache.xalan.extensions.bsf.BSFManager	Thu Jan  1 05:30:00 1970
+++ /export/home/xalan271_comsun/src/META-INF/services/com.sun.xalan.org.apache.xalan.extensions.bsf.BSFManager	Fri Aug 12 13:29:15 2011
@@ -0,0 +1 @@
+org.apache.bsf.BSFManager
diff -uNwr ./xalan-j_2_7_1_comsun/src/META-INF/services/com.sun.xalan.org.apache.xml.dtm.DTMManager /export/home/xalan271_comsun/src/META-INF/services/com.sun.xalan.org.apache.xml.dtm.DTMManager
--- ./xalan-j_2_7_1_comsun/src/META-INF/services/com.sun.xalan.org.apache.xml.dtm.DTMManager	Thu Jan  1 05:30:00 1970
+++ /export/home/xalan271_comsun/src/META-INF/services/com.sun.xalan.org.apache.xml.dtm.DTMManager	Fri Aug 12 13:29:33 2011
@@ -0,0 +1 @@
+com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault
diff -uNwr ./xalan-j_2_7_1_comsun/src/META-INF/services/javax.xml.transform.TransformerFactory /export/home/xalan271_comsun/src/META-INF/services/javax.xml.transform.TransformerFactory
--- ./xalan-j_2_7_1_comsun/src/META-INF/services/javax.xml.transform.TransformerFactory	Fri Nov 23 03:13:55 2007
+++ /export/home/xalan271_comsun/src/META-INF/services/javax.xml.transform.TransformerFactory	Fri Aug 12 13:29:45 2011
@@ -1 +1 @@
-org.apache.xalan.processor.TransformerFactoryImpl

+com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl
diff -uNwr ./xalan-j_2_7_1_comsun/src/META-INF/services/javax.xml.xpath.XPathFactory /export/home/xalan271_comsun/src/META-INF/services/javax.xml.xpath.XPathFactory
--- ./xalan-j_2_7_1_comsun/src/META-INF/services/javax.xml.xpath.XPathFactory	Fri Nov 23 03:13:53 2007
+++ /export/home/xalan271_comsun/src/META-INF/services/javax.xml.xpath.XPathFactory	Fri Aug 12 13:29:55 2011
@@ -1 +1 @@
-org.apache.xpath.jaxp.XPathFactoryImpl
\ No newline at end of file
+com.sun.xalan.org.apache.xpath.jaxp.XPathFactoryImpl
diff -uNwr ./xalan-j_2_7_1_comsun/src/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager /export/home/xalan271_comsun/src/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager
--- ./xalan-j_2_7_1_comsun/src/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager	Fri Nov 23 03:13:52 2007
+++ /export/home/xalan271_comsun/src/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager	Thu Jan  1 05:30:00 1970
@@ -1 +0,0 @@
-org.apache.bsf.BSFManager

diff -uNwr ./xalan-j_2_7_1_comsun/src/META-INF/services/org.apache.xml.dtm.DTMManager /export/home/xalan271_comsun/src/META-INF/services/org.apache.xml.dtm.DTMManager
--- ./xalan-j_2_7_1_comsun/src/META-INF/services/org.apache.xml.dtm.DTMManager	Fri Nov 23 03:13:55 2007
+++ /export/home/xalan271_comsun/src/META-INF/services/org.apache.xml.dtm.DTMManager	Thu Jan  1 05:30:00 1970
@@ -1 +0,0 @@
-org.apache.xml.dtm.ref.DTMManagerDefault

diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/Version.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/Version.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/Version.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/Version.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package org.apache.xalan;
+package com.sun.xalan.org.apache.xalan;
 
 /**
  * Administrative class to keep track of the version number of
@@ -26,8 +26,8 @@
  * <P>This class implements the upcoming standard of having
  * org.apache.project-name.Version.getVersion() be a standard way 
  * to get version information.  This class will replace the older 
- * org.apache.xalan.processor.Version class.</P>
- * <P>See also: org/apache/xalan/res/XSLTInfo.properties for 
+ * com.sun.xalan.org.apache.xalan.processor.Version class.</P>
+ * <P>See also: com.sun.xalan.org.apache.xalan/res/XSLTInfo.properties for 
  * information about the version of the XSLT spec we support.</P>
  * @xsl.usage general
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/client/XSLTProcessorApplet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/client/XSLTProcessorApplet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/client/XSLTProcessorApplet.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/client/XSLTProcessorApplet.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTProcessorApplet.java 469316 2006-10-30 23:32:59Z minchau $
  */
-package org.apache.xalan.client;
+package com.sun.xalan.org.apache.xalan.client;
 
 import java.applet.Applet;
 import java.awt.Graphics;
@@ -39,8 +39,8 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * Provides applet host for the XSLT processor. To perform transformations on an HTML client:
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionContext.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionContext.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionContext.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionContext.java	Thu Aug 11 18:14:20 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: ExpressionContext.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import javax.xml.transform.ErrorListener;
 
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeIterator;
 
@@ -75,7 +75,7 @@
    *
    * @throws javax.xml.transform.TransformerException
    */
-  public XObject getVariableOrParam(org.apache.xml.utils.QName qname)
+  public XObject getVariableOrParam(com.sun.xalan.org.apache.xml.utils.QName qname)
             throws javax.xml.transform.TransformerException;
   
   /**
@@ -87,7 +87,7 @@
    * @return The current XPathContext.
    * @throws javax.xml.transform.TransformerException
    */
-  public org.apache.xpath.XPathContext getXPathContext()
+  public com.sun.xalan.org.apache.xpath.XPathContext getXPathContext()
             throws javax.xml.transform.TransformerException;
 
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionVisitor.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionVisitor.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionVisitor.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExpressionVisitor.java	Thu Aug 11 18:14:20 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: ExpressionVisitor.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.functions.FuncExtFunctionAvailable;
-import org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunctionAvailable;
+import com.sun.xalan.org.apache.xpath.functions.Function;
 
 /**
- * When {@link org.apache.xalan.processor.StylesheetHandler} creates 
- * an {@link org.apache.xpath.XPath}, the ExpressionVisitor
+ * When {@link com.sun.xalan.org.apache.xalan.processor.StylesheetHandler} creates 
+ * an {@link com.sun.xalan.org.apache.xpath.XPath}, the ExpressionVisitor
  * visits the XPath expression. For any extension functions it 
  * encounters, it instructs StylesheetRoot to register the
  * extension namespace. 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandler.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandler.java	Thu Aug 11 18:14:20 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: ExtensionHandler.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.IOException;
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
 
 /**
  * Abstract base class for handling an extension namespace for XPath.
@@ -58,8 +58,8 @@
       throws ClassNotFoundException
   {
     // Hack for backwards compatibility with XalanJ1 stylesheets
-    if(className.equals("org.apache.xalan.xslt.extensions.Redirect")) {
-      className = "org.apache.xalan.lib.Redirect";
+    if(className.equals("com.sun.xalan.org.apache.xalan.xslt.extensions.Redirect")) {
+      className = "com.sun.xalan.org.apache.xalan.lib.Redirect";
     }
 
     return ObjectFactory.findProviderClass(
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java	Thu Aug 11 18:14:20 2011
@@ -18,29 +18,29 @@
 /*
  * $Id: ExtensionHandlerExsltFunction.java 469672 2006-10-31 21:56:19Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.IOException;
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.ElemExsltFunction;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.ExpressionNode;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFuncResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFunction;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.ExpressionNode;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute EXSLT functions, determine the availability of EXSLT functions, and the
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerGeneral.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerGeneral.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerGeneral.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtensionHandlerGeneral.java 469672 2006-10-31 21:56:19Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,21 +30,21 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.ref.DTMNodeList;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xpath.XPathProcessorException;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeList;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xpath.XPathProcessorException;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Class handling an extension namespace for XPath. Provides functions
@@ -86,7 +86,7 @@
   private static final String DEFAULT_BSF_MANAGER = "org.apache.bsf.BSFManager";
   
   /** Property name to load the BSFManager class */
-  private static final String propName = "org.apache.xalan.extensions.bsf.BSFManager";
+  private static final String propName = "com.sun.xalan.org.apache.xalan.extensions.bsf.BSFManager";
   
   /** Integer Zero */
   private static final Integer ZEROINT = new Integer(0);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJava.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJava.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJava.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJava.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtensionHandlerJava.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.util.Hashtable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java	Thu Aug 11 18:14:20 2011
@@ -19,7 +19,7 @@
  * $Id: ExtensionHandlerJavaClass.java 469672 2006-10-31 21:56:19Z minchau $
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -30,12 +30,12 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.trace.ExtensionEvent;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.trace.ExtensionEvent;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Represents an extension namespace for XPath that handles java classes.
@@ -132,9 +132,9 @@
         Class[] paramTypes = methods[i].getParameterTypes();
         if ( (paramTypes.length == 2)
           && paramTypes[0].isAssignableFrom(
-                        org.apache.xalan.extensions.XSLProcessorContext.class)
+                        com.sun.xalan.org.apache.xalan.extensions.XSLProcessorContext.class)
           && paramTypes[1].isAssignableFrom(
-                        org.apache.xalan.templates.ElemExtensionCall.class) )
+                        com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall.class) )
         {
           return true;
         }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtensionHandlerJavaPackage.java 469672 2006-10-31 21:56:19Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -29,14 +29,14 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.trace.ExtensionEvent;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.trace.ExtensionEvent;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Represents an extension namespace for XPath that handles java packages
@@ -144,9 +144,9 @@
             Class[] paramTypes = methods[i].getParameterTypes();
             if ( (paramTypes.length == 2)
               && paramTypes[0].isAssignableFrom(
-                                     org.apache.xalan.extensions.XSLProcessorContext.class)
+                                     com.sun.xalan.org.apache.xalan.extensions.XSLProcessorContext.class)
               && paramTypes[1].isAssignableFrom(
-                                       org.apache.xalan.templates.ElemExtensionCall.class) )
+                                       com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall.class) )
             {
               return true;
             }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceContext.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceContext.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceContext.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceContext.java	Thu Aug 11 18:14:20 2011
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.util.Iterator;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * A sample implementation of NamespaceContext, with support for 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceSupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceSupport.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespaceSupport.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtensionNamespaceSupport.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.lang.reflect.Constructor;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespacesManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespacesManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespacesManager.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionNamespacesManager.java	Thu Aug 11 18:14:20 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: ExtensionNamespacesManager.java 469672 2006-10-31 21:56:19Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.util.Vector;
 
-import org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
 
 /**
  * Used during assembly of a stylesheet to collect the information for each 
@@ -182,14 +182,14 @@
       ExtensionHandler.getClassForName(className);
       return new ExtensionNamespaceSupport(
                            ns, 
-                           "org.apache.xalan.extensions.ExtensionHandlerJavaClass",                                         
+                           "com.sun.xalan.org.apache.xalan.extensions.ExtensionHandlerJavaClass",                                         
                            new Object[]{ns, "javaclass", className});
     }
     catch (ClassNotFoundException e)
     {
       return new ExtensionNamespaceSupport(
                             ns, 
-                            "org.apache.xalan.extensions.ExtensionHandlerJavaPackage",
+                            "com.sun.xalan.org.apache.xalan.extensions.ExtensionHandlerJavaPackage",
                             new Object[]{ns, "javapackage", className + "."});
     }
   }
@@ -208,7 +208,7 @@
   private void setPredefinedNamespaces()
   {    
     String uri = Constants.S_EXTENSIONS_JAVA_URL;
-    String handlerClassName = "org.apache.xalan.extensions.ExtensionHandlerJavaPackage";
+    String handlerClassName = "com.sun.xalan.org.apache.xalan.extensions.ExtensionHandlerJavaPackage";
     String lang = "javapackage";
     String lib = "";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
@@ -223,9 +223,9 @@
                                              new Object[]{uri, lang, lib}));
     
     uri = Constants.S_BUILTIN_EXTENSIONS_URL;
-    handlerClassName = "org.apache.xalan.extensions.ExtensionHandlerJavaClass";
+    handlerClassName = "com.sun.xalan.org.apache.xalan.extensions.ExtensionHandlerJavaClass";
     lang = "javaclass"; // for remaining predefined extension namespaces.    
-    lib = "org.apache.xalan.lib.Extensions";
+    lib = "com.sun.xalan.org.apache.xalan.lib.Extensions";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
     
@@ -235,17 +235,17 @@
     
     // Xalan extension namespaces (redirect, pipe and SQL).
     uri = Constants.S_EXTENSIONS_REDIRECT_URL;
-    lib = "org.apache.xalan.lib.Redirect";
+    lib = "com.sun.xalan.org.apache.xalan.lib.Redirect";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
  
     uri = Constants.S_EXTENSIONS_PIPE_URL;
-    lib = "org.apache.xalan.lib.PipeDocument";
+    lib = "com.sun.xalan.org.apache.xalan.lib.PipeDocument";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
  
     uri = Constants.S_EXTENSIONS_SQL_URL;
-    lib = "org.apache.xalan.lib.sql.XConnection";
+    lib = "com.sun.xalan.org.apache.xalan.lib.sql.XConnection";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
  
@@ -253,32 +253,32 @@
     //EXSLT namespaces (not including EXSLT function namespaces which are
     // registered by the associated ElemFunction.
     uri = Constants.S_EXSLT_COMMON_URL;
-    lib = "org.apache.xalan.lib.ExsltCommon";
+    lib = "com.sun.xalan.org.apache.xalan.lib.ExsltCommon";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
 
     uri = Constants.S_EXSLT_MATH_URL;
-    lib = "org.apache.xalan.lib.ExsltMath";
+    lib = "com.sun.xalan.org.apache.xalan.lib.ExsltMath";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
     
     uri = Constants.S_EXSLT_SETS_URL;
-    lib = "org.apache.xalan.lib.ExsltSets";
+    lib = "com.sun.xalan.org.apache.xalan.lib.ExsltSets";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
     
     uri = Constants.S_EXSLT_DATETIME_URL;
-    lib = "org.apache.xalan.lib.ExsltDatetime";
+    lib = "com.sun.xalan.org.apache.xalan.lib.ExsltDatetime";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
                                              
     uri = Constants.S_EXSLT_DYNAMIC_URL;
-    lib = "org.apache.xalan.lib.ExsltDynamic";
+    lib = "com.sun.xalan.org.apache.xalan.lib.ExsltDynamic";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));
 
     uri = Constants.S_EXSLT_STRINGS_URL;
-    lib = "org.apache.xalan.lib.ExsltStrings";
+    lib = "com.sun.xalan.org.apache.xalan.lib.ExsltStrings";
     m_predefExtensions.add(new ExtensionNamespaceSupport(uri, handlerClassName,
                                              new Object[]{uri, lang, lib}));                                             
   }    
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionsTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionsTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionsTable.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ExtensionsTable.java	Thu Aug 11 18:14:20 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ExtensionsTable.java 469672 2006-10-31 21:56:19Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.util.Hashtable;
 import java.util.Vector;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xpath.XPathProcessorException;
-import org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xpath.XPathProcessorException;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
 
 /**
  * Class holding a table registered extension namespace handlers
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/MethodResolver.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/MethodResolver.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/MethodResolver.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/MethodResolver.java	Thu Aug 11 18:14:20 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: MethodResolver.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -26,14 +26,14 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XRTreeFrag;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.traversal.NodeIterator;
@@ -336,8 +336,8 @@
       {
         Class[] paramTypes = method.getParameterTypes();
         if ( (paramTypes.length == 2)
-           && paramTypes[1].isAssignableFrom(org.apache.xalan.templates.ElemExtensionCall.class)
-                                         && paramTypes[0].isAssignableFrom(org.apache.xalan.extensions.XSLProcessorContext.class) )
+           && paramTypes[1].isAssignableFrom(com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall.class)
+                                         && paramTypes[0].isAssignableFrom(com.sun.xalan.org.apache.xalan.extensions.XSLProcessorContext.class) )
         {
           if ( ++bestScoreCount == 1 )
             bestMethod = method;
@@ -968,8 +968,8 @@
         else                                  // must be an element call
         {
           return resultString + classObj.getName() + "." + funcName
-                    + "(org.apache.xalan.extensions.XSLProcessorContext, "
-                    + "org.apache.xalan.templates.ElemExtensionCall).";
+                    + "(com.sun.xalan.org.apache.xalan.extensions.XSLProcessorContext, "
+                    + "com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall).";
         }
     }
     
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ObjectFactory.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/ObjectFactory.java	Thu Aug 11 18:14:20 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468637 2006-10-28 06:51:02Z minchau $
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport.java	Thu Aug 11 18:14:20 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468637 2006-10-28 06:51:02Z minchau $
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport12.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/SecuritySupport12.java	Thu Aug 11 18:14:20 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468637 2006-10-28 06:51:02Z minchau $
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionImpl.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionImpl.java	Thu Aug 11 18:14:20 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import java.util.List;
 import java.util.Vector;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionResolverImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionResolverImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionResolverImpl.java	Mon Nov 14 16:40:51 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XPathFunctionResolverImpl.java	Thu Aug 11 18:14:20 2011
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import javax.xml.namespace.QName;
 import javax.xml.xpath.XPathFunction;
 import javax.xml.xpath.XPathFunctionResolver;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * A sample implementation of XPathFunctionResolver, with support for
@@ -101,17 +101,17 @@
     private String getEXSLTClassName(String uri)
     {
         if (uri.equals(ExtensionNamespaceContext.EXSLT_MATH_URI))
-            return "org.apache.xalan.lib.ExsltMath";
+            return "com.sun.xalan.org.apache.xalan.lib.ExsltMath";
         else if (uri.equals(ExtensionNamespaceContext.EXSLT_SET_URI))
-            return "org.apache.xalan.lib.ExsltSets";
+            return "com.sun.xalan.org.apache.xalan.lib.ExsltSets";
         else if (uri.equals(ExtensionNamespaceContext.EXSLT_STRING_URI))
-            return "org.apache.xalan.lib.ExsltStrings";
+            return "com.sun.xalan.org.apache.xalan.lib.ExsltStrings";
         else if (uri.equals(ExtensionNamespaceContext.EXSLT_DATETIME_URI))
-            return "org.apache.xalan.lib.ExsltDatetime";
+            return "com.sun.xalan.org.apache.xalan.lib.ExsltDatetime";
         else if (uri.equals(ExtensionNamespaceContext.EXSLT_DYNAMIC_URI))
-            return "org.apache.xalan.lib.ExsltDynamic";
+            return "com.sun.xalan.org.apache.xalan.lib.ExsltDynamic";
         else if (uri.equals(ExtensionNamespaceContext.EXSLT_URI))
-            return "org.apache.xalan.lib.ExsltCommon";
+            return "com.sun.xalan.org.apache.xalan.lib.ExsltCommon";
         else
             return null;
     }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XSLProcessorContext.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XSLProcessorContext.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XSLProcessorContext.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/extensions/XSLProcessorContext.java	Thu Aug 11 18:14:20 2011
@@ -18,32 +18,32 @@
 /*
  * $Id: XSLProcessorContext.java 468637 2006-10-28 06:51:02Z minchau $
  */
-package org.apache.xalan.extensions;
+package com.sun.xalan.org.apache.xalan.extensions;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.transformer.ClonerToResultTree;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xalan.serialize.SerializerUtils;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.DescendantIterator;
-import org.apache.xpath.axes.OneStepIterator;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.transformer.ClonerToResultTree;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xalan.serialize.SerializerUtils;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.DescendantIterator;
+import com.sun.xalan.org.apache.xpath.axes.OneStepIterator;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XRTreeFrag;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.traversal.NodeIterator;
 
-// import org.apache.xalan.xslt.*;
+// import com.sun.xalan.org.apache.xalan.xslt.*;
 
 /**
  * Provides transformer context to be passed to an extension element.
@@ -68,7 +68,7 @@
     this.transformer = transformer;
     this.stylesheetTree = stylesheetTree;
     // %TBD%
-    org.apache.xpath.XPathContext xctxt = transformer.getXPathContext();
+    com.sun.xalan.org.apache.xpath.XPathContext xctxt = transformer.getXPathContext();
     this.mode = transformer.getMode();
     this.sourceNode = xctxt.getCurrentNode();
     this.sourceTree = xctxt.getDTM(this.sourceNode);
@@ -101,7 +101,7 @@
   }
 
   /**  The root of the source tree being executed.        */
-  private org.apache.xml.dtm.DTM sourceTree;
+  private com.sun.xalan.org.apache.xml.dtm.DTM sourceTree;
 
   /**
    * Get the root of the source tree being executed.
@@ -214,7 +214,7 @@
       }
       else if (obj instanceof NodeIterator)
       {
-        value = new XNodeSet(new org.apache.xpath.NodeSetDTM(((NodeIterator)obj), xctxt));
+        value = new XNodeSet(new com.sun.xalan.org.apache.xpath.NodeSetDTM(((NodeIterator)obj), xctxt));
       }
       else if (obj instanceof org.w3c.dom.Node)
       {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltBase.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltBase.java	Thu Aug 11 18:14:20 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ExsltBase.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
-import org.apache.xml.dtm.ref.DTMNodeProxy;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltCommon.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltCommon.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltCommon.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltCommon.java	Thu Aug 11 18:14:21 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ExsltCommon.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator;
+import com.sun.xalan.org.apache.xpath.NodeSet;
 
 /**
  * This class contains EXSLT common extension functions.
@@ -69,7 +69,7 @@
     else if (obj instanceof DTMNodeIterator)
     {
       DTMIterator dtmI = ((DTMNodeIterator)obj).getDTMIterator();
-      if (dtmI instanceof org.apache.xpath.axes.RTFIterator)
+      if (dtmI instanceof com.sun.xalan.org.apache.xpath.axes.RTFIterator)
       	return "RTF";
       else
         return "node-set";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDatetime.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDatetime.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDatetime.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDatetime.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: ExsltDatetime.java 468639 2006-10-28 06:52:33Z minchau $
  */
 
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 
 import java.text.ParseException;
@@ -29,9 +29,9 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class contains EXSLT dates and times extension functions.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDynamic.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDynamic.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDynamic.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltDynamic.java	Thu Aug 11 18:14:21 2011
@@ -18,23 +18,23 @@
 /*
  * $Id: ExsltDynamic.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xpath.NodeSet;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltMath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltMath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltMath.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltMath.java	Thu Aug 11 18:14:21 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ExsltMath.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
-import org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xpath.NodeSet;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltSets.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltSets.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltSets.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltSets.java	Thu Aug 11 18:14:21 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ExsltSets.java 469688 2006-10-31 22:39:43Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.xml.utils.DOMHelper;
-import org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xml.utils.DOMHelper;
+import com.sun.xalan.org.apache.xpath.NodeSet;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltStrings.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltStrings.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltStrings.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ExsltStrings.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExsltStrings.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.util.StringTokenizer;
 
@@ -26,7 +26,7 @@
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xpath.NodeSet;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -346,7 +346,7 @@
            
             catch(ParserConfigurationException pce)
             {
-                  throw new org.apache.xml.utils.WrappedRuntimeException(pce);
+                  throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(pce);
             }
 
         }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/Extensions.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/Extensions.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/Extensions.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/Extensions.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Extensions.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.util.Hashtable;
 import java.util.StringTokenizer;
@@ -27,12 +27,12 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xalan.xslt.EnvironmentCheck;
-import org.apache.xpath.NodeSet;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xalan.xslt.EnvironmentCheck;
+import com.sun.xalan.org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
@@ -126,7 +126,7 @@
       }
       catch(ParserConfigurationException pce)
       {
-        throw new org.apache.xml.utils.WrappedRuntimeException(pce);
+        throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(pce);
       }
     }
   }
@@ -285,7 +285,7 @@
    * Return a Node of basic debugging information from the 
    * EnvironmentCheck utility about the Java environment.
    *
-   * <p>Simply calls the {@link org.apache.xalan.xslt.EnvironmentCheck}
+   * <p>Simply calls the {@link com.sun.xalan.org.apache.xalan.xslt.EnvironmentCheck}
    * utility to grab info about the Java environment and CLASSPATH, 
    * etc., and then returns the resulting Node.  Stylesheets can 
    * then maniuplate this data or simply xsl:copy-of the Node.  Note 
@@ -314,7 +314,7 @@
     }
     catch(ParserConfigurationException pce)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(pce);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(pce);
     }
 
     Node resultNode = null;
@@ -336,7 +336,7 @@
     }
     catch(Exception e)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(e);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
     }
 
     return resultNode;
@@ -376,7 +376,7 @@
 
       // Create a parent to hold the report and append hash to it
       Node resultNode = factoryDocument.createElement("checkEnvironmentExtension");
-      org.apache.xml.utils.Hashtree2Node.appendHashToNode(report, "whichReport", 
+      com.sun.xalan.org.apache.xml.utils.Hashtree2Node.appendHashToNode(report, "whichReport", 
             resultNode, factoryDocument);
 
       return resultNode;
@@ -410,7 +410,7 @@
 
             catch(ParserConfigurationException pce)
             {
-                  throw new org.apache.xml.utils.WrappedRuntimeException(pce);
+                  throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(pce);
             }
 
         }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/NodeInfo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/NodeInfo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/NodeInfo.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/NodeInfo.java	Thu Aug 11 18:14:21 2011
@@ -19,12 +19,12 @@
  * $Id: NodeInfo.java 468639 2006-10-28 06:52:33Z minchau $
  */
 
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/ObjectFactory.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/ObjectFactory.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468639 2006-10-28 06:52:33Z minchau $
  */
 
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/PipeDocument.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/PipeDocument.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/PipeDocument.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/PipeDocument.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: PipeDocument.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -36,13 +36,13 @@
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.extensions.XSLProcessorContext;
-import org.apache.xalan.templates.AVT;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.extensions.XSLProcessorContext;
+import com.sun.xalan.org.apache.xalan.templates.AVT;
+import com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall;
+import com.sun.xalan.org.apache.xalan.templates.ElemLiteralResult;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -55,8 +55,8 @@
 /**
  */
 // Imported Serializer classes
-import org.apache.xml.serializer.Serializer;
-import org.apache.xml.serializer.SerializerFactory;
+import com.sun.xalan.org.apache.xml.serializer.Serializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializerFactory;
 
 /**
  * PipeDocument is a Xalan extension element to set stylesheet params and pipes an XML 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/Redirect.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/Redirect.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/Redirect.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/Redirect.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Redirect.java 468639 2006-10-28 06:52:33Z minchau $
  */
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,14 +29,14 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.xalan.extensions.XSLProcessorContext;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.extensions.XSLProcessorContext;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall;
+import com.sun.xalan.org.apache.xalan.templates.OutputProperties;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 import org.xml.sax.ContentHandler;
 
 /**
@@ -288,7 +288,7 @@
                                                 context.getTransformer());
     if(null != fileNameExpr)
     {
-      org.apache.xpath.XPathContext xctxt 
+      com.sun.xalan.org.apache.xpath.XPathContext xctxt 
         = context.getTransformer().getXPathContext();
       XPath myxpath = new XPath(fileNameExpr, elem, xctxt.getNamespaceContext(), XPath.SELECT);
       XObject xobj = myxpath.execute(xctxt, context.getContextNode(), elem);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468639 2006-10-28 06:52:33Z minchau $
  */
 
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport12.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/SecuritySupport12.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468639 2006-10-28 06:52:33Z minchau $
  */
 
-package org.apache.xalan.lib;
+package com.sun.xalan.org.apache.xalan.lib;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPool.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPool.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: ConnectionPool.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPoolManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPoolManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPoolManager.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ConnectionPoolManager.java	Thu Aug 11 18:14:21 2011
@@ -20,12 +20,12 @@
  */
 
 
- package org.apache.xalan.lib.sql;
+ package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.util.Hashtable;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  */
@@ -64,7 +64,7 @@
    * @param name
    * @param pool
    *
-   * @link org.apache.xalan.lib.sql.ConnectionPool}
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.ConnectionPool}
    *
    * @throws <code>IllegalArgumentException</code>, throw this exception
    * if a pool with the same name currently exists.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DTMDocument.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DTMDocument.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DTMDocument.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DTMDocument.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: DTMDocument.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -28,15 +28,15 @@
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xml.utils.SuballocatedIntVector;
-import org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.StringBufferPool;
+import com.sun.xalan.org.apache.xml.utils.SuballocatedIntVector;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
 
 import org.w3c.dom.Node;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DefaultConnectionPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DefaultConnectionPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DefaultConnectionPool.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/DefaultConnectionPool.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DefaultConnectionPool.java 468638 2006-10-28 06:52:06Z minchau $
  */
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -30,8 +30,8 @@
 import java.util.Properties;
 import java.util.Vector;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * For internal connectiones, i.e. Connection information supplies in the
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/JNDIConnectionPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/JNDIConnectionPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/JNDIConnectionPool.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/JNDIConnectionPool.java	Thu Aug 11 18:14:21 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectArray.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectArray.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectArray.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectArray.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ObjectArray.java 468638 2006-10-28 06:52:06Z minchau $
  */
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectFactory.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/ObjectFactory.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/PooledConnection.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/PooledConnection.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/PooledConnection.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/PooledConnection.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: PooledConnection.java 468638 2006-10-28 06:52:06Z minchau $
  */
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/QueryParameter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/QueryParameter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/QueryParameter.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/QueryParameter.java	Thu Aug 11 18:14:21 2011
@@ -21,7 +21,7 @@
 
 /* This class holds a parameter definition for a JDBC PreparedStatement or CallableStatement. */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.util.Hashtable;
 import java.sql.PreparedStatement;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLDocument.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLDocument.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLDocument.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLDocument.java	Thu Aug 11 18:14:21 2011
@@ -19,22 +19,22 @@
  * $Id: SQLDocument.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.util.Vector;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 import java.sql.Connection;
 import java.sql.Statement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.*;
-import org.apache.xml.dtm.ref.*;
+import com.sun.xalan.org.apache.xml.dtm.ref.*;
 
 /**
  * The SQL Document is the main controlling class the executesa SQL Query
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLErrorDocument.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLErrorDocument.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLErrorDocument.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLErrorDocument.java	Thu Aug 11 18:14:21 2011
@@ -19,13 +19,13 @@
  * $Id: SQLErrorDocument.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
 
 /**
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLQueryParser.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLQueryParser.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLQueryParser.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SQLQueryParser.java	Thu Aug 11 18:14:21 2011
@@ -26,13 +26,13 @@
   *
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.util.*;
 import java.sql.*;
-import org.apache.xpath.objects.*;
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.objects.*;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xml.utils.QName;
 import javax.xml.transform.TransformerException;
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport12.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/SecuritySupport12.java	Thu Aug 11 18:14:21 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468638 2006-10-28 06:52:06Z minchau $
  */
 
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/XConnection.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/XConnection.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/XConnection.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/lib/sql/XConnection.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XConnection.java 468638 2006-10-28 06:52:06Z minchau $
  */
-package org.apache.xalan.lib.sql;
+package com.sun.xalan.org.apache.xalan.lib.sql;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -30,16 +30,16 @@
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.DTMManagerDefault;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBooleanStatic;
-import org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBooleanStatic;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -199,7 +199,7 @@
    * defined in the
    * <code>connect(ExpressionContext exprContext, String connPoolName)</code>
    * method.
-   * <code>org.apache.xalan.lib.sql.ConnectionPool</code> or a JNDI datasource.
+   * <code>com.sun.xalan.org.apache.xalan.lib.sql.ConnectionPool</code> or a JNDI datasource.
    *
    * @param exprContext Context automatically passed from the XSLT sheet.
    * @param name The name of the ConnectionPool or the JNDI DataSource path.
@@ -254,7 +254,7 @@
 
   /**
     * Returns an XConnection from either a user created
-    * <code>org.apache.xalan.lib.sql.ConnectionPool</code> or a JNDI datasource.
+    * <code>com.sun.xalan.org.apache.xalan.lib.sql.ConnectionPool</code> or a JNDI datasource.
 
     * 
     * This method first tries to resolve the passed name against
@@ -667,10 +667,10 @@
    * @param queryString the SQL query.
    * @return XStatement implements NodeIterator.
    * @throws SQLException
-   * @link org.apache.xalan.lib.sql.XStatement XStatement}
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.XStatement XStatement}
    * object. The XStatement executes the query, and uses the result set
    * to create a
-   * @link org.apache.xalan.lib.sql.RowSet RowSet},
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.RowSet RowSet},
    * a row-set element.
    */
   public DTM query( ExpressionContext exprContext, String queryString )
@@ -727,10 +727,10 @@
    * @param queryString the SQL query.
    * @return XStatement implements NodeIterator.
    * @throws SQLException
-   * @link org.apache.xalan.lib.sql.XStatement XStatement}
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.XStatement XStatement}
    * object. The XStatement executes the query, and uses the result set
    * to create a
-   * @link org.apache.xalan.lib.sql.RowSet RowSet},
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.RowSet RowSet},
    * a row-set element.
    */
   public DTM pquery( ExpressionContext exprContext, String queryString )
@@ -745,10 +745,10 @@
    * @param typeInfo
    * @return XStatement implements NodeIterator.
    * @throws SQLException
-   * @link org.apache.xalan.lib.sql.XStatement XStatement}
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.XStatement XStatement}
    * object. The XStatement executes the query, and uses the result set
    * to create a
-   * @link org.apache.xalan.lib.sql.RowSet RowSet},
+   * @link com.sun.xalan.org.apache.xalan.lib.sql.RowSet RowSet},
    * a row-set element.
    * This method allows for the user to pass in a comma seperated
    * String that represents a list of parameter types. If supplied
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorAttributeSet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorAttributeSet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorAttributeSet.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorAttributeSet.java	Thu Aug 11 18:14:21 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ProcessorAttributeSet.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemAttributeSet;
-import org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemAttributeSet;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
 
 import org.xml.sax.Attributes;
 
@@ -52,7 +52,7 @@
    *        there are no attributes, it shall be an empty
    *        Attributes object.
    * 
-   * @see org.apache.xalan.processor.StylesheetHandler#startElement
+   * @see com.sun.xalan.org.apache.xalan.processor.StylesheetHandler#startElement
    * @see org.xml.sax.ContentHandler#startElement
    * @see org.xml.sax.ContentHandler#endElement
    * @see org.xml.sax.Attributes
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorCharacters.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorCharacters.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorCharacters.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorCharacters.java	Thu Aug 11 18:14:21 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ProcessorCharacters.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemText;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xml.utils.XMLCharacterRecognizer;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemText;
+import com.sun.xalan.org.apache.xalan.templates.ElemTextLiteral;
+import com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer;
 
 import org.w3c.dom.Node;
 
@@ -133,8 +133,8 @@
    *        performed.
    * @param rawName The raw XML 1.0 name (with prefix), or the
    *        empty string if raw names are not available.
-   * @see org.apache.xalan.processor.StylesheetHandler#startElement
-   * @see org.apache.xalan.processor.StylesheetHandler#endElement
+   * @see com.sun.xalan.org.apache.xalan.processor.StylesheetHandler#startElement
+   * @see com.sun.xalan.org.apache.xalan.processor.StylesheetHandler#endElement
    * @see org.xml.sax.ContentHandler#startElement
    * @see org.xml.sax.ContentHandler#endElement
    * @see org.xml.sax.Attributes
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorDecimalFormat.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorDecimalFormat.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorDecimalFormat.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorDecimalFormat.java	Thu Aug 11 18:14:21 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: ProcessorDecimalFormat.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.DecimalFormatProperties;
+import com.sun.xalan.org.apache.xalan.templates.DecimalFormatProperties;
 import org.xml.sax.Attributes;
 
 /**
  * Process xsl:decimal-format by creating a DecimalFormatProperties 
  * object and passing it to the stylesheet.
  * 
- * @see org.apache.xalan.templates.Stylesheet#setDecimalFormat
- * @see org.apache.xalan.templates.DecimalFormatProperties
+ * @see com.sun.xalan.org.apache.xalan.templates.Stylesheet#setDecimalFormat
+ * @see com.sun.xalan.org.apache.xalan.templates.DecimalFormatProperties
  * @see <a href="http://www.w3.org/TR/xslt#format-number">format-number in XSLT Specification</a>
  * @xsl.usage internal
  */
@@ -51,8 +51,8 @@
    * @param attributes The attributes attached to the element.  If
    *        there are no attributes, it shall be an empty
    *        Attributes object.
-   * @see org.apache.xalan.processor.StylesheetHandler#startElement
-   * @see org.apache.xalan.processor.StylesheetHandler#endElement
+   * @see com.sun.xalan.org.apache.xalan.processor.StylesheetHandler#startElement
+   * @see com.sun.xalan.org.apache.xalan.processor.StylesheetHandler#endElement
    * @see org.xml.sax.ContentHandler#startElement
    * @see org.xml.sax.ContentHandler#endElement
    * @see org.xml.sax.Attributes
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFuncResult.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFuncResult.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFuncResult.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFuncResult.java	Thu Aug 11 18:14:21 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ProcessorExsltFuncResult.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.ElemExsltFunction;
-import org.apache.xalan.templates.ElemParam;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemVariable;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFuncResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFunction;
+import com.sun.xalan.org.apache.xalan.templates.ElemParam;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemVariable;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFunction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFunction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFunction.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorExsltFunction.java	Thu Aug 11 18:14:21 2011
@@ -18,31 +18,31 @@
 /*
  * $Id: ProcessorExsltFunction.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.ElemApplyImport;
-import org.apache.xalan.templates.ElemApplyTemplates;
-import org.apache.xalan.templates.ElemAttribute;
-import org.apache.xalan.templates.ElemCallTemplate;
-import org.apache.xalan.templates.ElemComment;
-import org.apache.xalan.templates.ElemCopy;
-import org.apache.xalan.templates.ElemCopyOf;
-import org.apache.xalan.templates.ElemElement;
-import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.ElemExsltFunction;
-import org.apache.xalan.templates.ElemFallback;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.ElemMessage;
-import org.apache.xalan.templates.ElemNumber;
-import org.apache.xalan.templates.ElemPI;
-import org.apache.xalan.templates.ElemParam;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemText;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.ElemValueOf;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.ElemApplyImport;
+import com.sun.xalan.org.apache.xalan.templates.ElemApplyTemplates;
+import com.sun.xalan.org.apache.xalan.templates.ElemAttribute;
+import com.sun.xalan.org.apache.xalan.templates.ElemCallTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemComment;
+import com.sun.xalan.org.apache.xalan.templates.ElemCopy;
+import com.sun.xalan.org.apache.xalan.templates.ElemCopyOf;
+import com.sun.xalan.org.apache.xalan.templates.ElemElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFuncResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFunction;
+import com.sun.xalan.org.apache.xalan.templates.ElemFallback;
+import com.sun.xalan.org.apache.xalan.templates.ElemLiteralResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemMessage;
+import com.sun.xalan.org.apache.xalan.templates.ElemNumber;
+import com.sun.xalan.org.apache.xalan.templates.ElemPI;
+import com.sun.xalan.org.apache.xalan.templates.ElemParam;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemText;
+import com.sun.xalan.org.apache.xalan.templates.ElemTextLiteral;
+import com.sun.xalan.org.apache.xalan.templates.ElemValueOf;
+import com.sun.xalan.org.apache.xalan.templates.ElemVariable;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalParamDecl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalParamDecl.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalParamDecl.java	Thu Aug 11 18:14:21 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ProcessorGlobalParamDecl.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.ElemParam;
-import org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemParam;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
 
 /**
  * This class processes parse events for an xsl:param element.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java	Thu Aug 11 18:14:21 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ProcessorGlobalVariableDecl.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemVariable;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemVariable;
 
 /**
  * This class processes parse events for an xsl:variable element.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorImport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorImport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorImport.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorImport.java	Thu Aug 11 18:14:21 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ProcessorImport.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * This class processes parse events for an xsl:import element.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorInclude.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorInclude.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorInclude.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorInclude.java	Thu Aug 11 18:14:21 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ProcessorInclude.java 469349 2006-10-31 03:06:50Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.io.IOException;
 
@@ -30,10 +30,10 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.TreeWalker;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.TreeWalker;
 
 import org.w3c.dom.Node;
 
@@ -228,7 +228,7 @@
           if (systemId != null)
               handler.pushBaseIndentifier(systemId);
         
-          TreeWalker walker = new TreeWalker(handler, new org.apache.xml.utils.DOM2Helper(), systemId);
+          TreeWalker walker = new TreeWalker(handler, new com.sun.xalan.org.apache.xml.utils.DOM2Helper(), systemId);
 
           try
           {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorKey.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorKey.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorKey.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorKey.java	Thu Aug 11 18:14:21 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ProcessorKey.java 469688 2006-10-31 22:39:43Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.KeyDeclaration;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.KeyDeclaration;
 import org.xml.sax.Attributes;
 
 /**
@@ -85,7 +85,7 @@
    */
   void setPropertiesFromAttributes(
           StylesheetHandler handler, String rawName, Attributes attributes, 
-          org.apache.xalan.templates.ElemTemplateElement target)
+          com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement target)
             throws org.xml.sax.SAXException
   {
 
@@ -114,7 +114,7 @@
       {
         String valueString = attributes.getValue(i);
 
-        if (valueString.indexOf(org.apache.xpath.compiler.Keywords.FUNC_KEY_STRING
+        if (valueString.indexOf(com.sun.xalan.org.apache.xpath.compiler.Keywords.FUNC_KEY_STRING
                                 + "(") >= 0)
           handler.error(
             XSLMessages.createMessage(
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorLRE.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorLRE.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorLRE.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorLRE.java	Thu Aug 11 18:14:21 2011
@@ -18,25 +18,25 @@
 /*
  * $Id: ProcessorLRE.java 475981 2006-11-16 23:35:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.List;
 
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.templates.XMLNSDecl;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall;
+import com.sun.xalan.org.apache.xalan.templates.ElemLiteralResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xalan.templates.XMLNSDecl;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
@@ -44,13 +44,13 @@
 
 /**
  * Processes an XSLT literal-result-element, or something that looks 
- * like one.  The actual {@link org.apache.xalan.templates.ElemTemplateElement}
- * produced may be a {@link org.apache.xalan.templates.ElemLiteralResult}, 
- * a {@link org.apache.xalan.templates.StylesheetRoot}, or a 
- * {@link org.apache.xalan.templates.ElemExtensionCall}.
+ * like one.  The actual {@link com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement}
+ * produced may be a {@link com.sun.xalan.org.apache.xalan.templates.ElemLiteralResult}, 
+ * a {@link com.sun.xalan.org.apache.xalan.templates.StylesheetRoot}, or a 
+ * {@link com.sun.xalan.org.apache.xalan.templates.ElemExtensionCall}.
  * 
  * @see <a href="http://www.w3.org/TR/xslt#literal-result-element">literal-result-element in XSLT Specification</a>
- * @see org.apache.xalan.templates.ElemLiteralResult
+ * @see com.sun.xalan.org.apache.xalan.templates.ElemLiteralResult
  * @xsl.usage internal
  */
 public class ProcessorLRE extends ProcessorTemplateElem
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorNamespaceAlias.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorNamespaceAlias.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorNamespaceAlias.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorNamespaceAlias.java	Thu Aug 11 18:14:21 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ProcessorNamespaceAlias.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.NamespaceAlias;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.NamespaceAlias;
 import org.xml.sax.Attributes;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorOutputElem.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorOutputElem.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorOutputElem.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorOutputElem.java	Thu Aug 11 18:14:22 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ProcessorOutputElem.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xml.serializer.OutputPropertiesFactory;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.OutputProperties;
+import com.sun.xalan.org.apache.xml.serializer.OutputPropertiesFactory;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 import org.xml.sax.Attributes;
 
 /**
@@ -109,7 +109,7 @@
    * @see javax.xml.transform.OutputKeys#METHOD
    * @param newValue non-null reference to processed attribute value.
    */
-  public void setMethod(org.apache.xml.utils.QName newValue)
+  public void setMethod(com.sun.xalan.org.apache.xml.utils.QName newValue)
   {
     m_outputProperties.setQNameProperty(OutputKeys.METHOD, newValue);
   }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorPreserveSpace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorPreserveSpace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorPreserveSpace.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorPreserveSpace.java	Thu Aug 11 18:14:22 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ProcessorPreserveSpace.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.Vector;
 
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.WhiteSpaceInfo;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.WhiteSpaceInfo;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 import org.xml.sax.Attributes;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStripSpace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStripSpace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStripSpace.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStripSpace.java	Thu Aug 11 18:14:22 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ProcessorStripSpace.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.Vector;
 
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.WhiteSpaceInfo;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.WhiteSpaceInfo;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 import org.xml.sax.Attributes;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetDoc.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetDoc.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetDoc.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetDoc.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ProcessorStylesheetDoc.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 /**
  * This class processes the xsl:stylesheet element.  At the 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetElement.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorStylesheetElement.java	Thu Aug 11 18:14:22 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ProcessorStylesheetElement.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetComposed;
-import org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetComposed;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
 
 import org.xml.sax.Attributes;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplate.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplate.java	Thu Aug 11 18:14:22 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ProcessorTemplate.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
 
 /**
  * TransformerFactory for xsl:template markup.
@@ -36,7 +36,7 @@
    * element stack.
    *
    * @param handler non-null reference to current StylesheetHandler that is constructing the Templates.
-   * @param elem Must be a non-null reference to a {@link org.apache.xalan.templates.ElemTemplate} object.
+   * @param elem Must be a non-null reference to a {@link com.sun.xalan.org.apache.xalan.templates.ElemTemplate} object.
    *
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplateElem.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplateElem.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplateElem.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorTemplateElem.java	Thu Aug 11 18:14:22 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ProcessorTemplateElem.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
 
 import org.xml.sax.Attributes;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorText.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorText.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorText.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorText.java	Thu Aug 11 18:14:22 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ProcessorText.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemText;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemText;
 
 /**
  * Process xsl:text.
@@ -38,7 +38,7 @@
    * element stack.
    *
    * @param handler non-null reference to current StylesheetHandler that is constructing the Templates.
-   * @param elem non-null reference to a {@link org.apache.xalan.templates.ElemText}.
+   * @param elem non-null reference to a {@link com.sun.xalan.org.apache.xalan.templates.ElemText}.
    *
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorUnknown.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorUnknown.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorUnknown.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/ProcessorUnknown.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ProcessorUnknown.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import org.xml.sax.Attributes;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/StylesheetHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/StylesheetHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/StylesheetHandler.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/StylesheetHandler.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StylesheetHandler.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.Stack;
 
@@ -30,23 +30,23 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.sax.TemplatesHandler;
 
-import org.apache.xalan.extensions.ExpressionVisitor;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemForEach;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xml.utils.BoolStack;
-import org.apache.xml.utils.NamespaceSupport2;
-import org.apache.xml.utils.NodeConsumer;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xpath.XPath;
-import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionVisitor;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemForEach;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xml.utils.BoolStack;
+import com.sun.xalan.org.apache.xml.utils.NamespaceSupport2;
+import com.sun.xalan.org.apache.xml.utils.NodeConsumer;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.compiler.FunctionTable;
+import com.sun.xalan.org.apache.xpath.functions.Function;
 
 import org.w3c.dom.Node;
 
@@ -100,12 +100,12 @@
   public StylesheetHandler(TransformerFactoryImpl processor)
           throws TransformerConfigurationException
   {
-    Class func = org.apache.xalan.templates.FuncDocument.class;
+    Class func = com.sun.xalan.org.apache.xalan.templates.FuncDocument.class;
     m_funcTable.installFunction("document", func);
 
-    // func = new org.apache.xalan.templates.FuncKey();
+    // func = new com.sun.xalan.org.apache.xalan.templates.FuncKey();
     // FunctionTable.installFunction("key", func);
-    func = org.apache.xalan.templates.FuncFormatNumb.class;
+    func = com.sun.xalan.org.apache.xalan.templates.FuncFormatNumb.class;
 
     m_funcTable.installFunction("format-number", func);
 
@@ -196,7 +196,7 @@
 
   /**
    * Given a namespace, get the corrisponding prefix.  This is here only
-   * to support the {@link org.apache.xml.utils.PrefixResolver} interface,
+   * to support the {@link com.sun.xalan.org.apache.xml.utils.PrefixResolver} interface,
    * and will throw an error if invoked on this object.
    *
    * @param prefix The prefix to look up, which may be an empty string ("") for the default Namespace.
@@ -787,7 +787,7 @@
         "xalan-doc-cache-off".equals(target) ||
         "xalan:doc-cache-off".equals(target) ||
 	   ("doc-cache-off".equals(localName) &&
-	    ns.equals("org.apache.xalan.xslt.extensions.Redirect") )
+	    ns.equals("com.sun.xalan.org.apache.xalan.xslt.extensions.Redirect") )
 	 )
       {
 	if(!(m_elems.peek() instanceof ElemForEach))
@@ -838,7 +838,7 @@
   /**
    * Warn the user of an problem.
    *
-   * @param msg An key into the {@link org.apache.xalan.res.XSLTErrorResources}
+   * @param msg An key into the {@link com.sun.xalan.org.apache.xalan.res.XSLTErrorResources}
    * table, that is one of the WG_ prefixed definitions.
    * @param args An array of arguments for the given warning.
    *
@@ -930,7 +930,7 @@
    * Tell the user of an error, and probably throw an
    * exception.
    *
-   * @param msg A key into the {@link org.apache.xalan.res.XSLTErrorResources}
+   * @param msg A key into the {@link com.sun.xalan.org.apache.xalan.res.XSLTErrorResources}
    * table, that is one of the WG_ prefixed definitions.
    * @param args An array of arguments for the given warning.
    * @param e An error which the SAXException should wrap.
@@ -1575,7 +1575,7 @@
   /**
    * The originating node if the current stylesheet is being created
    *  from a DOM.
-   *  @see org.apache.xml.utils.NodeConsumer
+   *  @see com.sun.xalan.org.apache.xml.utils.NodeConsumer
    */
   private Node m_originatingNode;
 
@@ -1583,7 +1583,7 @@
    * Set the node that is originating the SAX event.
    *
    * @param n Reference to node that originated the current event.
-   * @see org.apache.xml.utils.NodeConsumer
+   * @see com.sun.xalan.org.apache.xml.utils.NodeConsumer
    */
   public void setOriginatingNode(Node n)
   {
@@ -1594,7 +1594,7 @@
    * Set the node that is originating the SAX event.
    *
    * @return Reference to node that originated the current event.
-   * @see org.apache.xml.utils.NodeConsumer
+   * @see com.sun.xalan.org.apache.xml.utils.NodeConsumer
    */
   public Node getOriginatingNode()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/TransformerFactoryImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/TransformerFactoryImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/TransformerFactoryImpl.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/TransformerFactoryImpl.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformerFactoryImpl.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -44,19 +44,19 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TrAXFilter;
-import org.apache.xalan.transformer.TransformerIdentityImpl;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.XalanProperties;
-
-import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
-import org.apache.xml.utils.DefaultErrorHandler;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xml.utils.StylesheetPIHandler;
-import org.apache.xml.utils.StopParseException;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TrAXFilter;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerIdentityImpl;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.transformer.XalanProperties;
+
+import com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
+import com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.TreeWalker;
+import com.sun.xalan.org.apache.xml.utils.StylesheetPIHandler;
+import com.sun.xalan.org.apache.xml.utils.StopParseException;
 
 import org.w3c.dom.Node;
 
@@ -75,10 +75,10 @@
   /** 
    * The path/filename of the property file: XSLTInfo.properties  
    * Maintenance note: see also
-   * <code>org.apache.xpath.functions.FuncSystemProperty.XSLT_PROPERTIES</code>
+   * <code>com.sun.xalan.org.apache.xpath.functions.FuncSystemProperty.XSLT_PROPERTIES</code>
    */
   public static final String XSLT_PROPERTIES =
-    "org/apache/xalan/res/XSLTInfo.properties";
+    "com.sun.xalan.org.apache.xalan/res/XSLTInfo.properties";
 
   /**
    * <p>State of secure processing feature.</p>
@@ -113,7 +113,7 @@
     {
       TemplatesHandler builder = newTemplatesHandler();
       TreeWalker walker = new TreeWalker(builder,
-                                         new org.apache.xml.utils.DOM2Helper(),
+                                         new com.sun.xalan.org.apache.xml.utils.DOM2Helper(),
                                          builder.getSystemId());
 
       walker.traverse(node);
@@ -291,7 +291,7 @@
     {
       if (null != node)
       {
-        TreeWalker walker = new TreeWalker(handler, new org.apache.xml.utils.DOM2Helper(), baseID);
+        TreeWalker walker = new TreeWalker(handler, new com.sun.xalan.org.apache.xml.utils.DOM2Helper(), baseID);
 
         walker.traverse(node);
       }
@@ -1001,7 +1001,7 @@
   }
 
   /** The error listener.   */
-  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(false);
+  private ErrorListener m_errorListener = new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler(false);
 
   /**
    * Get the error listener in effect for the TransformerFactory.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/WhitespaceInfoPaths.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/WhitespaceInfoPaths.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/WhitespaceInfoPaths.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/WhitespaceInfoPaths.java	Thu Aug 11 18:14:22 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: WhitespaceInfoPaths.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.Vector;
 
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.WhiteSpaceInfo;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.WhiteSpaceInfo;
 
 public class WhitespaceInfoPaths extends WhiteSpaceInfo
 {
@@ -41,7 +41,7 @@
    * preservation of whitespace.
    *
    * @param elems Should be a non-null reference to a list 
-   *              of {@link org.apache.xpath.XPath} objects.
+   *              of {@link com.sun.xalan.org.apache.xpath.XPath} objects.
    */
   public void setElements(Vector elems)
   {
@@ -53,7 +53,7 @@
    * whitespace delimited element qualified names that specify
    * preservation of whitespace.
    *
-   * @return A reference to a list of {@link org.apache.xpath.XPath} objects, 
+   * @return A reference to a list of {@link com.sun.xalan.org.apache.xpath.XPath} objects, 
    *         or null.
    */
   Vector getElements()
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLProcessorVersion.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLProcessorVersion.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLProcessorVersion.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLProcessorVersion.java	Thu Aug 11 18:14:22 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: XSLProcessorVersion.src 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 /**
  * Administrative class to keep track of the version number of
  * the Xalan release.
- * <P>See also: org/apache/xalan/res/XSLTInfo.properties</P>
- * @deprecated To be replaced by org.apache.xalan.Version.getVersion()
+ * <P>See also: com.sun.xalan.org.apache.xalan/res/XSLTInfo.properties</P>
+ * @deprecated To be replaced by com.sun.xalan.org.apache.xalan.Version.getVersion()
  * @xsl.usage general
  */
 public class XSLProcessorVersion
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTAttributeDef.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTAttributeDef.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTAttributeDef.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTAttributeDef.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTAttributeDef.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -27,16 +27,16 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.AVT;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.StringToIntTable;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.XML11Char;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.AVT;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.StringToIntTable;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xpath.XPath;
 
  
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementDef.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementDef.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementDef.java	Mon Nov 14 16:40:52 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementDef.java	Thu Aug 11 18:14:22 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: XSLTElementDef.java 468640 2006-10-28 06:53:53Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import org.apache.xalan.templates.Constants;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 /**
  * This class defines the allowed structure for an element in a XSLT stylesheet,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementProcessor.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementProcessor.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementProcessor.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTElementProcessor.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTElementProcessor.java 469688 2006-10-31 22:39:43Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,10 +26,10 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.AttributesImpl;
@@ -313,7 +313,7 @@
                            && (attributes.getQName(i).startsWith("xmlns:") || 
                                attributes.getQName(i).equals("xmlns")))
       {
-        attrUri = org.apache.xalan.templates.Constants.S_XMLNAMESPACEURI;
+        attrUri = com.sun.xalan.org.apache.xalan.templates.Constants.S_XMLNAMESPACEURI;
       }
       String attrLocalName = attributes.getLocalName(i);
       XSLTAttributeDef attrDef = def.getAttributeDef(attrUri, attrLocalName);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTSchema.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTSchema.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTSchema.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/processor/XSLTSchema.java	Thu Aug 11 18:14:22 2011
@@ -18,43 +18,43 @@
 /*
  * $Id: XSLTSchema.java 476466 2006-11-18 08:22:31Z minchau $
  */
-package org.apache.xalan.processor;
+package com.sun.xalan.org.apache.xalan.processor;
 
 import java.util.HashMap;
 
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemApplyImport;
-import org.apache.xalan.templates.ElemApplyTemplates;
-import org.apache.xalan.templates.ElemAttribute;
-import org.apache.xalan.templates.ElemCallTemplate;
-import org.apache.xalan.templates.ElemChoose;
-import org.apache.xalan.templates.ElemComment;
-import org.apache.xalan.templates.ElemCopy;
-import org.apache.xalan.templates.ElemCopyOf;
-import org.apache.xalan.templates.ElemElement;
-import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.ElemExsltFunction;
-import org.apache.xalan.templates.ElemExtensionDecl;
-import org.apache.xalan.templates.ElemExtensionScript;
-import org.apache.xalan.templates.ElemFallback;
-import org.apache.xalan.templates.ElemForEach;
-import org.apache.xalan.templates.ElemIf;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.ElemMessage;
-import org.apache.xalan.templates.ElemNumber;
-import org.apache.xalan.templates.ElemOtherwise;
-import org.apache.xalan.templates.ElemPI;
-import org.apache.xalan.templates.ElemParam;
-import org.apache.xalan.templates.ElemSort;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemText;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.ElemUnknown;
-import org.apache.xalan.templates.ElemValueOf;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.ElemWhen;
-import org.apache.xalan.templates.ElemWithParam;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemApplyImport;
+import com.sun.xalan.org.apache.xalan.templates.ElemApplyTemplates;
+import com.sun.xalan.org.apache.xalan.templates.ElemAttribute;
+import com.sun.xalan.org.apache.xalan.templates.ElemCallTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemChoose;
+import com.sun.xalan.org.apache.xalan.templates.ElemComment;
+import com.sun.xalan.org.apache.xalan.templates.ElemCopy;
+import com.sun.xalan.org.apache.xalan.templates.ElemCopyOf;
+import com.sun.xalan.org.apache.xalan.templates.ElemElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFuncResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemExsltFunction;
+import com.sun.xalan.org.apache.xalan.templates.ElemExtensionDecl;
+import com.sun.xalan.org.apache.xalan.templates.ElemExtensionScript;
+import com.sun.xalan.org.apache.xalan.templates.ElemFallback;
+import com.sun.xalan.org.apache.xalan.templates.ElemForEach;
+import com.sun.xalan.org.apache.xalan.templates.ElemIf;
+import com.sun.xalan.org.apache.xalan.templates.ElemLiteralResult;
+import com.sun.xalan.org.apache.xalan.templates.ElemMessage;
+import com.sun.xalan.org.apache.xalan.templates.ElemNumber;
+import com.sun.xalan.org.apache.xalan.templates.ElemOtherwise;
+import com.sun.xalan.org.apache.xalan.templates.ElemPI;
+import com.sun.xalan.org.apache.xalan.templates.ElemParam;
+import com.sun.xalan.org.apache.xalan.templates.ElemSort;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemText;
+import com.sun.xalan.org.apache.xalan.templates.ElemTextLiteral;
+import com.sun.xalan.org.apache.xalan.templates.ElemUnknown;
+import com.sun.xalan.org.apache.xalan.templates.ElemValueOf;
+import com.sun.xalan.org.apache.xalan.templates.ElemVariable;
+import com.sun.xalan.org.apache.xalan.templates.ElemWhen;
+import com.sun.xalan.org.apache.xalan.templates.ElemWithParam;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 /**
  * This class defines the allowed structure for a stylesheet, and the
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLMessages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLMessages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLMessages.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLMessages.java	Thu Aug 11 18:14:22 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XSLMessages.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 
-import org.apache.xpath.res.XPATHMessages;
+import com.sun.xalan.org.apache.xpath.res.XPATHMessages;
 
 /**
  * Sets things up for issuing error messages.  This class is misnamed, and
@@ -37,7 +37,7 @@
 
   /** The class name of the Xalan error message string table.    */
   private static final String XSLT_ERROR_RESOURCES =
-    "org.apache.xalan.res.XSLTErrorResources";
+    "com.sun.xalan.org.apache.xalan.res.XSLTErrorResources";
 
   /**
    * Creates a message from the specified key and replacement
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -767,10 +767,10 @@
       "xsl:apply-imports not allowed in a xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Cannot use a DTMLiaison for an output DOM node... pass a org.apache.xpath.DOM2Helper instead!"},
+      "Cannot use a DTMLiaison for an output DOM node... pass a com.sun.xalan.org.apache.xpath.DOM2Helper instead!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Cannot use a DTMLiaison for a input DOM node... pass a org.apache.xpath.DOM2Helper instead!"},
+      "Cannot use a DTMLiaison for a input DOM node... pass a com.sun.xalan.org.apache.xpath.DOM2Helper instead!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Call to extension element failed: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ca.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ca.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ca.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ca.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_ca.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -781,10 +781,10 @@
       "xsl:apply-imports no es permeten en un xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "No es pot utilitzar una DTMLiaison per a un node DOM de sortida. En lloc d'aix\u00f2, utilitzeu org.apache.xpath.DOM2Helper."},
+      "No es pot utilitzar una DTMLiaison per a un node DOM de sortida. En lloc d'aix\u00f2, utilitzeu com.sun.xalan.org.apache.xpath.DOM2Helper."},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "No es pot utilitzar una DTMLiaison per a un node DOM d'entrada. En lloc d'aix\u00f2, utilitzeu org.apache.xpath.DOM2Helper."},
+      "No es pot utilitzar una DTMLiaison per a un node DOM d'entrada. En lloc d'aix\u00f2, utilitzeu com.sun.xalan.org.apache.xpath.DOM2Helper."},
 
     { ER_CALL_TO_EXT_FAILED,
       "S''ha produ\u00eft un error en la crida de l''element d''extensi\u00f3 {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_cs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_cs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_cs.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_cs.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_cs.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "Parametr xsl:for-each nen\u00ed v xsl:apply-imports povolen"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Nelze pou\u017e\u00edt DTMLiaison u v\u00fdstupu uzlu DOM node... M\u00edsto toho pou\u017eijte org.apache.xpath.DOM2Helper!"},
+      "Nelze pou\u017e\u00edt DTMLiaison u v\u00fdstupu uzlu DOM node... M\u00edsto toho pou\u017eijte com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Nelze pou\u017e\u00edt DTMLiaison u vstupu uzlu DOM node... M\u00edsto toho pou\u017eijte org.apache.xpath.DOM2Helper!"},
+      "Nelze pou\u017e\u00edt DTMLiaison u vstupu uzlu DOM node... M\u00edsto toho pou\u017eijte com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Ne\u00fasp\u011b\u0161n\u00e9 vol\u00e1n\u00ed prvku p\u0159\u00edpony: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_de.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_de.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_de.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports ist in xsl:for-each nicht zul\u00e4ssig."},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "DTMLiaison kann nicht f\u00fcr einen Ausgabe-Dokumentobjektmodellknoten verwendet werden... \u00dcbergeben Sie stattdessen org.apache.xpath.DOM2Helper!"},
+      "DTMLiaison kann nicht f\u00fcr einen Ausgabe-Dokumentobjektmodellknoten verwendet werden... \u00dcbergeben Sie stattdessen com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "DTMLiaison kann nicht f\u00fcr einen Eingabe-Dokumentobjektmodellknoten verwendet werden... \u00dcbergeben Sie stattdessen org.apache.xpath.DOM2Helper!"},
+      "DTMLiaison kann nicht f\u00fcr einen Eingabe-Dokumentobjektmodellknoten verwendet werden... \u00dcbergeben Sie stattdessen com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Aufruf an Erweiterungselement fehlgeschlagen: {0}."},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_en.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_en.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_en.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_en.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_en.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_es.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_es.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_es.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports no permitido en xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "No se puede utilizar DTMLiaison para un nodo DOM de salida... Pase org.apache.xpath.DOM2Helper en su lugar."},
+      "No se puede utilizar DTMLiaison para un nodo DOM de salida... Pase com.sun.xalan.org.apache.xpath.DOM2Helper en su lugar."},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "No se puede utilizar DTMLiaison para un nodo DOM de entrada... Pase org.apache.xpath.DOM2Helper en su lugar."},
+      "No se puede utilizar DTMLiaison para un nodo DOM de entrada... Pase com.sun.xalan.org.apache.xpath.DOM2Helper en su lugar."},
 
     { ER_CALL_TO_EXT_FAILED,
       "Anomal\u00eda al llamar al elemento de extensi\u00f3n: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_fr.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_fr.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_fr.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports interdit dans un xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Impossible d'utiliser DTMLiaison pour un noeud de DOM en sortie... Transmettez org.apache.xpath.DOM2Helper \u00e0 la place !"},
+      "Impossible d'utiliser DTMLiaison pour un noeud de DOM en sortie... Transmettez com.sun.xalan.org.apache.xpath.DOM2Helper \u00e0 la place !"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Impossible d'utiliser DTMLiaison pour un noeud de DOM en entr\u00e9e... Transmettez org.apache.xpath.DOM2Helper \u00e0 la place !"},
+      "Impossible d'utiliser DTMLiaison pour un noeud de DOM en entr\u00e9e... Transmettez com.sun.xalan.org.apache.xpath.DOM2Helper \u00e0 la place !"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Echec de l''appel de l''\u00e9l\u00e9ment d''extension : {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_hu.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_hu.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_hu.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_hu.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_hu.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "Az xsl:apply-imports nem megengedett xsl:for-each-en bel\u00fcl"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Nem haszn\u00e1lhat DTMLiaison-t kimeneti DOM csom\u00f3pontk\u00e9nt... adjon \u00e1t ink\u00e1bb egy org.apache.xpath.DOM2Helper-t!"},
+      "Nem haszn\u00e1lhat DTMLiaison-t kimeneti DOM csom\u00f3pontk\u00e9nt... adjon \u00e1t ink\u00e1bb egy com.sun.xalan.org.apache.xpath.DOM2Helper-t!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Nem haszn\u00e1lhat DTMLiaison-t bemeneti DOM csom\u00f3pontk\u00e9nt... adjon \u00e1t ink\u00e1bb egy org.apache.xpath.DOM2Helper-t!"},
+      "Nem haszn\u00e1lhat DTMLiaison-t bemeneti DOM csom\u00f3pontk\u00e9nt... adjon \u00e1t ink\u00e1bb egy com.sun.xalan.org.apache.xpath.DOM2Helper-t!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "A kiterjeszt\u00e9s-elem megh\u00edv\u00e1sa sikertelen volt: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_it.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_it.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_it.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports non consentito in xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Impossibile utilizzare DTMLiaison per un nodo DOM di output... utilizzare invece org.apache.xpath.DOM2Helper."},
+      "Impossibile utilizzare DTMLiaison per un nodo DOM di output... utilizzare invece com.sun.xalan.org.apache.xpath.DOM2Helper."},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Impossibile utilizzare DTMLiaison per un nodo DON di input... utilizzare invece org.apache.xpath.DOM2Helper."},
+      "Impossibile utilizzare DTMLiaison per un nodo DON di input... utilizzare invece com.sun.xalan.org.apache.xpath.DOM2Helper."},
 
     { ER_CALL_TO_EXT_FAILED,
       "Chiamata all''''elemento estensione non riuscita: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ja.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ja.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ja.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ja.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_ja.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports \u306f xsl:for-each \u5185\u3067\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "DTMLiaison \u306f\u51fa\u529b DOM \u30ce\u30fc\u30c9\u306b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093... \u4ee3\u308a\u306b org.apache.xpath.DOM2Helper \u3092\u6e21\u3057\u3066\u304f\u3060\u3055\u3044\u3002"},
+      "DTMLiaison \u306f\u51fa\u529b DOM \u30ce\u30fc\u30c9\u306b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093... \u4ee3\u308a\u306b com.sun.xalan.org.apache.xpath.DOM2Helper \u3092\u6e21\u3057\u3066\u304f\u3060\u3055\u3044\u3002"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "DTMLiaison \u306f\u5165\u529b DOM \u30ce\u30fc\u30c9\u306b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093... \u4ee3\u308a\u306b org.apache.xpath.DOM2Helper \u3092\u6e21\u3057\u3066\u304f\u3060\u3055\u3044\u3002"},
+      "DTMLiaison \u306f\u5165\u529b DOM \u30ce\u30fc\u30c9\u306b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093... \u4ee3\u308a\u306b com.sun.xalan.org.apache.xpath.DOM2Helper \u3092\u6e21\u3057\u3066\u304f\u3060\u3055\u3044\u3002"},
 
     { ER_CALL_TO_EXT_FAILED,
       "\u62e1\u5f35\u8981\u7d20\u3078\u306e\u547c\u3073\u51fa\u3057\u304c\u5931\u6557\u3057\u307e\u3057\u305f: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ko.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ko.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_ko.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports\ub294 xsl:for-each\uc5d0 \ud5c8\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4."},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "\ucd9c\ub825 DOM \ub178\ub4dc\uc5d0 DTMLiaison\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ub300\uc2e0 org.apache.xpath.DOM2Helper\ub97c \uc804\ub2ec\ud558\uc2ed\uc2dc\uc624."},
+      "\ucd9c\ub825 DOM \ub178\ub4dc\uc5d0 DTMLiaison\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ub300\uc2e0 com.sun.xalan.org.apache.xpath.DOM2Helper\ub97c \uc804\ub2ec\ud558\uc2ed\uc2dc\uc624."},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "\uc785\ub825 DOM \ub178\ub4dc\uc5d0 DTMLiaison\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ub300\uc2e0 org.apache.xpath.DOM2Helper\ub97c \uc804\ub2ec\ud558\uc2ed\uc2dc\uc624."},
+      "\uc785\ub825 DOM \ub178\ub4dc\uc5d0 DTMLiaison\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ub300\uc2e0 com.sun.xalan.org.apache.xpath.DOM2Helper\ub97c \uc804\ub2ec\ud558\uc2ed\uc2dc\uc624."},
 
     { ER_CALL_TO_EXT_FAILED,
       "\ud655\uc7a5 \uc694\uc18c \ud638\ucd9c\uc5d0 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pl.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pl.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_pl.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports jest niedozwolone w xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Nie mo\u017cna u\u017cy\u0107 DTMLiaison w wyj\u015bciowym w\u0119\u017ale DOM... przeka\u017c zamiast tego org.apache.xpath.DOM2Helper!"},
+      "Nie mo\u017cna u\u017cy\u0107 DTMLiaison w wyj\u015bciowym w\u0119\u017ale DOM... przeka\u017c zamiast tego com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Nie mo\u017cna u\u017cy\u0107 DTMLiaison w wej\u015bciowym w\u0119\u017ale DOM... przeka\u017c zamiast tego org.apache.xpath.DOM2Helper!"},
+      "Nie mo\u017cna u\u017cy\u0107 DTMLiaison w wej\u015bciowym w\u0119\u017ale DOM... przeka\u017c zamiast tego com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Wywo\u0142anie elementu rozszerzenia nie powiod\u0142o si\u0119: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pt_BR.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pt_BR.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_pt_BR.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_pt_BR.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports n\u00e3o permitido em um xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Imposs\u00edvel utilizar um DTMLiaison para um n\u00f3 DOM de sa\u00edda... transmita um org.apache.xpath.DOM2Helper no lugar!"},
+      "Imposs\u00edvel utilizar um DTMLiaison para um n\u00f3 DOM de sa\u00edda... transmita um com.sun.xalan.org.apache.xpath.DOM2Helper no lugar!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Imposs\u00edvel utilizar um DTMLiaison para um n\u00f3 DOM de entrada... transmita um org.apache.xpath.DOM2Helper no lugar!"},
+      "Imposs\u00edvel utilizar um DTMLiaison para um n\u00f3 DOM de entrada... transmita um com.sun.xalan.org.apache.xpath.DOM2Helper no lugar!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Falha na chamada do elemento da extens\u00e3o: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ru.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ru.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ru.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_ru.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_ru.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0432 xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "\u041d\u0435\u043b\u044c\u0437\u044f \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c DTMLiaison \u0434\u043b\u044f \u0443\u0437\u043b\u0430 \u0432\u044b\u0432\u043e\u0434\u0430 DOM ... \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 org.apache.xpath.DOM2Helper!"},
+      "\u041d\u0435\u043b\u044c\u0437\u044f \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c DTMLiaison \u0434\u043b\u044f \u0443\u0437\u043b\u0430 \u0432\u044b\u0432\u043e\u0434\u0430 DOM ... \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "\u041d\u0435\u043b\u044c\u0437\u044f \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c DTMLiaison \u0434\u043b\u044f \u0443\u0437\u043b\u0430 \u0432\u0432\u043e\u0434\u0430 DOM ... \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 org.apache.xpath.DOM2Helper!"},
+      "\u041d\u0435\u043b\u044c\u0437\u044f \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c DTMLiaison \u0434\u043b\u044f \u0443\u0437\u043b\u0430 \u0432\u0432\u043e\u0434\u0430 DOM ... \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0432\u044b\u0437\u043e\u0432\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sk.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sk.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sk.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sk.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_sk.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports nie je povolen\u00fd v xsl:for-each"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Nem\u00f4\u017ee pou\u017ei\u0165 DTMLiaison pre v\u00fdstupn\u00fd uzol DOM... namiesto neho odo\u0161lite org.apache.xpath.DOM2Helper!"},
+      "Nem\u00f4\u017ee pou\u017ei\u0165 DTMLiaison pre v\u00fdstupn\u00fd uzol DOM... namiesto neho odo\u0161lite com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Nem\u00f4\u017ee pou\u017ei\u0165 DTMLiaison pre vstupn\u00fd uzol DOM... namiesto neho odo\u0161lite org.apache.xpath.DOM2Helper!"},
+      "Nem\u00f4\u017ee pou\u017ei\u0165 DTMLiaison pre vstupn\u00fd uzol DOM... namiesto neho odo\u0161lite com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Volanie elementu roz\u0161\u00edrenia zlyhalo: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sl.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sl.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_sl.java 338081 2004-12-15 17:35:58Z jycli $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -769,10 +769,10 @@
       "xsl:apply-imports v xsl:for-each ni dovoljen"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Za izhodno vozli\u0161\u010de DOM ne morem uporabiti DTMLiaison... namesto njega posredujte org.apache.xpath.DOM2Helper!"},
+      "Za izhodno vozli\u0161\u010de DOM ne morem uporabiti DTMLiaison... namesto njega posredujte com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Za vhodno vozli\u0161\u010de DOM ne morem uporabiti DTMLiaison... namesto njega posredujte org.apache.xpath.DOM2Helper!"},
+      "Za vhodno vozli\u0161\u010de DOM ne morem uporabiti DTMLiaison... namesto njega posredujte com.sun.xalan.org.apache.xpath.DOM2Helper!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Klic elementa kon\u010dnice ni uspel: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sv.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sv.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sv.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_sv.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_sv.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 
 /**
@@ -889,7 +889,7 @@
 
   {
     ER_CANT_USE_DTM_FOR_OUTPUT,
-      "Kan inte anv\u00e4nda DTMLiaison till en DOM utdatanod... skicka en org.apache.xpath.DOM2Helper ist\u00e4llet!"},
+      "Kan inte anv\u00e4nda DTMLiaison till en DOM utdatanod... skicka en com.sun.xalan.org.apache.xpath.DOM2Helper ist\u00e4llet!"},
 
 
   /** ER_CANT_USE_DTM_FOR_INPUT          */
@@ -898,7 +898,7 @@
 
   {
     ER_CANT_USE_DTM_FOR_INPUT,
-      "Kan inte anv\u00e4nda DTMLiaison till en DOM indatanod... skicka en org.apache.xpath.DOM2Helper ist\u00e4llet!"},
+      "Kan inte anv\u00e4nda DTMLiaison till en DOM indatanod... skicka en com.sun.xalan.org.apache.xpath.DOM2Helper ist\u00e4llet!"},
 
 
   /** ER_CALL_TO_EXT_FAILED          */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_tr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_tr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_tr.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_tr.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_tr.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports, xsl:for-each i\u00e7inde kullan\u0131lamaz"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "\u00c7\u0131k\u0131\u015f DOM d\u00fc\u011f\u00fcm\u00fc i\u00e7in DTMLiaison kullan\u0131lamaz... onun yerine org.apache.xpath.DOM2Helper aktar\u0131n!"},
+      "\u00c7\u0131k\u0131\u015f DOM d\u00fc\u011f\u00fcm\u00fc i\u00e7in DTMLiaison kullan\u0131lamaz... onun yerine com.sun.xalan.org.apache.xpath.DOM2Helper aktar\u0131n!"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "Giri\u015f DOM d\u00fc\u011f\u00fcm\u00fc i\u00e7in DTMLiaison kullan\u0131lamaz... onun yerine org.apache.xpath.DOM2Helper aktar\u0131n!"},
+      "Giri\u015f DOM d\u00fc\u011f\u00fcm\u00fc i\u00e7in DTMLiaison kullan\u0131lamaz... onun yerine com.sun.xalan.org.apache.xpath.DOM2Helper aktar\u0131n!"},
 
     { ER_CALL_TO_EXT_FAILED,
       "Eklenti \u00f6\u011fesine \u00e7a\u011fr\u0131 ba\u015far\u0131s\u0131z oldu: {0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_zh.java 338081 2004-12-15 17:35:58Z jycli $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:for-each \u4e2d\u4e0d\u5141\u8bb8\u6709 xsl:apply-imports"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "\u65e0\u6cd5\u5c06 DTMLiaison \u7528\u4e8e\u8f93\u51fa DOM \u8282\u70b9... \u6539\u4e3a\u4f20\u9012 org.apache.xpath.DOM2Helper\uff01"},
+      "\u65e0\u6cd5\u5c06 DTMLiaison \u7528\u4e8e\u8f93\u51fa DOM \u8282\u70b9... \u6539\u4e3a\u4f20\u9012 com.sun.xalan.org.apache.xpath.DOM2Helper\uff01"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "\u65e0\u6cd5\u5c06 DTMLiaison \u7528\u4e8e\u8f93\u5165 DOM \u8282\u70b9... \u6539\u4e3a\u4f20\u9012 org.apache.xpath.DOM2Helper\uff01"},
+      "\u65e0\u6cd5\u5c06 DTMLiaison \u7528\u4e8e\u8f93\u5165 DOM \u8282\u70b9... \u6539\u4e3a\u4f20\u9012 com.sun.xalan.org.apache.xpath.DOM2Helper\uff01"},
 
     { ER_CALL_TO_EXT_FAILED,
       "\u8c03\u7528\u6269\u5c55\u5143\u7d20\u5931\u8d25\uff1a{0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_CN.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_CN.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_CN.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_CN.java	Thu Aug 11 18:14:22 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 public class XSLTErrorResources_zh_CN extends XSLTErrorResources_zh
 {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_TW.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/res/XSLTErrorResources_zh_TW.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTErrorResources_zh_TW.java 468641 2006-10-28 06:54:42Z minchau $
  */
-package org.apache.xalan.res;
+package com.sun.xalan.org.apache.xalan.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -782,10 +782,10 @@
       "xsl:apply-imports \u4e0d\u5bb9\u8a31\u51fa\u73fe\u5728 xsl:for-each \u4e2d"},
 
     { ER_CANT_USE_DTM_FOR_OUTPUT,
-      "\u7121\u6cd5\u4f7f\u7528\u8f38\u51fa DOM \u7bc0\u9ede\u7684 DTMLiaison ... \u6539\u50b3\u905e org.apache.xpath.DOM2Helper\uff01"},
+      "\u7121\u6cd5\u4f7f\u7528\u8f38\u51fa DOM \u7bc0\u9ede\u7684 DTMLiaison ... \u6539\u50b3\u905e com.sun.xalan.org.apache.xpath.DOM2Helper\uff01"},
 
     { ER_CANT_USE_DTM_FOR_INPUT,
-      "\u7121\u6cd5\u4f7f\u7528\u8f38\u5165 DOM \u7bc0\u9ede\u7684 DTMLiaison ... \u6539\u50b3\u905e org.apache.xpath.DOM2Helper\uff01"},
+      "\u7121\u6cd5\u4f7f\u7528\u8f38\u5165 DOM \u7bc0\u9ede\u7684 DTMLiaison ... \u6539\u50b3\u905e com.sun.xalan.org.apache.xpath.DOM2Helper\uff01"},
 
     { ER_CALL_TO_EXT_FAILED,
       "\u547c\u53eb\u5ef6\u4f38\u9805\u76ee\u5143\u7d20\u5931\u6557\uff1a{0}"},
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/DOMSerializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/DOMSerializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/DOMSerializer.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/DOMSerializer.java	Thu Aug 11 18:14:22 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: DOMSerializer.java 468642 2006-10-28 06:55:10Z minchau $
  */
-package org.apache.xalan.serialize;
+package com.sun.xalan.org.apache.xalan.serialize;
 
 
 /**
- * @deprecated Use org.apache.xml.serializer.DOMSerializer
+ * @deprecated Use com.sun.xalan.org.apache.xml.serializer.DOMSerializer
  */
-public interface DOMSerializer extends org.apache.xml.serializer.DOMSerializer
+public interface DOMSerializer extends com.sun.xalan.org.apache.xml.serializer.DOMSerializer
 {
 
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/Serializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/Serializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/Serializer.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/Serializer.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Serializer.java 468642 2006-10-28 06:55:10Z minchau $
  */
-package org.apache.xalan.serialize;
+package com.sun.xalan.org.apache.xalan.serialize;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -31,7 +31,7 @@
  * The Serializer interface is implemented by Serializers to publish methods
  * to get and set streams and writers, to set the output properties, and
  * get the Serializer as a ContentHandler or DOMSerializer.
- * @deprecated Use org.apache.xml.serializer.Serializer
+ * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
  */
 public interface Serializer
 {
@@ -47,7 +47,7 @@
    *
    * @param output The output stream
    * 
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public void setOutputStream(OutputStream output);
 
@@ -56,7 +56,7 @@
    *
    * @return reference to the result stream, or null of only a writer was
    * set.
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public OutputStream getOutputStream();
 
@@ -70,7 +70,7 @@
    *
    * @param writer The output writer stream
    * 
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public void setWriter(Writer writer);
 
@@ -78,7 +78,7 @@
    * Get the character stream where the events will be serialized to.
    *
    * @return Reference to the result Writer, or null.
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public Writer getWriter();
 
@@ -91,7 +91,7 @@
    *
    * @param format The output format to use
    * 
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public void setOutputFormat(Properties format);
 
@@ -99,7 +99,7 @@
    * Returns the output format for this serializer.
    *
    * @return The output format in use
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public Properties getOutputFormat();
 
@@ -111,7 +111,7 @@
    * @return A {@link ContentHandler} interface into this serializer,
    *  or null if the serializer is not SAX 2 capable
    * @throws IOException An I/O exception occured
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public ContentHandler asContentHandler() throws IOException;
 
@@ -123,7 +123,7 @@
    * @return A {@link DOMSerializer} interface into this serializer,
    *  or null if the serializer is not DOM capable
    * @throws IOException An I/O exception occured
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public DOMSerializer asDOMSerializer() throws IOException;
 
@@ -136,7 +136,7 @@
    *
    * @return True if serializer has been reset and can be reused
    * 
-   * @deprecated Use org.apache.xml.serializer.Serializer
+   * @deprecated Use com.sun.xalan.org.apache.xml.serializer.Serializer
    */
   public boolean reset();
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerFactory.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerFactory.java	Thu Aug 11 18:14:22 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerFactory.java 468642 2006-10-28 06:55:10Z minchau $
  */
-package org.apache.xalan.serialize;
+package com.sun.xalan.org.apache.xalan.serialize;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -31,7 +31,7 @@
 /**
  * Factory for creating serializers.
  * @deprecated The new class to use is 
- * org.apache.xml.serializer.SerializerFactory
+ * com.sun.xalan.org.apache.xml.serializer.SerializerFactory
  */
 public abstract class SerializerFactory
 {
@@ -43,7 +43,7 @@
      * Returns a serializer for the specified output method. Returns
      * null if no implementation exists that supports the specified
      * output method. For a list of the default output methods see
-     * {@link org.apache.xml.serializer.Method}.
+     * {@link com.sun.xalan.org.apache.xml.serializer.Method}.
      *
      * @param format The output format
      * @return A suitable serializer, or null
@@ -51,12 +51,12 @@
      * null or an appropriate serializer can't be found
      * @throws WrappedRuntimeException (apparently -sc) if an
      * exception is thrown while trying to find serializer
-     * @deprecated Use org.apache.xml.serializer.SerializerFactory
+     * @deprecated Use com.sun.xalan.org.apache.xml.serializer.SerializerFactory
      */
     public static Serializer getSerializer(Properties format)
     {
-        org.apache.xml.serializer.Serializer ser;
-        ser = org.apache.xml.serializer.SerializerFactory.getSerializer(format);
+        com.sun.xalan.org.apache.xml.serializer.Serializer ser;
+        ser = com.sun.xalan.org.apache.xml.serializer.SerializerFactory.getSerializer(format);
         SerializerFactory.SerializerWrapper si = new SerializerWrapper(ser);
         return si;
 
@@ -70,10 +70,10 @@
 
     private static class SerializerWrapper implements Serializer
     {
-        private final org.apache.xml.serializer.Serializer m_serializer;
+        private final com.sun.xalan.org.apache.xml.serializer.Serializer m_serializer;
         private DOMSerializer m_old_DOMSerializer;
 
-        SerializerWrapper(org.apache.xml.serializer.Serializer ser)
+        SerializerWrapper(com.sun.xalan.org.apache.xml.serializer.Serializer ser)
         {
             m_serializer = ser;
 
@@ -116,7 +116,7 @@
 
         /**
          * @return an old style DOMSerializer that wraps a new one.
-         * @see org.apache.xalan.serialize.Serializer#asDOMSerializer()
+         * @see com.sun.xalan.org.apache.xalan.serialize.Serializer#asDOMSerializer()
          */
         public DOMSerializer asDOMSerializer() throws IOException
         {
@@ -128,7 +128,7 @@
             return m_old_DOMSerializer;
         }
         /**
-         * @see org.apache.xalan.serialize.Serializer#reset()
+         * @see com.sun.xalan.org.apache.xalan.serialize.Serializer#reset()
          */
         public boolean reset()
         {
@@ -144,8 +144,8 @@
      */
     private static class DOMSerializerWrapper implements DOMSerializer
     {
-        private final org.apache.xml.serializer.DOMSerializer m_dom;
-        DOMSerializerWrapper(org.apache.xml.serializer.DOMSerializer domser)
+        private final com.sun.xalan.org.apache.xml.serializer.DOMSerializer m_dom;
+        DOMSerializerWrapper(com.sun.xalan.org.apache.xml.serializer.DOMSerializer domser)
         {
             m_dom = domser;
         }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerUtils.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerUtils.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerUtils.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/serialize/SerializerUtils.java	Thu Aug 11 18:14:23 2011
@@ -18,23 +18,23 @@
 /*
  * $Id: SerializerUtils.java 468642 2006-10-28 06:55:10Z minchau $
  */
-package org.apache.xalan.serialize;
+package com.sun.xalan.org.apache.xalan.serialize;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.serializer.NamespaceMappings;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.serializer.NamespaceMappings;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 import org.xml.sax.SAXException;
 
 /**
  * Class that contains only static methods that are used to "serialize",
- * these methods are used by Xalan and are not in org.apache.xml.serializer
- * because they have dependancies on the packages org.apache.xpath or org.
- * apache.xml.dtm or org.apache.xalan.transformer. The package org.apache.xml.
+ * these methods are used by Xalan and are not in com.sun.xalan.org.apache.xml.serializer
+ * because they have dependancies on the packages com.sun.xalan.org.apache.xpath or org.
+ * apache.xml.dtm or com.sun.xalan.org.apache.xalan.transformer. The package com.sun.xalan.org.apache.xml.
  * serializer should not depend on Xalan or XSLTC.
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVT.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVT.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVT.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVT.java	Thu Aug 11 18:14:23 2011
@@ -18,20 +18,20 @@
 /*
  * $Id: AVT.java 469221 2006-10-30 18:26:44Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.StringTokenizer;
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.processor.StylesheetHandler;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.processor.StylesheetHandler;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.StringBufferPool;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Class to hold an Attribute Value Template.
@@ -484,7 +484,7 @@
    * @throws javax.xml.transform.TransformerException
    */
   public String evaluate(
-          XPathContext xctxt, int context, org.apache.xml.utils.PrefixResolver nsNode)
+          XPathContext xctxt, int context, com.sun.xalan.org.apache.xml.utils.PrefixResolver nsNode)
             throws javax.xml.transform.TransformerException
   {
     if (null != m_simpleString){
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPart.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPart.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPart.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPart.java	Thu Aug 11 18:14:23 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: AVTPart.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Class to hold a part, either a string or XPath,
@@ -57,7 +57,7 @@
    */
   public abstract void evaluate(
     XPathContext xctxt, FastStringBuffer buf, int context,
-      org.apache.xml.utils.PrefixResolver nsNode)
+      com.sun.xalan.org.apache.xml.utils.PrefixResolver nsNode)
         throws javax.xml.transform.TransformerException;
 
   /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartSimple.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartSimple.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartSimple.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartSimple.java	Thu Aug 11 18:14:23 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: AVTPartSimple.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Simple string part of a complex AVT.
@@ -85,7 +85,7 @@
    */
   public void evaluate(XPathContext xctxt, FastStringBuffer buf,
                        int context,
-                       org.apache.xml.utils.PrefixResolver nsNode)
+                       com.sun.xalan.org.apache.xml.utils.PrefixResolver nsNode)
   {
     buf.append(m_val);
   }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartXPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartXPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartXPath.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AVTPartXPath.java	Thu Aug 11 18:14:23 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: AVTPartXPath.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathFactory;
-import org.apache.xpath.compiler.XPathParser;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathFactory;
+import com.sun.xalan.org.apache.xpath.compiler.XPathParser;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Simple string part of a complex AVT.
@@ -96,7 +96,7 @@
    * TODO: Fix or remove this unused c'tor.
    */
   public AVTPartXPath(
-          String val, org.apache.xml.utils.PrefixResolver nsNode, 
+          String val, com.sun.xalan.org.apache.xml.utils.PrefixResolver nsNode, 
           XPathParser xpathProcessor, XPathFactory factory, 
           XPathContext liaison)
             throws javax.xml.transform.TransformerException
@@ -128,7 +128,7 @@
    * @throws javax.xml.transform.TransformerException
    */
   public void evaluate(
-          XPathContext xctxt, FastStringBuffer buf, int context, org.apache.xml.utils.PrefixResolver nsNode)
+          XPathContext xctxt, FastStringBuffer buf, int context, com.sun.xalan.org.apache.xml.utils.PrefixResolver nsNode)
             throws javax.xml.transform.TransformerException
   {
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AbsPathChecker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AbsPathChecker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/AbsPathChecker.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/AbsPathChecker.java	Thu Aug 11 18:14:23 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: AbsPathChecker.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.functions.FuncCurrent;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.operations.Variable;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.axes.LocPathIterator;
+import com.sun.xalan.org.apache.xpath.functions.FuncCurrent;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xpath.operations.Variable;
 
 /**
  * This class runs over a path expression that is assumed to be absolute, and 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/Constants.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/Constants.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/Constants.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/Constants.java	Thu Aug 11 18:14:23 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: Constants.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 
 /**
  * Primary constants used in the TransformerImpl classes.
  * @xsl.usage advanced
  */
-public class Constants extends org.apache.xml.utils.Constants
+public class Constants extends com.sun.xalan.org.apache.xml.utils.Constants
 {
 
   /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/DecimalFormatProperties.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/DecimalFormatProperties.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/DecimalFormatProperties.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/DecimalFormatProperties.java	Thu Aug 11 18:14:23 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: DecimalFormatProperties.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.text.DecimalFormatSymbols;
 
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 /**
  * Implement xsl:decimal-format.
@@ -308,7 +308,7 @@
   
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyImport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyImport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyImport.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyImport.java	Thu Aug 11 18:14:23 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ElemApplyImport.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * Implement xsl:apply-imports.
@@ -40,7 +40,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return Token ID for xsl:apply-imports element types
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyTemplates.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyTemplates.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyTemplates.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemApplyTemplates.java	Thu Aug 11 18:14:23 2011
@@ -18,23 +18,23 @@
 /*
  * $Id: ElemApplyTemplates.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.StackGuard;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.transformer.StackGuard;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 import org.xml.sax.SAXException;
 
 /**
@@ -109,7 +109,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return Token ID for this element types
    */
@@ -232,7 +232,7 @@
       {
         transformer.getTraceManager().fireSelectedEvent(sourceNode, this,
                 "select", new XPath(m_selectExpression),
-                new org.apache.xpath.objects.XNodeSet(sourceNodes));
+                new com.sun.xalan.org.apache.xpath.objects.XNodeSet(sourceNodes));
       }
 
       final SerializationHandler rth = transformer.getSerializationHandler();
@@ -437,7 +437,7 @@
       if (transformer.getDebug())
         transformer.getTraceManager().fireSelectedEndEvent(sourceNode, this,
                 "select", new XPath(m_selectExpression),
-                new org.apache.xpath.objects.XNodeSet(sourceNodes));
+                new com.sun.xalan.org.apache.xpath.objects.XNodeSet(sourceNodes));
       
       // Unlink to the original stack frame  
       if(nParams > 0)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttribute.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttribute.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttribute.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttribute.java	Thu Aug 11 18:14:23 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ElemAttribute.java 469304 2006-10-30 22:29:47Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.serializer.NamespaceMappings;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.serializer.NamespaceMappings;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 import org.xml.sax.SAXException;
 
@@ -50,7 +50,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttributeSet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttributeSet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttributeSet.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemAttributeSet.java	Thu Aug 11 18:14:23 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ElemAttributeSet.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 /**
  * Implement xsl:attribute-set.
@@ -73,7 +73,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return Token ID of the element 
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCallTemplate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCallTemplate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCallTemplate.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCallTemplate.java	Thu Aug 11 18:14:23 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: ElemCallTemplate.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Implement xsl:call-template.
@@ -85,7 +85,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element 
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemChoose.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemChoose.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemChoose.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemChoose.java	Thu Aug 11 18:14:23 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ElemChoose.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Implement xsl:choose.
@@ -42,7 +42,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemComment.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemComment.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemComment.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemComment.java	Thu Aug 11 18:14:23 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ElemComment.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
 
 /**
  * Implement xsl:comment.
@@ -40,7 +40,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopy.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopy.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopy.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopy.java	Thu Aug 11 18:14:23 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ElemCopy.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.ClonerToResultTree;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xalan.serialize.SerializerUtils;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.transformer.ClonerToResultTree;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.serialize.SerializerUtils;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Implement xsl:copy.
@@ -47,7 +47,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element 
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopyOf.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopyOf.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopyOf.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemCopyOf.java	Thu Aug 11 18:14:23 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: ElemCopyOf.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.TreeWalker2Result;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.ref.DTMTreeWalker;
-import org.apache.xalan.serialize.SerializerUtils;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.transformer.TreeWalker2Result;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMTreeWalker;
+import com.sun.xalan.org.apache.xalan.serialize.SerializerUtils;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Implement xsl:copy-of.
@@ -91,7 +91,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemElement.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemElement.java	Thu Aug 11 18:14:23 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ElemElement.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XML11Char;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 import org.xml.sax.SAXException;
 
 /**
@@ -140,7 +140,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemEmpty.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemEmpty.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemEmpty.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemEmpty.java	Thu Aug 11 18:14:23 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemEmpty.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFuncResult.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFuncResult.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFuncResult.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFuncResult.java	Thu Aug 11 18:14:23 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ElemExsltFuncResult.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Handles the EXSLT result element within an EXSLT function element.
@@ -80,7 +80,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
@@ -90,7 +90,7 @@
   /**
    * Return the node name, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    * @return The node name
    * 
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFunction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFunction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFunction.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExsltFunction.java	Thu Aug 11 18:14:23 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: ElemExsltFunction.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.extensions.ExtensionNamespaceSupport;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionNamespaceSupport;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -44,7 +44,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
@@ -54,7 +54,7 @@
    /**
    * Return the node name, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    * @return The node name
    * 
    */ 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionCall.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionCall.java	Thu Aug 11 18:14:23 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ElemExtensionCall.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.extensions.ExtensionHandler;
-import org.apache.xalan.extensions.ExtensionsTable;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionHandler;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionsTable;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 import org.xml.sax.SAXException;
 
 /**
@@ -61,7 +61,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    *@return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionDecl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionDecl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionDecl.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionDecl.java	Thu Aug 11 18:14:23 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ElemExtensionDecl.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.extensions.ExtensionNamespaceSupport;
-import org.apache.xalan.extensions.ExtensionNamespacesManager;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionNamespaceSupport;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionNamespacesManager;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
 
 /**
  * Implement the declaration of an extension element 
@@ -187,7 +187,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
@@ -256,7 +256,7 @@
       }
       else  // not java
       {
-        String handler = "org.apache.xalan.extensions.ExtensionHandlerGeneral";
+        String handler = "com.sun.xalan.org.apache.xalan.extensions.ExtensionHandlerGeneral";
         Object [] args = {declNamespace, this.m_elements, this.m_functions,
                           lang, srcURL, scriptSrc, getSystemId()};
         extNsSpt = new ExtensionNamespaceSupport(declNamespace, handler, args);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionScript.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionScript.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionScript.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemExtensionScript.java	Thu Aug 11 18:14:23 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemExtensionScript.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 /**
  * Implement Script extension element
@@ -92,7 +92,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element 
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemFallback.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemFallback.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemFallback.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemFallback.java	Thu Aug 11 18:14:23 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: ElemFallback.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
 
 /**
  * Implement xsl:fallback.
@@ -39,7 +39,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemForEach.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemForEach.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemForEach.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemForEach.java	Thu Aug 11 18:14:23 2011
@@ -18,22 +18,22 @@
 /*
  * $Id: ElemForEach.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.NodeSorter;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.utils.IntStack;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.transformer.NodeSorter;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 import java.io.ObjectInputStream;
 import java.io.IOException;
@@ -227,7 +227,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
@@ -356,7 +356,7 @@
          *            this,
          *            "select",
          *            new XPath(m_selectExpression),
-         *            new org.apache.xpath.objects.XNodeSet(sourceNodes));
+         *            new com.sun.xalan.org.apache.xpath.objects.XNodeSet(sourceNodes));
          */ 
 
         // The following code fixes bug#16889
@@ -364,7 +364,7 @@
         // Pass m_xath, which the current node is associated with, onto the TraceManager.
         
         Expression expr = m_xpath.getExpression();
-        org.apache.xpath.objects.XObject xObject = expr.execute(xctxt);
+        com.sun.xalan.org.apache.xpath.objects.XObject xObject = expr.execute(xctxt);
         int current = xctxt.getCurrentNode();
         transformer.getTraceManager().fireSelectedEvent(
             current,
@@ -462,7 +462,7 @@
       if (transformer.getDebug())
         transformer.getTraceManager().fireSelectedEndEvent(sourceNode, this,
                 "select", new XPath(m_selectExpression),
-                new org.apache.xpath.objects.XNodeSet(sourceNodes));
+                new com.sun.xalan.org.apache.xpath.objects.XNodeSet(sourceNodes));
 
       xctxt.popSAXLocator();
       xctxt.popContextNodeList();
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemIf.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemIf.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemIf.java	Mon Nov 14 16:40:53 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemIf.java	Thu Aug 11 18:14:23 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ElemIf.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Implement xsl:if.
@@ -94,7 +94,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemLiteralResult.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemLiteralResult.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemLiteralResult.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemLiteralResult.java	Thu Aug 11 18:14:23 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemLiteralResult.java 476350 2006-11-17 22:53:23Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,12 +26,12 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.StringVector;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -1192,7 +1192,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemMessage.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemMessage.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemMessage.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemMessage.java	Thu Aug 11 18:14:23 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ElemMessage.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
 
 /**
  * Implement xsl:message.
@@ -78,7 +78,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemNumber.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemNumber.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemNumber.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemNumber.java	Thu Aug 11 18:14:23 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemNumber.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -28,30 +28,30 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.CountersTable;
-import org.apache.xalan.transformer.DecimalToRoman;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xml.utils.res.XResourceBundle;
-import org.apache.xml.utils.res.CharArrayWrapper;
-import org.apache.xml.utils.res.IntArrayWrapper;
-import org.apache.xml.utils.res.LongArrayWrapper;
-import org.apache.xml.utils.res.StringArrayWrapper;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.CountersTable;
+import com.sun.xalan.org.apache.xalan.transformer.DecimalToRoman;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.NodeVector;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.StringBufferPool;
+import com.sun.xalan.org.apache.xml.utils.res.XResourceBundle;
+import com.sun.xalan.org.apache.xml.utils.res.CharArrayWrapper;
+import com.sun.xalan.org.apache.xml.utils.res.IntArrayWrapper;
+import com.sun.xalan.org.apache.xml.utils.res.LongArrayWrapper;
+import com.sun.xalan.org.apache.xml.utils.res.StringArrayWrapper;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Node;
 
 import org.xml.sax.SAXException;
 
-// import org.apache.xalan.dtm.*;
+// import com.sun.xalan.org.apache.xalan.dtm.*;
 
 /**
  * Implement xsl:number.
@@ -482,7 +482,7 @@
 
   /**
    * Table to help in converting decimals to roman numerals.
-   * @see org.apache.xalan.transformer.DecimalToRoman
+   * @see com.sun.xalan.org.apache.xalan.transformer.DecimalToRoman
    */
   private final static DecimalToRoman m_romanConvertTable[] = {
     new DecimalToRoman(1000, "M", 900, "CM"),
@@ -525,7 +525,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
@@ -1345,8 +1345,8 @@
         if (null == m_alphaCountTable){
                 thisBundle =
                   (XResourceBundle) XResourceBundle.loadResourceBundle(
-                    org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, getLocale(transformer, contextNode));
-                m_alphaCountTable = (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET);                
+                    com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, getLocale(transformer, contextNode));
+                m_alphaCountTable = (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET);                
         }
       int2alphaCount(listElement, m_alphaCountTable, formattedNumber);
       break;
@@ -1354,8 +1354,8 @@
         if (null == m_alphaCountTable){
                 thisBundle =
                   (XResourceBundle) XResourceBundle.loadResourceBundle(
-                    org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, getLocale(transformer, contextNode));
-                m_alphaCountTable = (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET);                
+                    com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, getLocale(transformer, contextNode));
+                m_alphaCountTable = (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET);                
         }
       FastStringBuffer stringBuf = StringBufferPool.get();
 
@@ -1383,7 +1383,7 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "HA"));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "HA"));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
@@ -1392,7 +1392,7 @@
         formattedNumber.append(
           int2singlealphaCount(
             listElement,
-            (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
+            (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
 
       break;
     }
@@ -1400,7 +1400,7 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "HI"));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "HI"));
 
       if ((letterVal != null)
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
@@ -1409,7 +1409,7 @@
         formattedNumber.append(
           int2singlealphaCount(
             listElement,
-            (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
+            (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
 
       break;
     }
@@ -1417,7 +1417,7 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "A"));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "A"));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
@@ -1426,7 +1426,7 @@
         formattedNumber.append(
           int2singlealphaCount(
             listElement,
-            (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
+            (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
 
       break;
     }
@@ -1434,7 +1434,7 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "I"));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ja", "JP", "I"));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
@@ -1443,7 +1443,7 @@
         formattedNumber.append(
           int2singlealphaCount(
             listElement,
-            (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
+            (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET)));
 
       break;
     }
@@ -1451,7 +1451,7 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("zh", "CN"));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("zh", "CN"));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
@@ -1460,7 +1460,7 @@
       }
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1469,14 +1469,14 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("zh", "TW"));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("zh", "TW"));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
         formattedNumber.append(tradAlphaCount(listElement, thisBundle));
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1485,14 +1485,14 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("th", ""));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("th", ""));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
         formattedNumber.append(tradAlphaCount(listElement, thisBundle));
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1501,14 +1501,14 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("he", ""));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("he", ""));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
         formattedNumber.append(tradAlphaCount(listElement, thisBundle));
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1517,14 +1517,14 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ka", ""));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("ka", ""));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
         formattedNumber.append(tradAlphaCount(listElement, thisBundle));
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1533,14 +1533,14 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("el", ""));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("el", ""));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
         formattedNumber.append(tradAlphaCount(listElement, thisBundle));
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1549,14 +1549,14 @@
     {
 
       thisBundle = (XResourceBundle) XResourceBundle.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("cy", ""));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_BUNDLE_NAME, new Locale("cy", ""));
 
       if (letterVal != null
               && letterVal.equals(Constants.ATTRVAL_TRADITIONAL))
         formattedNumber.append(tradAlphaCount(listElement, thisBundle));
       else  //if (m_lettervalue_avt != null && m_lettervalue_avt.equals(Constants.ATTRVAL_ALPHABETIC))
         int2alphaCount(listElement,
-                       (CharArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
+                       (CharArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ALPHABET),
                        formattedNumber);
 
       break;
@@ -1649,7 +1649,7 @@
 
     //some languages go left to right(ie. english), right to left (ie. Hebrew),
     //top to bottom (ie.Japanese), etc... Handle them differently
-    //String orientation = thisBundle.getString(org.apache.xml.utils.res.XResourceBundle.LANG_ORIENTATION);
+    //String orientation = thisBundle.getString(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ORIENTATION);
     // next character to set in the buffer
     int charPos;
 
@@ -1747,29 +1747,29 @@
 
     //some languages go left to right(ie. english), right to left (ie. Hebrew),
     //top to bottom (ie.Japanese), etc... Handle them differently
-    //String orientation = thisBundle.getString(org.apache.xml.utils.res.XResourceBundle.LANG_ORIENTATION);
+    //String orientation = thisBundle.getString(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_ORIENTATION);
     // next character to set in the buffer
     int charPos;
 
     charPos = 0;  //start at 0
 
     // array of number groups: ie.1000, 100, 10, 1
-    IntArrayWrapper groups = (IntArrayWrapper) thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_NUMBERGROUPS);
+    IntArrayWrapper groups = (IntArrayWrapper) thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_NUMBERGROUPS);
 
     // array of tables of hundreds, tens, digits...
     StringArrayWrapper tables =
-      (StringArrayWrapper) (thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_NUM_TABLES));
+      (StringArrayWrapper) (thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_NUM_TABLES));
 
     //some languages have additive alphabetical notation,
     //some multiplicative-additive, etc... Handle them differently.
-    String numbering = thisBundle.getString(org.apache.xml.utils.res.XResourceBundle.LANG_NUMBERING);
+    String numbering = thisBundle.getString(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_NUMBERING);
 
     // do multiplicative part first
-    if (numbering.equals(org.apache.xml.utils.res.XResourceBundle.LANG_MULT_ADD))
+    if (numbering.equals(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_MULT_ADD))
     {
-      String mult_order = thisBundle.getString(org.apache.xml.utils.res.XResourceBundle.MULT_ORDER);
+      String mult_order = thisBundle.getString(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.MULT_ORDER);
       LongArrayWrapper multiplier =
-        (LongArrayWrapper) (thisBundle.getObject(org.apache.xml.utils.res.XResourceBundle.LANG_MULTIPLIER));
+        (LongArrayWrapper) (thisBundle.getObject(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_MULTIPLIER));
       CharArrayWrapper zeroChar = (CharArrayWrapper) thisBundle.getObject("zero");
       int i = 0;
 
@@ -1840,12 +1840,12 @@
                 break;
 
               char multiplierChar = ((CharArrayWrapper) (thisBundle.getObject(
-                org.apache.xml.utils.res.XResourceBundle.LANG_MULTIPLIER_CHAR))).getChar(i);
+                com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.LANG_MULTIPLIER_CHAR))).getChar(i);
 
               // put out the next character of output   
               if (lookupIndex < table.length)
               {
-                if (mult_order.equals(org.apache.xml.utils.res.XResourceBundle.MULT_PRECEDES))
+                if (mult_order.equals(com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.MULT_PRECEDES))
                 {
                   buf[charPos++] = multiplierChar;
                   buf[charPos++] = table[lookupIndex];
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemOtherwise.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemOtherwise.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemOtherwise.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemOtherwise.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemOtherwise.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 
 /**
@@ -36,7 +36,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemPI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemPI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemPI.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemPI.java	Thu Aug 11 18:14:24 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ElemPI.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.XML11Char;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Implement xsl:processing-instruction.
@@ -92,7 +92,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for the element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemParam.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemParam.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemParam.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemParam.java	Thu Aug 11 18:14:24 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ElemParam.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Implement xsl:param.
@@ -51,7 +51,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID of the element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemSort.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemSort.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemSort.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemSort.java	Thu Aug 11 18:14:24 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ElemSort.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
@@ -284,7 +284,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID of the element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplate.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplate.java	Thu Aug 11 18:14:24 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: ElemTemplate.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Implement xsl:template.
@@ -297,7 +297,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for the element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplateElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplateElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplateElement.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTemplateElement.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemTemplateElement.java 475981 2006-11-16 23:35:53Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -28,14 +28,14 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.UnImplNode;
-import org.apache.xpath.ExpressionNode;
-import org.apache.xpath.WhitespaceStrippingElementMatcher;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.UnImplNode;
+import com.sun.xalan.org.apache.xpath.ExpressionNode;
+import com.sun.xalan.org.apache.xpath.WhitespaceStrippingElementMatcher;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -84,7 +84,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
@@ -1531,7 +1531,7 @@
    * @throws TransformerException
    */
   public boolean shouldStripWhiteSpace(
-          org.apache.xpath.XPathContext support, 
+          com.sun.xalan.org.apache.xpath.XPathContext support, 
           org.w3c.dom.Element targetElement) throws TransformerException
   {
     StylesheetRoot sroot = this.getStylesheetRoot();
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemText.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemText.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemText.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemText.java	Thu Aug 11 18:14:24 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ElemText.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * Implement xsl:template.
@@ -100,7 +100,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTextLiteral.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTextLiteral.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTextLiteral.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemTextLiteral.java	Thu Aug 11 18:14:24 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ElemTextLiteral.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 import org.xml.sax.SAXException;
 
 /**
@@ -173,7 +173,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUnknown.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUnknown.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUnknown.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUnknown.java	Thu Aug 11 18:14:24 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: ElemUnknown.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 
 /**
@@ -37,7 +37,7 @@
 
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    *@return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUse.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUse.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUse.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemUse.java	Thu Aug 11 18:14:24 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: ElemUse.java 476466 2006-11-18 08:22:31Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 /**
  * Implement xsl:use.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemValueOf.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemValueOf.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemValueOf.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemValueOf.java	Thu Aug 11 18:14:24 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: ElemValueOf.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 import org.xml.sax.SAXException;
 
 /**
@@ -155,7 +155,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariable.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariable.java	Thu Aug 11 18:14:24 2011
@@ -18,19 +18,19 @@
 /*
  * $Id: ElemVariable.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XRTreeFragSelectWrapper;
-import org.apache.xpath.objects.XString;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XRTreeFrag;
+import com.sun.xalan.org.apache.xpath.objects.XRTreeFragSelectWrapper;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 /**
  * Implement xsl:variable.
@@ -194,7 +194,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariablePsuedo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariablePsuedo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariablePsuedo.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemVariablePsuedo.java	Thu Aug 11 18:14:24 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ElemVariablePsuedo.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 public class ElemVariablePsuedo extends ElemVariable
 {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWhen.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWhen.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWhen.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWhen.java	Thu Aug 11 18:14:24 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ElemWhen.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 /**
  * Implement xsl:when.
@@ -74,7 +74,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWithParam.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWithParam.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWithParam.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/ElemWithParam.java	Thu Aug 11 18:14:24 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: ElemWithParam.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XRTreeFrag;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Implement xsl:with-param.  xsl:with-param is allowed within
@@ -122,7 +122,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncDocument.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncDocument.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncDocument.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncDocument.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: FuncDocument.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -29,19 +29,19 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.Expression;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.SourceTreeManager;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.functions.Function2Args;
-import org.apache.xpath.functions.WrongNumberArgsException;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.SourceTreeManager;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.functions.Function2Args;
+import com.sun.xalan.org.apache.xpath.functions.WrongNumberArgsException;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Doc() function.
@@ -288,16 +288,16 @@
 
       // path.warn(XSLTErrorResources.WG_ENCODING_NOT_SUPPORTED_USING_JAVA, new Object[]{((base == null) ? "" : base )+uri}); //"Can not load requested doc: "+((base == null) ? "" : base )+uri);
       while (throwable
-             instanceof org.apache.xml.utils.WrappedRuntimeException)
+             instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
       {
         throwable =
-          ((org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
+          ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
       }
 
       if ((throwable instanceof NullPointerException)
               || (throwable instanceof ClassCastException))
       {
-        throw new org.apache.xml.utils.WrappedRuntimeException(
+        throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(
           (Exception) throwable);
       }
 
@@ -332,8 +332,8 @@
 
               e = spe2.getException();
 
-              if (e instanceof org.apache.xml.utils.WrappedRuntimeException)
-                e = ((org.apache.xml.utils.WrappedRuntimeException) e).getException();
+              if (e instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
+                e = ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) e).getException();
             }
             else
               e = null;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncFormatNumb.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncFormatNumb.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncFormatNumb.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncFormatNumb.java	Thu Aug 11 18:14:24 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: FuncFormatNumb.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.functions.Function3Args;
-import org.apache.xpath.functions.WrongNumberArgsException;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.functions.Function3Args;
+import com.sun.xalan.org.apache.xpath.functions.WrongNumberArgsException;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the FormatNumber() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncKey.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncKey.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncKey.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/FuncKey.java	Thu Aug 11 18:14:24 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: FuncKey.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Hashtable;
 
-import org.apache.xalan.transformer.KeyManager;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.UnionPathIterator;
-import org.apache.xpath.functions.Function2Args;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.transformer.KeyManager;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.UnionPathIterator;
+import com.sun.xalan.org.apache.xpath.functions.Function2Args;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Key() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/KeyDeclaration.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/KeyDeclaration.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/KeyDeclaration.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/KeyDeclaration.java	Thu Aug 11 18:14:24 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: KeyDeclaration.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 /**
  * Holds the attribute declarations for the xsl:keys element.
@@ -159,7 +159,7 @@
   
   /**
    * Get an int constant identifying the type of element.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    *
    * @return The token ID for this element
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/NamespaceAlias.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/NamespaceAlias.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/NamespaceAlias.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/NamespaceAlias.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NamespaceAlias.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 /**
  * Object to hold an xsl:namespace element.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/OutputProperties.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/OutputProperties.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/OutputProperties.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/OutputProperties.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: OutputProperties.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Enumeration;
 import java.util.Properties;
@@ -27,17 +27,17 @@
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.serializer.OutputPropertiesFactory;
-import org.apache.xml.serializer.OutputPropertyUtils;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.serializer.OutputPropertiesFactory;
+import com.sun.xalan.org.apache.xml.serializer.OutputPropertyUtils;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 /**
  * This class provides information from xsl:output elements. It is mainly
  * a wrapper for {@link java.util.Properties}, but can not extend that class
- * because it must be part of the {@link org.apache.xalan.templates.ElemTemplateElement}
+ * because it must be part of the {@link com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement}
  * heararchy.
  * <p>An OutputProperties list can contain another OutputProperties list as
  * its "defaults"; this second property list is searched if the property key
@@ -55,7 +55,7 @@
    */
   public OutputProperties()
   {
-    this(org.apache.xml.serializer.Method.XML);
+    this(com.sun.xalan.org.apache.xml.serializer.Method.XML);
   }
 
   /**
@@ -679,11 +679,11 @@
      *
      * @return Properties object that holds the defaults for the given method.
      * 
-     * @deprecated Use org.apache.xml.serializer.OuputPropertiesFactory.
+     * @deprecated Use com.sun.xalan.org.apache.xml.serializer.OuputPropertiesFactory.
      * getDefaultMethodProperties directly.
      */
     static public Properties getDefaultMethodProperties(String method)
     {
-        return org.apache.xml.serializer.OutputPropertiesFactory.getDefaultMethodProperties(method);
+        return com.sun.xalan.org.apache.xml.serializer.OutputPropertiesFactory.getDefaultMethodProperties(method);
     }
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/RedundentExprEliminator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/RedundentExprEliminator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/RedundentExprEliminator.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/RedundentExprEliminator.java	Thu Aug 11 18:14:24 2011
@@ -18,27 +18,27 @@
 /*
  * $Id: RedundentExprEliminator.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Vector;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionNode;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPath;
-import org.apache.xpath.axes.AxesWalker;
-import org.apache.xpath.axes.FilterExprIteratorSimple;
-import org.apache.xpath.axes.FilterExprWalker;
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.axes.SelfIteratorNoPredicate;
-import org.apache.xpath.axes.WalkerFactory;
-import org.apache.xpath.axes.WalkingIterator;
-import org.apache.xpath.operations.Variable;
-import org.apache.xpath.operations.VariableSafeAbsRef;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionNode;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.axes.AxesWalker;
+import com.sun.xalan.org.apache.xpath.axes.FilterExprIteratorSimple;
+import com.sun.xalan.org.apache.xpath.axes.FilterExprWalker;
+import com.sun.xalan.org.apache.xpath.axes.LocPathIterator;
+import com.sun.xalan.org.apache.xpath.axes.SelfIteratorNoPredicate;
+import com.sun.xalan.org.apache.xpath.axes.WalkerFactory;
+import com.sun.xalan.org.apache.xpath.axes.WalkingIterator;
+import com.sun.xalan.org.apache.xpath.operations.Variable;
+import com.sun.xalan.org.apache.xpath.operations.VariableSafeAbsRef;
 
 /**
  * This class eleminates redundent XPaths from a given subtree, 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/Stylesheet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/Stylesheet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/Stylesheet.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/Stylesheet.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Stylesheet.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -30,10 +30,10 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 
 /**
  * Represents a stylesheet element.
@@ -1340,7 +1340,7 @@
    *
    * @return An integer representation of the element, defined in the
    *     Constants class.
-   * @see org.apache.xalan.templates.Constants
+   * @see com.sun.xalan.org.apache.xalan.templates.Constants
    */
   public int getXSLToken()
   {
@@ -1454,7 +1454,7 @@
         }
         catch (TransformerException te)
         {
-          throw new org.apache.xml.utils.WrappedRuntimeException(te);
+          throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
         }
       }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetComposed.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetComposed.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetComposed.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetComposed.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StylesheetComposed.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetRoot.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetRoot.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetRoot.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/StylesheetRoot.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StylesheetRoot.java 476466 2006-11-18 08:22:31Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
@@ -33,18 +33,18 @@
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.extensions.ExtensionNamespacesManager;
-import org.apache.xalan.processor.XSLTSchema;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.ref.ExpandedNameTable;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionNamespacesManager;
+import com.sun.xalan.org.apache.xalan.processor.XSLTSchema;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.ref.ExpandedNameTable;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * This class represents the root object of the stylesheet tree.
@@ -285,7 +285,7 @@
     // We set up the global variables that will hold the recomposed information.
 
 
-    m_outputProperties = new OutputProperties(org.apache.xml.serializer.Method.UNKNOWN);
+    m_outputProperties = new OutputProperties(com.sun.xalan.org.apache.xml.serializer.Method.UNKNOWN);
 //  m_outputProperties = new OutputProperties(Method.XML);
     
     m_attrSets = new HashMap();
@@ -310,7 +310,7 @@
     // eleminateRedundentGlobals will add variables to the m_variables vector, which 
     // it then copied in the ComposeState constructor.
     
-//    if(true && org.apache.xalan.processor.TransformerFactoryImpl.m_optimize)
+//    if(true && com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl.m_optimize)
 //    {
 //          RedundentExprEliminator ree = new RedundentExprEliminator();
 //          callVisitors(ree);
@@ -1219,7 +1219,7 @@
     }
 
     private String m_extensionHandlerClass = 
-        "org.apache.xalan.extensions.ExtensionHandlerExsltFunction";
+        "com.sun.xalan.org.apache.xalan.extensions.ExtensionHandlerExsltFunction";
     
     /**
      * This internal method allows the setting of the java class
@@ -1273,7 +1273,7 @@
                                        qname.getLocalName(),
                                        // The type doesn't matter for our 
                                        // purposes. 
-                                       org.apache.xml.dtm.DTM.ELEMENT_NODE);
+                                       com.sun.xalan.org.apache.xml.dtm.DTM.ELEMENT_NODE);
       }
       
       /**
@@ -1288,7 +1288,7 @@
        * @param qname A qualified name of a param or variable, should be non-null.
        * @return the index where the variable was added.
        */
-      int addVariableName(final org.apache.xml.utils.QName qname)
+      int addVariableName(final com.sun.xalan.org.apache.xml.utils.QName qname)
       {
         int pos = m_variableNames.size();
         m_variableNames.addElement(qname);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateList.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateList.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TemplateList.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -26,16 +26,16 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.PsuedoNames;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.patterns.StepPattern;
-import org.apache.xpath.patterns.UnionPattern;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.PsuedoNames;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xpath.patterns.UnionPattern;
 
 /**
  * Encapsulates a template list, and helps locate individual templates.
@@ -378,11 +378,11 @@
    *
    * @param matchPat The match pattern to template association.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST}, 
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE}, 
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD}, 
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}, or 
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST}, 
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE}, 
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD}, 
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}, or 
    *         the value defined by the priority attribute of the template.
    *
    */
@@ -798,7 +798,7 @@
    * that are template elements.
    *
    * @return A Hashtable dictionary that contains {@link java.lang.String}s 
-   * as the keys, and {@link org.apache.xalan.templates.ElemTemplate}s as the 
+   * as the keys, and {@link com.sun.xalan.org.apache.xalan.templates.ElemTemplate}s as the 
    * values. 
    */
   private Hashtable getNamedTemplates()
@@ -812,7 +812,7 @@
    * that are template elements in the XSL DOM tree.
    *
    * @param v Hashtable dictionary that contains {@link java.lang.String}s 
-   * as the keys, and {@link org.apache.xalan.templates.ElemTemplate}s as the 
+   * as the keys, and {@link com.sun.xalan.org.apache.xalan.templates.ElemTemplate}s as the 
    * values.
    */
   private void setNamedTemplates(Hashtable v)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateSubPatternAssociation.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateSubPatternAssociation.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateSubPatternAssociation.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/TemplateSubPatternAssociation.java	Thu Aug 11 18:14:24 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: TemplateSubPatternAssociation.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.io.Serializable;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
 
 /**
  * A class to contain a match pattern and it's corresponding template.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/VarNameCollector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/VarNameCollector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/VarNameCollector.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/VarNameCollector.java	Thu Aug 11 18:14:24 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: VarNameCollector.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 import java.util.Vector;
 
-import org.apache.xml.utils.QName;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.operations.Variable;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.operations.Variable;
 
 /**
  * This class visits variable refs in an XPath and collects their QNames.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/WhiteSpaceInfo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/WhiteSpaceInfo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/WhiteSpaceInfo.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/WhiteSpaceInfo.java	Thu Aug 11 18:14:24 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: WhiteSpaceInfo.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 /**
  * This is used as a special "fake" template that can be
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XMLNSDecl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XMLNSDecl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XMLNSDecl.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XMLNSDecl.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLNSDecl.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 /**
  * Represents an xmlns declaration
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitable.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitable.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLTVisitable.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
 /**
  * A class that implements this interface will call a XSLTVisitor 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitor.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitor.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitor.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XSLTVisitor.java	Thu Aug 11 18:14:24 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: XSLTVisitor.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
 
 /**
  * A derivation from this class can be passed to a class that implements 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariable.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariable.java	Thu Aug 11 18:14:24 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: XUnresolvedVariable.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * An instance of this class holds unto a variable until 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariableSimple.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariableSimple.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariableSimple.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/templates/XUnresolvedVariableSimple.java	Thu Aug 11 18:14:24 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XUnresolvedVariableSimple.java 468643 2006-10-28 06:56:03Z minchau $
  */
-package org.apache.xalan.templates;
+package com.sun.xalan.org.apache.xalan.templates;
 
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/EndSelectionEvent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/EndSelectionEvent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/EndSelectionEvent.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/EndSelectionEvent.java	Thu Aug 11 18:14:24 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: EndSelectionEvent.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Node;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/ExtensionEvent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/ExtensionEvent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/ExtensionEvent.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/ExtensionEvent.java	Thu Aug 11 18:14:24 2011
@@ -19,12 +19,12 @@
  * $Id: ExtensionEvent.java 468644 2006-10-28 06:56:42Z minchau $
  */
  
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-import org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
 
 /**
  * An event representing an extension call.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/GenerateEvent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/GenerateEvent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/GenerateEvent.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/GenerateEvent.java	Thu Aug 11 18:14:24 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: GenerateEvent.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
-import org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
 import org.xml.sax.Attributes;
 
 /**
@@ -28,10 +28,10 @@
  * This event responds to and is modeled on the SAX events that are sent to the
  * formatter listener FormatterToXXX)classes.
  *
- * @see org.apache.xml.utils.DOMBuilder
- * @see org.apache.xml.serializer.ToHTMLStream
- * @see org.apache.xml.serializer.ToTextStream
- * @see org.apache.xml.serializer.ToXMLStream
+ * @see com.sun.xalan.org.apache.xml.utils.DOMBuilder
+ * @see com.sun.xalan.org.apache.xml.serializer.ToHTMLStream
+ * @see com.sun.xalan.org.apache.xml.serializer.ToTextStream
+ * @see com.sun.xalan.org.apache.xml.serializer.ToXMLStream
  *
  * @xsl.usage advanced
  */
@@ -41,7 +41,7 @@
   /**
    * The XSLT Transformer, which either directly or indirectly contains most needed information.
    *
-   * @see org.apache.xalan.transformer.TransformerImpl
+   * @see com.sun.xalan.org.apache.xalan.transformer.TransformerImpl
    */
   public TransformerImpl m_processor;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/PrintTraceListener.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/PrintTraceListener.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/PrintTraceListener.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/PrintTraceListener.java	Thu Aug 11 18:14:24 2011
@@ -18,20 +18,20 @@
 /*
  * $Id: PrintTraceListener.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xml.serializer.SerializerTrace;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemTextLiteral;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy;
+import com.sun.xalan.org.apache.xml.serializer.SerializerTrace;
 
 import org.w3c.dom.Node;
 
@@ -39,7 +39,7 @@
  * Implementation of the TraceListener interface that
  * prints each event to standard out as it occurs.
  *
- * @see org.apache.xalan.trace.TracerEvent
+ * @see com.sun.xalan.org.apache.xalan.trace.TracerEvent
  * @xsl.usage advanced
  */
 public class PrintTraceListener implements TraceListenerEx3
@@ -252,7 +252,7 @@
         if (ev.m_selection.getType() == ev.m_selection.CLASS_NODESET) {
             m_pw.println();
 
-            org.apache.xml.dtm.DTMIterator nl = ev.m_selection.iter();
+            com.sun.xalan.org.apache.xml.dtm.DTMIterator nl = ev.m_selection.iter();
             
             // The following lines are added to fix bug#16222.
             // The main cause is that the following loop change the state of iterator, which is shared
@@ -261,7 +261,7 @@
             int currentPos = DTM.NULL;
             currentPos = nl.getCurrentPos();
             nl.setShouldCacheNodes(true); // This MUST be done before we clone the iterator!
-            org.apache.xml.dtm.DTMIterator clone = null;
+            com.sun.xalan.org.apache.xml.dtm.DTMIterator clone = null;
             // End of block
             
             try {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/SelectionEvent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/SelectionEvent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/SelectionEvent.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/SelectionEvent.java	Thu Aug 11 18:14:24 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: SelectionEvent.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Node;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListener.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListener.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListener.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListener.java	Thu Aug 11 18:14:24 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: TraceListener.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 
 /**
  * Interface the XSL processor calls when it matches a source node, selects a set of source nodes,
  * or generates a result node.
  * If you want an object instance to be called when a trace event occurs, use the TransformerImpl setTraceListener method.
- * @see org.apache.xalan.trace.TracerEvent
- * @see org.apache.xalan.trace.TraceManager#addTraceListener
+ * @see com.sun.xalan.org.apache.xalan.trace.TracerEvent
+ * @see com.sun.xalan.org.apache.xalan.trace.TraceManager#addTraceListener
  * @xsl.usage advanced
  */
 public interface TraceListener extends java.util.EventListener
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TraceListenerEx.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 /**
  * Extends TraceListener but adds a SelectEnd event.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx2.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx2.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx2.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx2.java	Thu Aug 11 18:14:24 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TraceListenerEx2.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 /**
  * Extends TraceListenerEx but adds a EndTrace event.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx3.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx3.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx3.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceListenerEx3.java	Thu Aug 11 18:14:24 2011
@@ -19,7 +19,7 @@
  * $Id: TraceListenerEx3.java 468644 2006-10-28 06:56:42Z minchau $
  */
  
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 /**
  * Extends TraceListenerEx2 but adds extensions trace events.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceManager.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TraceManager.java	Thu Aug 11 18:14:24 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: TraceManager.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
 import java.lang.reflect.Method;
 import java.util.TooManyListenersException;
 import java.util.Vector;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 import org.w3c.dom.Node;
 
 /**
@@ -420,7 +420,7 @@
    * @param sourceNode the handle on the node used by a DTM.
    */
   private Node getDOMNodeFromDTM(int sourceNode) {
-    org.apache.xml.dtm.DTM dtm = m_transformer.getXPathContext().getDTM(sourceNode);
+    com.sun.xalan.org.apache.xml.dtm.DTM dtm = m_transformer.getXPathContext().getDTM(sourceNode);
     final Node source = (dtm == null) ? null : dtm.getNode(sourceNode);
     return source;
   }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TracerEvent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TracerEvent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/trace/TracerEvent.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/trace/TracerEvent.java	Thu Aug 11 18:14:24 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: TracerEvent.java 468644 2006-10-28 06:56:42Z minchau $
  */
-package org.apache.xalan.trace;
+package com.sun.xalan.org.apache.xalan.trace;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ClonerToResultTree.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ClonerToResultTree.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ClonerToResultTree.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ClonerToResultTree.java	Thu Aug 11 18:14:25 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: ClonerToResultTree.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.serialize.SerializerUtils;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xalan.serialize.SerializerUtils;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
 
 /**
  * Class used to clone a node, possibly including its children to 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/Counter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/Counter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/Counter.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/Counter.java	Thu Aug 11 18:14:25 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: Counter.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemNumber;
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.templates.ElemNumber;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * A class that does incremental counting for support of xsl:number.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/CountersTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/CountersTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/CountersTable.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/CountersTable.java	Thu Aug 11 18:14:25 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: CountersTable.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Hashtable;
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.ElemNumber;
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.templates.ElemNumber;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * This is a table of counters, keyed by ElemNumber objects, each
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/DecimalToRoman.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/DecimalToRoman.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/DecimalToRoman.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/DecimalToRoman.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DecimalToRoman.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 /**
  * Structure to help in converting integers to roman numerals
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyIterator.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyIterator.java	Thu Aug 11 18:14:25 2011
@@ -18,20 +18,20 @@
 /*
  * $Id: KeyIterator.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.KeyDeclaration;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.XPath;
-import org.apache.xpath.axes.OneStepIteratorForward;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.KeyDeclaration;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.axes.OneStepIteratorForward;
 
 /**
  * This class implements an optimized iterator for 
@@ -101,7 +101,7 @@
   {
     boolean foundKey = false;
     KeyIterator ki = (KeyIterator) m_lpi;
-    org.apache.xpath.XPathContext xctxt = ki.getXPathContext();
+    com.sun.xalan.org.apache.xpath.XPathContext xctxt = ki.getXPathContext();
     Vector keys = ki.getKeyDeclarations();
 
     QName name = ki.getName();
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyManager.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyManager.java	Thu Aug 11 18:14:25 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: KeyManager.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Vector;
 
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
 
 /**
  * This class manages the key tables.
@@ -37,7 +37,7 @@
 
   /**
    * Table of tables of element keys.
-   * @see org.apache.xalan.transformer.KeyTable
+   * @see com.sun.xalan.org.apache.xalan.transformer.KeyTable
    */
   private transient Vector m_key_tables = null;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyRefIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyRefIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyRefIterator.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyRefIterator.java	Thu Aug 11 18:14:25 2011
@@ -18,26 +18,26 @@
 /*
  * $Id: KeyRefIterator.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Vector;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.KeyDeclaration;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.KeyDeclaration;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class filters nodes from a key iterator, according to 
  * whether or not the use value matches the ref value.  
  * @xsl.usage internal
  */
-public class KeyRefIterator extends org.apache.xpath.axes.ChildTestIterator
+public class KeyRefIterator extends com.sun.xalan.org.apache.xpath.axes.ChildTestIterator
 {
     static final long serialVersionUID = 3837456451659435102L;
   /**
@@ -54,7 +54,7 @@
     m_ref = ref;
     m_keyDeclarations = keyDecls;
     m_keysNodes = ki;
-    setWhatToShow(org.apache.xml.dtm.DTMFilter.SHOW_ALL);
+    setWhatToShow(com.sun.xalan.org.apache.xml.dtm.DTMFilter.SHOW_ALL);
   }
   
   DTMIterator m_keysNodes;
@@ -95,7 +95,7 @@
 
     QName name = m_name;
     KeyIterator ki = (KeyIterator)(((XNodeSet)m_keysNodes).getContainedIter());
-    org.apache.xpath.XPathContext xctxt = ki.getXPathContext();
+    com.sun.xalan.org.apache.xpath.XPathContext xctxt = ki.getXPathContext();
     
     if(null == xctxt)
     	assertion(false, "xctxt can not be null here!");
@@ -149,7 +149,7 @@
     }
     catch (javax.xml.transform.TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
 
     if (!foundKey)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyTable.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/KeyTable.java	Thu Aug 11 18:14:25 2011
@@ -18,23 +18,23 @@
 /*
  * $Id: KeyTable.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Hashtable;
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.templates.KeyDeclaration;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.KeyDeclaration;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Table of element keys, keyed by document node.  An instance of this
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/MsgMgr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/MsgMgr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/MsgMgr.java	Mon Nov 14 16:40:54 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/MsgMgr.java	Thu Aug 11 18:14:25 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: MsgMgr.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
 
 import org.w3c.dom.Node;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSortKey.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSortKey.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSortKey.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSortKey.java	Thu Aug 11 18:14:25 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: NodeSortKey.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.text.Collator;
 import java.util.Locale;
 
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xpath.XPath;
 
 /**
  * Data structure for use by the NodeSorter class.
@@ -52,7 +52,7 @@
   Locale m_locale;
 
   /** Prefix resolver to use          */
-  org.apache.xml.utils.PrefixResolver m_namespaceContext;
+  com.sun.xalan.org.apache.xml.utils.PrefixResolver m_namespaceContext;
 
   /** Transformer instance          */
   TransformerImpl m_processor;  // needed for error reporting.
@@ -74,7 +74,7 @@
   NodeSortKey(
           TransformerImpl transformer, XPath selectPat, boolean treatAsNumbers, 
           boolean descending, String langValue, boolean caseOrderUpper, 
-          org.apache.xml.utils.PrefixResolver namespaceContext)
+          com.sun.xalan.org.apache.xml.utils.PrefixResolver namespaceContext)
             throws javax.xml.transform.TransformerException
   {
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSorter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSorter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSorter.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NodeSorter.java	Thu Aug 11 18:14:25 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: NodeSorter.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.text.CollationKey;
 import java.util.Vector;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class can sort vectors of DOM nodes according to a select pattern.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NumeratorFormatter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NumeratorFormatter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NumeratorFormatter.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/NumeratorFormatter.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NumeratorFormatter.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Locale;
 import java.util.NoSuchElementException;
@@ -50,7 +50,7 @@
 
   /**
    * Table to help in converting decimals to roman numerals.
-   * @see org.apache.xalan.transformer.DecimalToRoman
+   * @see com.sun.xalan.org.apache.xalan.transformer.DecimalToRoman
    */
   private final static DecimalToRoman m_romanConvertTable[] = {
     new DecimalToRoman(1000, "M", 900, "CM"),
@@ -94,7 +94,7 @@
    * @param val Value to convert -- must be greater than zero.
    * @param table a table containing one character for each digit in the radix
    * @return String representing alpha count of number.
-   * @see org.apache.xalan.transformer.DecimalToRoman
+   * @see com.sun.xalan.org.apache.xalan.transformer.DecimalToRoman
    *
    * Note that the radix of the conversion is inferred from the size
    * of the table.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/QueuedEvents.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/QueuedEvents.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/QueuedEvents.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/QueuedEvents.java	Thu Aug 11 18:14:25 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: QueuedEvents.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Vector;
 
-import org.apache.xml.utils.MutableAttrListImpl;
+import com.sun.xalan.org.apache.xml.utils.MutableAttrListImpl;
 
 
 /**
@@ -142,7 +142,7 @@
   }
 
   /** Instance of a serializer          */
-  private org.apache.xml.serializer.Serializer m_serializer;
+  private com.sun.xalan.org.apache.xml.serializer.Serializer m_serializer;
 
   /**
    * This is only for use of object pooling, so that
@@ -150,7 +150,7 @@
    *
    * @param s non-null instance of a serializer 
    */
-  void setSerializer(org.apache.xml.serializer.Serializer s)
+  void setSerializer(com.sun.xalan.org.apache.xml.serializer.Serializer s)
   {
     m_serializer = s;
   }
@@ -161,7 +161,7 @@
    *
    * @return The serializer
    */
-  org.apache.xml.serializer.Serializer getSerializer()
+  com.sun.xalan.org.apache.xml.serializer.Serializer getSerializer()
   {
     return m_serializer;
   }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ResultNameSpace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ResultNameSpace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ResultNameSpace.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/ResultNameSpace.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ResultNameSpace.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 /**
  * A representation of a result namespace.  One of these will
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/SerializerSwitcher.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/SerializerSwitcher.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/SerializerSwitcher.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/SerializerSwitcher.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerSwitcher.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.io.OutputStream;
 import java.io.Writer;
@@ -27,10 +27,10 @@
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.serializer.Serializer;
-import org.apache.xml.serializer.SerializerFactory;
-import org.apache.xml.serializer.Method;
-import org.apache.xalan.templates.OutputProperties;
+import com.sun.xalan.org.apache.xml.serializer.Serializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializerFactory;
+import com.sun.xalan.org.apache.xml.serializer.Method;
+import com.sun.xalan.org.apache.xalan.templates.OutputProperties;
 
 import org.xml.sax.ContentHandler;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/StackGuard.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/StackGuard.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/StackGuard.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/StackGuard.java	Thu Aug 11 18:14:25 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: StackGuard.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.ObjectStack;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xml.utils.ObjectStack;
 
 /**
  * Class to guard against recursion getting too deep.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TrAXFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TrAXFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TrAXFilter.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TrAXFilter.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TrAXFilter.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.io.IOException;
 
@@ -27,8 +27,8 @@
 import javax.xml.transform.Templates;
 import javax.xml.transform.TransformerConfigurationException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DTDHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshot.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshot.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshot.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshot.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformSnapshot.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 /**
  * This is an opaque interface that allows the transformer to return a 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshotImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshotImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshotImpl.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformSnapshotImpl.java	Thu Aug 11 18:14:25 2011
@@ -18,24 +18,24 @@
 /*
  * $Id: TransformSnapshotImpl.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.util.Enumeration;
 import java.util.Stack;
 
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.BoolStack;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.NamespaceSupport2;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xml.utils.ObjectStack;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.BoolStack;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xml.utils.NamespaceSupport2;
+import com.sun.xalan.org.apache.xml.utils.NodeVector;
+import com.sun.xalan.org.apache.xml.utils.ObjectStack;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 import org.xml.sax.helpers.NamespaceSupport;
 
-import org.apache.xml.serializer.NamespaceMappings;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.NamespaceMappings;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 /**
  * This class holds a "snapshot" of it's current transformer state,
  * which can later be restored.
@@ -86,7 +86,7 @@
   /**
    * A node vector used as a stack to track the current
    * ElemTemplateElement.  Needed for the
-   * org.apache.xalan.transformer.TransformState interface,
+   * com.sun.xalan.org.apache.xalan.transformer.TransformState interface,
    * so a tool can discover the calling template. 
    */
   private ObjectStack m_currentTemplateElements;
@@ -95,7 +95,7 @@
    * A node vector used as a stack to track the current
    * ElemTemplate that was matched, as well as the node that
    * was matched.  Needed for the
-   * org.apache.xalan.transformer.TransformState interface,
+   * com.sun.xalan.org.apache.xalan.transformer.TransformState interface,
    * so a tool can discover the matched template, and matched
    * node. 
    */
@@ -105,7 +105,7 @@
    * A node vector used as a stack to track the current
    * ElemTemplate that was matched, as well as the node that
    * was matched.  Needed for the
-   * org.apache.xalan.transformer.TransformState interface,
+   * com.sun.xalan.org.apache.xalan.transformer.TransformState interface,
    * so a tool can discover the matched template, and matched
    * node. 
    */
@@ -187,7 +187,7 @@
     }
     catch (CloneNotSupportedException cnse)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(cnse);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(cnse);
     }
   }
 
@@ -243,7 +243,7 @@
     }
     catch (CloneNotSupportedException cnse)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(cnse);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(cnse);
     }
   }
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformState.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformState.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformState.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformState.java	Thu Aug 11 18:14:25 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: TransformState.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import javax.xml.transform.Transformer;
 
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.serializer.TransformStateSetter;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xml.serializer.TransformStateSetter;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeIterator;
@@ -47,7 +47,7 @@
  * This interface contains only getter methods, any setters are in the interface
  * TransformStateSetter which this interface extends.
  * 
- * @see org.apache.xml.serializer.TransformStateSetter
+ * @see com.sun.xalan.org.apache.xml.serializer.TransformStateSetter
  */
 public interface TransformState extends TransformStateSetter
 {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerClient.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerClient.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerClient.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerClient.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformerClient.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 /**
  * A content handler can get a reference
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerHandlerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerHandlerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerHandlerImpl.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerHandlerImpl.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformerHandlerImpl.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.io.IOException;
 
@@ -26,13 +26,13 @@
 import javax.xml.transform.Transformer;
 import javax.xml.transform.sax.TransformerHandler;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.IncrementalSAXSource_Filter;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.IncrementalSAXSource_Filter;
+import com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -45,7 +45,7 @@
 import org.xml.sax.SAXParseException;
 import org.xml.sax.ext.DeclHandler;
 import org.xml.sax.ext.LexicalHandler;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerIdentityImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerIdentityImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerIdentityImpl.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerIdentityImpl.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformerIdentityImpl.java 575747 2007-09-14 16:28:37Z kcormier $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.io.IOException;
 import java.util.Hashtable;
@@ -43,14 +43,14 @@
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xml.serializer.Serializer;
-import org.apache.xml.serializer.SerializerFactory;
-import org.apache.xml.serializer.Method;
-import org.apache.xml.utils.DOMBuilder;
-import org.apache.xml.utils.XMLReaderManager;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.templates.OutputProperties;
+import com.sun.xalan.org.apache.xml.serializer.Serializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializerFactory;
+import com.sun.xalan.org.apache.xml.serializer.Method;
+import com.sun.xalan.org.apache.xml.utils.DOMBuilder;
+import com.sun.xalan.org.apache.xml.utils.XMLReaderManager;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
@@ -72,7 +72,7 @@
  * and {@link javax.xml.transform.TransformerFactory#newTransformer()}.  It
  * simply feeds SAX events directly to a serializer ContentHandler, if the
  * result is a stream.  If the result is a DOM, it will send the events to
- * {@link org.apache.xml.utils.DOMBuilder}.  If the result is another
+ * {@link com.sun.xalan.org.apache.xml.utils.DOMBuilder}.  If the result is another
  * content handler, it will simply pass the events on.
  */
 public class TransformerIdentityImpl extends Transformer
@@ -385,8 +385,8 @@
               }
               else
               { 
-                org.apache.xml.serializer.TreeWalker walker;
-                walker = new org.apache.xml.serializer.TreeWalker(this, m_systemID);
+                com.sun.xalan.org.apache.xml.serializer.TreeWalker walker;
+                walker = new com.sun.xalan.org.apache.xml.serializer.TreeWalker(this, m_systemID);
                 walker.traverse(dNode);
               }
             }
@@ -484,15 +484,15 @@
   
         reader.parse(xmlSource);
       }
-      catch (org.apache.xml.utils.WrappedRuntimeException wre)
+      catch (com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException wre)
       {
         Throwable throwable = wre.getException();
   
         while (throwable
-               instanceof org.apache.xml.utils.WrappedRuntimeException)
+               instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
         {
           throwable =
-            ((org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
+            ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
         }
   
         throw new TransformerException(wre.getException());
@@ -882,7 +882,7 @@
     }
     catch (TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
 
     m_resultContentHandler.setDocumentLocator(locator);
@@ -1459,7 +1459,7 @@
 
   /** The error listener for TrAX errors and warnings. */
   private ErrorListener m_errorListener =
-    new org.apache.xml.utils.DefaultErrorHandler(false);
+    new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler(false);
 
   /**
    * The URIResolver, which is unused, but must be returned to fullfill the
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerImpl.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TransformerImpl.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformerImpl.java 475979 2006-11-16 23:32:48Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -46,50 +46,50 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.extensions.ExtensionsTable;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.serializer.Method;
-import org.apache.xml.serializer.Serializer;
-import org.apache.xml.serializer.SerializerFactory;
-import org.apache.xalan.templates.AVT;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemAttributeSet;
-import org.apache.xalan.templates.ElemForEach;
-import org.apache.xalan.templates.ElemSort;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetComposed;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.templates.XUnresolvedVariable;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.TraceManager;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.serializer.ToSAXHandler;
-import org.apache.xml.serializer.ToTextStream;
-import org.apache.xml.serializer.ToXMLSAXHandler;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.BoolStack;
-import org.apache.xml.utils.DOMBuilder;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xml.utils.ObjectPool;
-import org.apache.xml.utils.ObjectStack;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.ThreadControllerWrapper;
-import org.apache.xpath.Arg;
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.extensions.ExtensionsTable;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.serializer.Method;
+import com.sun.xalan.org.apache.xml.serializer.Serializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializerFactory;
+import com.sun.xalan.org.apache.xalan.templates.AVT;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.templates.ElemAttributeSet;
+import com.sun.xalan.org.apache.xalan.templates.ElemForEach;
+import com.sun.xalan.org.apache.xalan.templates.ElemSort;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xalan.templates.ElemTextLiteral;
+import com.sun.xalan.org.apache.xalan.templates.ElemVariable;
+import com.sun.xalan.org.apache.xalan.templates.OutputProperties;
+import com.sun.xalan.org.apache.xalan.templates.Stylesheet;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetComposed;
+import com.sun.xalan.org.apache.xalan.templates.StylesheetRoot;
+import com.sun.xalan.org.apache.xalan.templates.XUnresolvedVariable;
+import com.sun.xalan.org.apache.xalan.trace.GenerateEvent;
+import com.sun.xalan.org.apache.xalan.trace.TraceManager;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.serializer.ToSAXHandler;
+import com.sun.xalan.org.apache.xml.serializer.ToTextStream;
+import com.sun.xalan.org.apache.xml.serializer.ToXMLSAXHandler;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.BoolStack;
+import com.sun.xalan.org.apache.xml.utils.DOMBuilder;
+import com.sun.xalan.org.apache.xml.utils.NodeVector;
+import com.sun.xalan.org.apache.xml.utils.ObjectPool;
+import com.sun.xalan.org.apache.xml.utils.ObjectStack;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xml.utils.ThreadControllerWrapper;
+import com.sun.xalan.org.apache.xpath.Arg;
+import com.sun.xalan.org.apache.xpath.ExtensionsProvider;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
@@ -105,7 +105,7 @@
  * @xsl.usage advanced
  */
 public class TransformerImpl extends Transformer
-        implements Runnable, DTMWSFilter, ExtensionsProvider, org.apache.xml.serializer.SerializerTrace
+        implements Runnable, DTMWSFilter, ExtensionsProvider, com.sun.xalan.org.apache.xml.serializer.SerializerTrace
 {
 
   // Synch object to gaurd against setting values from the TrAX interface 
@@ -196,7 +196,7 @@
   /**
    * A node vector used as a stack to track the current
    * ElemTemplateElement.  Needed for the
-   * org.apache.xalan.transformer.TransformState interface,
+   * com.sun.xalan.org.apache.xalan.transformer.TransformState interface,
    * so a tool can discover the calling template. Note the use of an array 
    * for this limits the recursion depth to 4K.
    */
@@ -210,7 +210,7 @@
    * A node vector used as a stack to track the current
    * ElemTemplate that was matched.
    * Needed for the
-   * org.apache.xalan.transformer.TransformState interface,
+   * com.sun.xalan.org.apache.xalan.transformer.TransformState interface,
    * so a tool can discover the matched template
    */
   Stack m_currentMatchTemplates = new Stack();
@@ -219,7 +219,7 @@
    * A node vector used as a stack to track the current
    * node that was matched.
    * Needed for the
-   * org.apache.xalan.transformer.TransformState interface,
+   * com.sun.xalan.org.apache.xalan.transformer.TransformState interface,
    * so a tool can discover the matched
    * node. 
    */
@@ -321,7 +321,7 @@
    * The SAX error handler, where errors and warnings are sent.
    */
   private ErrorListener m_errorHandler =
-    new org.apache.xml.utils.DefaultErrorHandler(false);
+    new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler(false);
 
   /**
    * The trace manager.
@@ -727,10 +727,10 @@
         {
           throw (javax.xml.transform.TransformerException) e;
         }
-        else if (e instanceof org.apache.xml.utils.WrappedRuntimeException)
+        else if (e instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
         {
           fatalError(
-              ((org.apache.xml.utils.WrappedRuntimeException) e).getException());
+              ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) e).getException());
         }
         else
         {
@@ -742,15 +742,15 @@
         m_serializationHandler.endDocument();
       }
     }
-    catch (org.apache.xml.utils.WrappedRuntimeException wre)
+    catch (com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException wre)
     {
       Throwable throwable = wre.getException();
 
       while (throwable
-             instanceof org.apache.xml.utils.WrappedRuntimeException)
+             instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
       {
         throwable =
-          ((org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
+          ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
       }
 
       fatalError(throwable);
@@ -1104,7 +1104,7 @@
         else
         {
           boolean isSecureProcessing = m_stylesheetRoot.isSecureProcessing();
-          doc = org.apache.xml.utils.DOMHelper.createDocument(isSecureProcessing);
+          doc = com.sun.xalan.org.apache.xml.utils.DOMHelper.createDocument(isSecureProcessing);
           outputNode = doc;
           type = outputNode.getNodeType();
 
@@ -1348,7 +1348,7 @@
         }
         // ===========        
         // System.out.println("Calling applyTemplateToNode - "+Thread.currentThread().getName());
-        DTMIterator dtmIter = new org.apache.xpath.axes.SelfIteratorNoPredicate();
+        DTMIterator dtmIter = new com.sun.xalan.org.apache.xpath.axes.SelfIteratorNoPredicate();
         dtmIter.setRoot(node, xctxt);
         xctxt.pushContextNodeList(dtmIter);
         try
@@ -1377,9 +1377,9 @@
         // an endDocument.
         
         // SAXSourceLocator
-        while(se instanceof org.apache.xml.utils.WrappedRuntimeException)
+        while(se instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
         {
-          Exception e = ((org.apache.xml.utils.WrappedRuntimeException)se).getException();
+          Exception e = ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)se).getException();
           if(null != e)
             se = e;
         }
@@ -2065,7 +2065,7 @@
         // if we didn't get one from the pool, go make a new one
 
         
-        Serializer serializer = org.apache.xml.serializer.SerializerFactory.getSerializer(
+        Serializer serializer = com.sun.xalan.org.apache.xml.serializer.SerializerFactory.getSerializer(
             m_textformat.getProperties());
         m_serializationHandler = (SerializationHandler) serializer;
       } 
@@ -2230,7 +2230,7 @@
       
       // Fix copy copy29 test.
       if (!isApplyImports) {
-          DTMIterator cnl = new org.apache.xpath.NodeSetDTM(child, m_xcontext.getDTMManager());
+          DTMIterator cnl = new com.sun.xalan.org.apache.xpath.NodeSetDTM(child, m_xcontext.getDTMManager());
           m_xcontext.pushContextNodeList(cnl);
       }
 
@@ -3416,7 +3416,7 @@
       //        // m_throwNewError = false;
       //        e.printStackTrace();
       //      }
-      // throw new org.apache.xml.utils.WrappedRuntimeException(e);
+      // throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
     }
   }
 
@@ -3552,7 +3552,7 @@
 
     try
     {
-      org.apache.xalan.templates.WhiteSpaceInfo info =
+      com.sun.xalan.org.apache.xalan.templates.WhiteSpaceInfo info =
         m_stylesheetRoot.getWhiteSpaceInfo(m_xcontext, elementHandle, dtm);
 
       if (null == info)
@@ -3593,7 +3593,7 @@
      
 	/**
 	 * Fire off characters, cdate events.
-	 * @see org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, char[], int, int)
+	 * @see com.sun.xalan.org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, char[], int, int)
 	 */
 	public void fireGenerateEvent(
 		int eventType,
@@ -3607,7 +3607,7 @@
 
 	/**
 	 * Fire off startElement, endElement events.
-	 * @see org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, String, Attributes)
+	 * @see com.sun.xalan.org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, String, Attributes)
 	 */
 	public void fireGenerateEvent(
 		int eventType,
@@ -3620,7 +3620,7 @@
 
 	/**
 	 * Fire off processingInstruction events.
-	 * @see org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, String, String)
+	 * @see com.sun.xalan.org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, String, String)
 	 */
 	public void fireGenerateEvent(int eventType, String name, String data) {
 		GenerateEvent ge = new GenerateEvent(this, eventType, name,data);
@@ -3629,7 +3629,7 @@
 
 	/**
 	 * Fire off comment and entity ref events.
-	 * @see org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, String)
+	 * @see com.sun.xalan.org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int, String)
 	 */
 	public void fireGenerateEvent(int eventType, String data) {
 		GenerateEvent ge = new GenerateEvent(this, eventType, data);
@@ -3638,7 +3638,7 @@
 
 	/**
 	 * Fire off startDocument, endDocument events.
-	 * @see org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int)
+	 * @see com.sun.xalan.org.apache.xml.serializer.SerializerTrace#fireGenerateEvent(int)
 	 */
 	public void fireGenerateEvent(int eventType) {
 		GenerateEvent ge = new GenerateEvent(this, eventType);
@@ -3646,7 +3646,7 @@
 	}
 
     /**
-     * @see org.apache.xml.serializer.SerializerTrace#hasTraceListeners()
+     * @see com.sun.xalan.org.apache.xml.serializer.SerializerTrace#hasTraceListeners()
      */
     public boolean hasTraceListeners() {
         return m_traceManager.hasTraceListeners();
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TreeWalker2Result.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TreeWalker2Result.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TreeWalker2Result.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/TreeWalker2Result.java	Thu Aug 11 18:14:25 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: TreeWalker2Result.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
-import org.apache.xalan.serialize.SerializerUtils;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.ref.DTMTreeWalker;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xalan.serialize.SerializerUtils;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMTreeWalker;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Handle a walk of a tree, but screen out attributes for
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XSLInfiniteLoopException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XSLInfiniteLoopException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XSLInfiniteLoopException.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XSLInfiniteLoopException.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLInfiniteLoopException.java 468645 2006-10-28 06:57:24Z minchau $
  */
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 /**
  * Class used to create an Infinite Loop Exception 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanProperties.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanProperties.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanProperties.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanProperties.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: XalanProperties.java 468645 2006-10-28 06:57:24Z minchau $
  */
 
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 /**
  * <code>XalanProperties</code> defines the features understood by
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanTransformState.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanTransformState.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanTransformState.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/transformer/XalanTransformState.java	Thu Aug 11 18:14:25 2011
@@ -19,14 +19,14 @@
  * $Id: XalanTransformState.java 468645 2006-10-28 06:57:24Z minchau $
  */
 
-package org.apache.xalan.transformer;
+package com.sun.xalan.org.apache.xalan.transformer;
 
 import javax.xml.transform.Transformer;
 
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplate;
+import com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
 import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeIterator;
 
@@ -49,14 +49,14 @@
     TransformerImpl m_transformer = null;
 
     /**
-     * @see org.apache.xml.serializer.TransformStateSetter#setCurrentNode(Node)
+     * @see com.sun.xalan.org.apache.xml.serializer.TransformStateSetter#setCurrentNode(Node)
      */
     public void setCurrentNode(Node n) {
         m_node = n;
     }
 
     /**
-     * @see org.apache.xml.serializer.TransformStateSetter#resetState(Transformer)
+     * @see com.sun.xalan.org.apache.xml.serializer.TransformStateSetter#resetState(Transformer)
      */
     public void resetState(Transformer transformer) {
         if ((transformer != null) && (transformer instanceof TransformerImpl)) {
@@ -73,7 +73,7 @@
     }
 
     /**
-     * @see org.apache.xalan.transformer.TransformState#getCurrentElement()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getCurrentElement()
      */
     public ElemTemplateElement getCurrentElement() {
       if (m_elemPending)
@@ -83,7 +83,7 @@
     }
 
     /**
-     * @see org.apache.xalan.transformer.TransformState#getCurrentNode()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getCurrentNode()
      */
     public Node getCurrentNode() {
       if (m_currentNode != null) {
@@ -95,7 +95,7 @@
     }
     
     /**
-     * @see org.apache.xalan.transformer.TransformState#getCurrentTemplate()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getCurrentTemplate()
      */
     public ElemTemplate getCurrentTemplate() {
        if (m_elemPending)
@@ -105,7 +105,7 @@
     }
 
     /**
-     * @see org.apache.xalan.transformer.TransformState#getMatchedTemplate()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getMatchedTemplate()
      */
     public ElemTemplate getMatchedTemplate() {
       if (m_elemPending)
@@ -115,7 +115,7 @@
     }
 
     /**
-     * @see org.apache.xalan.transformer.TransformState#getMatchedNode()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getMatchedNode()
      */
     public Node getMatchedNode() {
  
@@ -129,17 +129,17 @@
     }
 
     /**
-     * @see org.apache.xalan.transformer.TransformState#getContextNodeList()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getContextNodeList()
      */
     public NodeIterator getContextNodeList() {
       if (m_elemPending) {
-          return new org.apache.xml.dtm.ref.DTMNodeIterator(m_contextNodeList);
+          return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator(m_contextNodeList);
       } else {
-          return new org.apache.xml.dtm.ref.DTMNodeIterator(m_transformer.getContextNodeList());
+          return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator(m_transformer.getContextNodeList());
       }
     }
     /**
-     * @see org.apache.xalan.transformer.TransformState#getTransformer()
+     * @see com.sun.xalan.org.apache.xalan.transformer.TransformState#getTransformer()
      */
     public Transformer getTransformer() {
         return m_transformer;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/EnvironmentCheck.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/EnvironmentCheck.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/EnvironmentCheck.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/EnvironmentCheck.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: EnvironmentCheck.java 468646 2006-10-28 06:57:58Z minchau $
  */
-package org.apache.xalan.xslt;
+package com.sun.xalan.org.apache.xalan.xslt;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -41,7 +41,7 @@
  *
  * <p>Usage-command line:  
  * <code>
- * java org.apache.xalan.xslt.EnvironmentCheck [-out outFile]
+ * java com.sun.xalan.org.apache.xalan.xslt.EnvironmentCheck [-out outFile]
  * </code></p>
  * 
  * <p>Usage-from program:  
@@ -837,7 +837,7 @@
     try
     {
       final String XALAN1_VERSION_CLASS =
-        "org.apache.xalan.xslt.XSLProcessorVersion";
+        "com.sun.xalan.org.apache.xalan.xslt.XSLProcessorVersion";
 
       Class clazz = ObjectFactory.findProviderClass(
         XALAN1_VERSION_CLASS, ObjectFactory.findClassLoader(), true);
@@ -870,7 +870,7 @@
       // NOTE: This is the old Xalan 2.0, 2.1, 2.2 version class, 
       //    is being replaced by class below
       final String XALAN2_VERSION_CLASS =
-        "org.apache.xalan.processor.XSLProcessorVersion";
+        "com.sun.xalan.org.apache.xalan.processor.XSLProcessorVersion";
 
       Class clazz = ObjectFactory.findProviderClass(
         XALAN2_VERSION_CLASS, ObjectFactory.findClassLoader(), true);
@@ -890,7 +890,7 @@
     {
       // NOTE: This is the new Xalan 2.2+ version class
       final String XALAN2_2_VERSION_CLASS =
-        "org.apache.xalan.Version";
+        "com.sun.xalan.org.apache.xalan.Version";
       final String XALAN2_2_VERSION_METHOD = "getVersion";
       final Class noArgs[] = new Class[0];
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/ObjectFactory.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/ObjectFactory.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468646 2006-10-28 06:57:58Z minchau $
  */
 
-package org.apache.xalan.xslt;
+package com.sun.xalan.org.apache.xalan.xslt;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/Process.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/Process.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/Process.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/Process.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Process.java 475586 2006-11-16 05:19:36Z minchau $
  */
-package org.apache.xalan.xslt;
+package com.sun.xalan.org.apache.xalan.xslt;
 
 import java.io.FileOutputStream;
 import java.io.FileWriter;
@@ -50,13 +50,13 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.Version;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.trace.PrintTraceListener;
-import org.apache.xalan.trace.TraceManager;
-import org.apache.xalan.transformer.XalanProperties;
-import org.apache.xml.utils.DefaultErrorHandler;
+import com.sun.xalan.org.apache.xalan.Version;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xalan.trace.PrintTraceListener;
+import com.sun.xalan.org.apache.xalan.trace.TraceManager;
+import com.sun.xalan.org.apache.xalan.transformer.XalanProperties;
+import com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -167,7 +167,7 @@
     java.io.PrintWriter dumpWriter = diagnosticsWriter;
     ResourceBundle resbundle =
       (XSLMessages.loadResourceBundle(
-        org.apache.xml.utils.res.XResourceBundle.ERROR_RESOURCES));
+        com.sun.xalan.org.apache.xml.utils.res.XResourceBundle.ERROR_RESOURCES));
     String flavor = "s2s";
 
     if (argv.length < 1)
@@ -189,7 +189,7 @@
       if (useXSLTC)
       {
 	 String key = "javax.xml.transform.TransformerFactory";
-	 String value = "org.apache.xalan.xsltc.trax.TransformerFactoryImpl";
+	 String value = "com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactoryImpl";
 	 Properties props = System.getProperties();
 	 props.put(key, value);
 	 System.setProperties(props);      
@@ -814,9 +814,9 @@
             transformer.setOutputProperty(OutputKeys.METHOD, outputType);
           }
 
-          if (transformer instanceof org.apache.xalan.transformer.TransformerImpl)
+          if (transformer instanceof com.sun.xalan.org.apache.xalan.transformer.TransformerImpl)
           {
-            org.apache.xalan.transformer.TransformerImpl impl = (org.apache.xalan.transformer.TransformerImpl)transformer;
+            com.sun.xalan.org.apache.xalan.transformer.TransformerImpl impl = (com.sun.xalan.org.apache.xalan.transformer.TransformerImpl)transformer;
             TraceManager tm = impl.getTraceManager();
 
             if (null != tracer)
@@ -946,7 +946,7 @@
               }
               
               if (!useXSLTC)
-                stf.setAttribute(org.apache.xalan.processor.TransformerFactoryImpl.FEATURE_INCREMENTAL, 
+                stf.setAttribute(com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl.FEATURE_INCREMENTAL, 
                    Boolean.TRUE);
                  
               TransformerHandler th = stf.newTransformerHandler(stylesheet);
@@ -1096,10 +1096,10 @@
       catch (Throwable throwable)
       {
         while (throwable
-               instanceof org.apache.xml.utils.WrappedRuntimeException)
+               instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
         {
           throwable =
-            ((org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
+            ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
         }
 
         if ((throwable instanceof NullPointerException)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468646 2006-10-28 06:57:58Z minchau $
  */
 
-package org.apache.xalan.xslt;
+package com.sun.xalan.org.apache.xalan.xslt;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport12.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xslt/SecuritySupport12.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468646 2006-10-28 06:57:58Z minchau $
  */
 
-package org.apache.xalan.xslt;
+package com.sun.xalan.org.apache.xalan.xslt;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/CollatorFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/CollatorFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/CollatorFactory.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/CollatorFactory.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: CollatorFactory.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
 import java.text.Collator;
 import java.util.Locale;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOM.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOM.java	Thu Aug 11 18:14:25 2011
@@ -19,15 +19,15 @@
  * $Id: DOM.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMCache.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMCache.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMCache.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMCache.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: DOMCache.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMEnhancedForDTM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMEnhancedForDTM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMEnhancedForDTM.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/DOMEnhancedForDTM.java	Thu Aug 11 18:14:25 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOMEnhancedForDTM.java 468648 2006-10-28 07:00:06Z minchau $
  */
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
 /**
  * Interface for SAXImpl which adds methods used at run-time, over and above
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/NodeIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/NodeIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/NodeIterator.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/NodeIterator.java	Thu Aug 11 18:14:25 2011
@@ -19,9 +19,9 @@
  * $Id: NodeIterator.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/ProcessorVersion.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/ProcessorVersion.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/ProcessorVersion.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/ProcessorVersion.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: ProcessorVersion.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/StripFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/StripFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/StripFilter.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/StripFilter.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: StripFilter.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/Translet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/Translet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/Translet.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/Translet.java	Thu Aug 11 18:14:25 2011
@@ -19,10 +19,10 @@
  * $Id: Translet.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/TransletException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/TransletException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/TransletException.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/TransletException.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: TransletException.java 468648 2006-10-28 07:00:06Z minchau $
  */
 
-package org.apache.xalan.xsltc;
+package com.sun.xalan.org.apache.xalan.xsltc;
 
 import org.xml.sax.SAXException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Compile.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Compile.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Compile.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Compile.java	Thu Aug 11 18:14:25 2011
@@ -19,16 +19,16 @@
  * $Id: Compile.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline;
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline;
 
 import java.io.File;
 import java.net.URL;
 import java.util.Vector;
 
-import org.apache.xalan.xsltc.cmdline.getopt.GetOpt;
-import org.apache.xalan.xsltc.cmdline.getopt.GetOptsException;
-import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.cmdline.getopt.GetOpt;
+import com.sun.xalan.org.apache.xalan.xsltc.cmdline.getopt.GetOptsException;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.XSLTC;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/ObjectFactory.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/ObjectFactory.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline;
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline;
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport12.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/SecuritySupport12.java	Thu Aug 11 18:14:25 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline;
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Transform.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Transform.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Transform.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/Transform.java	Thu Aug 11 18:14:26 2011
@@ -19,7 +19,7 @@
  * $Id: Transform.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline;
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline;
 
 import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
@@ -30,23 +30,23 @@
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.sax.SAXSource;
 
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.Constants;
-import org.apache.xalan.xsltc.runtime.Parameter;
-import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Parameter;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xalan.xsltc.dom.DOMWSFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.DOMWSFilter;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java	Thu Aug 11 18:14:26 2011
@@ -19,13 +19,13 @@
  * $Id: GetOpt.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline.getopt; 
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline.getopt; 
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java	Thu Aug 11 18:14:26 2011
@@ -19,7 +19,7 @@
  * $Id: GetOptsException.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline.getopt; 
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline.getopt; 
 
 /**
  * @author G Todd Miller 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java	Thu Aug 11 18:14:26 2011
@@ -19,7 +19,7 @@
  * $Id: IllegalArgumentException.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline.getopt;
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline.getopt;
 
 
 class IllegalArgumentException extends GetOptsException{
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java	Thu Aug 11 18:14:26 2011
@@ -19,7 +19,7 @@
  * $Id: MissingOptArgException.java 468647 2006-10-28 06:59:33Z minchau $
  */
 
-package org.apache.xalan.xsltc.cmdline.getopt; 
+package com.sun.xalan.org.apache.xalan.xsltc.cmdline.getopt; 
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: AbsoluteLocationPath.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -29,12 +29,12 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: AbsolutePathPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.ConstantPoolGen;
@@ -32,12 +32,12 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AlternativePattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AlternativePattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AlternativePattern.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AlternativePattern.java	Thu Aug 11 18:14:27 2011
@@ -19,15 +19,15 @@
  * $Id: AlternativePattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.GOTO;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AncestorPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AncestorPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AncestorPattern.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AncestorPattern.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: AncestorPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.ConstantPoolGen;
@@ -31,11 +31,11 @@
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyImports.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyImports.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyImports.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyImports.java	Thu Aug 11 18:14:27 2011
@@ -19,16 +19,16 @@
  * $Id: ApplyImports.java 469276 2006-10-30 21:09:47Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 final class ApplyImports extends Instruction {
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyTemplates.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyTemplates.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ApplyTemplates.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: ApplyTemplates.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Vector;
@@ -28,17 +28,17 @@
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ArgumentList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ArgumentList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ArgumentList.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ArgumentList.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: ArgumentList.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Attribute.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Attribute.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Attribute.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Attribute.java	Thu Aug 11 18:14:27 2011
@@ -19,9 +19,9 @@
  * $Id: Attribute.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeSet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeSet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeSet.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeSet.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: AttributeSet.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Vector;
@@ -27,14 +27,14 @@
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESPECIAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.AttributeSetMethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.AttributeSetMethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValue.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValue.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValue.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValue.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: AttributeValue.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: AttributeValueTemplate.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Vector;
@@ -32,11 +32,11 @@
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BinOpExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BinOpExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BinOpExpr.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BinOpExpr.java	Thu Aug 11 18:14:27 2011
@@ -19,15 +19,15 @@
  * $Id: BinOpExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanCall.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanCall.java	Thu Aug 11 18:14:27 2011
@@ -19,14 +19,14 @@
  * $Id: BooleanCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanExpr.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/BooleanExpr.java	Thu Aug 11 18:14:27 2011
@@ -19,16 +19,16 @@
  * $Id: BooleanExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GOTO;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * This class implements inlined calls to the XSLT standard functions 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CallTemplate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CallTemplate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CallTemplate.java	Mon Nov 14 16:40:55 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CallTemplate.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: CallTemplate.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -27,13 +27,13 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastCall.java	Thu Aug 11 18:14:27 2011
@@ -19,19 +19,19 @@
  * $Id: CastCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.CHECKCAST;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ObjectType;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ObjectType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Santiago Pericas-Geertsen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastExpr.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CastExpr.java	Thu Aug 11 18:14:27 2011
@@ -19,23 +19,23 @@
  * $Id: CastExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.IF_ICMPNE;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.SIPUSH;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MultiHashtable;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MultiHashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CeilingCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CeilingCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CeilingCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CeilingCall.java	Thu Aug 11 18:14:27 2011
@@ -19,15 +19,15 @@
  * $Id: CeilingCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Choose.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Choose.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Choose.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Choose.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: Choose.java 469688 2006-10-31 22:39:43Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -32,12 +32,12 @@
 import org.apache.bcel.generic.IFEQ;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Closure.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Closure.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Closure.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Closure.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: Closure.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Santiago Pericas-Geertsen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Comment.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Comment.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Comment.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Comment.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: Comment.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETFIELD;
@@ -27,10 +27,10 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CompilerException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CompilerException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CompilerException.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CompilerException.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: CompilerException.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ConcatCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ConcatCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ConcatCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ConcatCall.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: ConcatCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -30,10 +30,10 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Constants.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Constants.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Constants.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Constants.java	Thu Aug 11 18:14:27 2011
@@ -19,10 +19,10 @@
  * $Id: Constants.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.InstructionConstants;
-import org.apache.xml.serializer.SerializerBase;
+import com.sun.xalan.org.apache.xml.serializer.SerializerBase;
 
 /**
  * @author Jacek Ambroziak
@@ -54,32 +54,32 @@
 	"http://xml.org/sax/features/namespaces";
 
     public static final String TRANSLET_INTF
-	= "org.apache.xalan.xsltc.Translet";
+	= "com.sun.xalan.org.apache.xalan.xsltc.Translet";
     public static final String TRANSLET_INTF_SIG        
-	= "Lorg/apache/xalan/xsltc/Translet;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/Translet;";
     
     public static final String ATTRIBUTES_SIG 
-	= "Lorg/apache/xalan/xsltc/runtime/Attributes;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/runtime/Attributes;";
     public static final String NODE_ITERATOR_SIG
-	= "Lorg/apache/xml/dtm/DTMAxisIterator;";
+	= "Lcom.sun.xalan.org.apache.xml/dtm/DTMAxisIterator;";
     public static final String DOM_INTF_SIG
-	= "Lorg/apache/xalan/xsltc/DOM;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/DOM;";
     public static final String DOM_IMPL_CLASS
-	= "org/apache/xalan/xsltc/DOM"; // xml/dtm/ref/DTMDefaultBaseIterators"; //xalan/xsltc/dom/DOMImpl";
+	= "com.sun.xalan.org.apache.xalan/xsltc/DOM"; // xml/dtm/ref/DTMDefaultBaseIterators"; //xalan/xsltc/dom/DOMImpl";
 	public static final String SAX_IMPL_CLASS
-	= "org/apache/xalan/xsltc/DOM/SAXImpl"; 
+	= "com.sun.xalan.org.apache.xalan/xsltc/DOM/SAXImpl"; 
     public static final String DOM_IMPL_SIG
-	= "Lorg/apache/xalan/xsltc/dom/SAXImpl;"; //xml/dtm/ref/DTMDefaultBaseIterators"; //xalan/xsltc/dom/DOMImpl;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/SAXImpl;"; //xml/dtm/ref/DTMDefaultBaseIterators"; //xalan/xsltc/dom/DOMImpl;";
 	public static final String SAX_IMPL_SIG
-	= "Lorg/apache/xalan/xsltc/dom/SAXImpl;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/SAXImpl;";
     public static final String DOM_ADAPTER_CLASS
-	= "org/apache/xalan/xsltc/dom/DOMAdapter";
+	= "com.sun.xalan.org.apache.xalan/xsltc/dom/DOMAdapter";
     public static final String DOM_ADAPTER_SIG
-	= "Lorg/apache/xalan/xsltc/dom/DOMAdapter;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/DOMAdapter;";
     public static final String MULTI_DOM_CLASS
-	= "org.apache.xalan.xsltc.dom.MultiDOM";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.MultiDOM";
     public static final String MULTI_DOM_SIG
-	= "Lorg/apache/xalan/xsltc/dom/MultiDOM;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/MultiDOM;";
 
     public static final String STRING    
 	= "java.lang.String";
@@ -115,65 +115,65 @@
     public static final String NODE               
 	= "int";
     public static final String NODE_ITERATOR      
-	= "org.apache.xml.dtm.DTMAxisIterator";
+	= "com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator";
     public static final String NODE_ITERATOR_BASE
-	= "org.apache.xml.dtm.ref.DTMAxisIteratorBase";
+	= "com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase";
     public static final String SORT_ITERATOR      
-	= "org.apache.xalan.xsltc.dom.SortingIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.SortingIterator";
     public static final String SORT_ITERATOR_SIG     
-	= "Lorg.apache.xalan.xsltc.dom.SortingIterator;";
+	= "Lcom.sun.xalan.org.apache.xalan.xsltc.dom.SortingIterator;";
     public static final String NODE_SORT_RECORD 
-	= "org.apache.xalan.xsltc.dom.NodeSortRecord";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.NodeSortRecord";
     public static final String NODE_SORT_FACTORY
-	= "org/apache/xalan/xsltc/dom/NodeSortRecordFactory";
+	= "com.sun.xalan.org.apache.xalan/xsltc/dom/NodeSortRecordFactory";
     public static final String NODE_SORT_RECORD_SIG 
-	= "Lorg/apache/xalan/xsltc/dom/NodeSortRecord;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/NodeSortRecord;";
     public static final String NODE_SORT_FACTORY_SIG
-	= "Lorg/apache/xalan/xsltc/dom/NodeSortRecordFactory;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/NodeSortRecordFactory;";
     public static final String LOCALE_CLASS
         = "java.util.Locale";
     public static final String LOCALE_SIG 
 	= "Ljava/util/Locale;";
     public static final String STRING_VALUE_HANDLER
-	= "org.apache.xalan.xsltc.runtime.StringValueHandler";
+	= "com.sun.xalan.org.apache.xalan.xsltc.runtime.StringValueHandler";
     public static final String STRING_VALUE_HANDLER_SIG 
-	= "Lorg/apache/xalan/xsltc/runtime/StringValueHandler;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/runtime/StringValueHandler;";
     public static final String OUTPUT_HANDLER
 	= SerializerBase.PKG_PATH+"/SerializationHandler";
     public static final String OUTPUT_HANDLER_SIG
 	= "L"+SerializerBase.PKG_PATH+"/SerializationHandler;";
     public static final String FILTER_INTERFACE   
-	= "org.apache.xalan.xsltc.dom.Filter";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.Filter";
     public static final String FILTER_INTERFACE_SIG   
-	= "Lorg/apache/xalan/xsltc/dom/Filter;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/Filter;";
     public static final String UNION_ITERATOR_CLASS
-	= "org.apache.xalan.xsltc.dom.UnionIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.UnionIterator";
     public static final String STEP_ITERATOR_CLASS
-	= "org.apache.xalan.xsltc.dom.StepIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.StepIterator";
     public static final String CACHED_NODE_LIST_ITERATOR_CLASS
-	= "org.apache.xalan.xsltc.dom.CachedNodeListIterator";	
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.CachedNodeListIterator";	
     public static final String NTH_ITERATOR_CLASS
-	= "org.apache.xalan.xsltc.dom.NthIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.NthIterator";
     public static final String ABSOLUTE_ITERATOR
-	= "org.apache.xalan.xsltc.dom.AbsoluteIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.AbsoluteIterator";
     public static final String DUP_FILTERED_ITERATOR
-	= "org.apache.xalan.xsltc.dom.DupFilterIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.DupFilterIterator";
     public static final String CURRENT_NODE_LIST_ITERATOR
-	= "org.apache.xalan.xsltc.dom.CurrentNodeListIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.CurrentNodeListIterator";
     public static final String CURRENT_NODE_LIST_FILTER
-	= "org.apache.xalan.xsltc.dom.CurrentNodeListFilter";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.CurrentNodeListFilter";
     public static final String CURRENT_NODE_LIST_ITERATOR_SIG 
-	= "Lorg/apache/xalan/xsltc/dom/CurrentNodeListIterator;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/CurrentNodeListIterator;";
     public static final String CURRENT_NODE_LIST_FILTER_SIG
-	= "Lorg/apache/xalan/xsltc/dom/CurrentNodeListFilter;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/CurrentNodeListFilter;";
     public static final String FILTER_STEP_ITERATOR 
-	= "org.apache.xalan.xsltc.dom.FilteredStepIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.FilteredStepIterator";
     public static final String FILTER_ITERATOR 
-	= "org.apache.xalan.xsltc.dom.FilterIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.FilterIterator";
     public static final String SINGLETON_ITERATOR 
-	= "org.apache.xalan.xsltc.dom.SingletonIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.SingletonIterator";
     public static final String MATCHING_ITERATOR 
-	= "org.apache.xalan.xsltc.dom.MatchingIterator";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.MatchingIterator";
     public static final String NODE_SIG           
 	= "I";
     public static final String GET_PARENT         
@@ -202,7 +202,7 @@
 	= "(" + STRING_SIG + ")I";
 
     public static final String XSLT_PACKAGE       
-	= "org.apache.xalan.xsltc";
+	= "com.sun.xalan.org.apache.xalan.xsltc";
     public static final String COMPILER_PACKAGE   
 	= XSLT_PACKAGE + ".compiler";
     public static final String RUNTIME_PACKAGE    
@@ -211,9 +211,9 @@
 	= RUNTIME_PACKAGE + ".AbstractTranslet";
 
     public static final String TRANSLET_SIG        
-	= "Lorg/apache/xalan/xsltc/runtime/AbstractTranslet;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/runtime/AbstractTranslet;";
     public static final String UNION_ITERATOR_SIG  
-	= "Lorg/apache/xalan/xsltc/dom/UnionIterator;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/UnionIterator;";
     public static final String TRANSLET_OUTPUT_SIG    
 	= "L"+SerializerBase.PKG_PATH+"/SerializationHandler;";
     public static final String MAKE_NODE_SIG       
@@ -232,21 +232,21 @@
     = SerializerBase.PKG_NAME+".SerializerBase";
     
     public static final String LOAD_DOCUMENT_CLASS
-	= "org.apache.xalan.xsltc.dom.LoadDocument";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.LoadDocument";
 
     public static final String KEY_INDEX_CLASS
-	= "org/apache/xalan/xsltc/dom/KeyIndex";
+	= "com.sun.xalan.org.apache.xalan/xsltc/dom/KeyIndex";
     public static final String KEY_INDEX_SIG
-	= "Lorg/apache/xalan/xsltc/dom/KeyIndex;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/KeyIndex;";
     public static final String KEY_INDEX_ITERATOR_SIG
-	= "Lorg/apache/xalan/xsltc/dom/KeyIndex$KeyIndexIterator;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/KeyIndex$KeyIndexIterator;";
 
     public static final String DOM_INTF
-	= "org.apache.xalan.xsltc.DOM";
+	= "com.sun.xalan.org.apache.xalan.xsltc.DOM";
     public static final String DOM_IMPL
-	= "org.apache.xalan.xsltc.dom.SAXImpl";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.SAXImpl";
 	public static final String SAX_IMPL
-	= "org.apache.xalan.xsltc.dom.SAXImpl";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.SAXImpl";
     public static final String STRING_CLASS 		
 	= "java.lang.String";
     public static final String OBJECT_CLASS 		
@@ -261,20 +261,20 @@
         = "Ljava/io/Writer;";
 
     public static final String TRANSLET_OUTPUT_BASE       
-	= "org.apache.xalan.xsltc.TransletOutputBase";
+	= "com.sun.xalan.org.apache.xalan.xsltc.TransletOutputBase";
     // output interface
     public static final String TRANSLET_OUTPUT_INTERFACE
 	= SerializerBase.PKG_NAME+".SerializationHandler";
     public static final String BASIS_LIBRARY_CLASS 
-	= "org.apache.xalan.xsltc.runtime.BasisLibrary";
+	= "com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary";
     public static final String ATTRIBUTE_LIST_IMPL_CLASS 
-	= "org.apache.xalan.xsltc.runtime.AttributeListImpl";
+	= "com.sun.xalan.org.apache.xalan.xsltc.runtime.AttributeListImpl";
     public static final String DOUBLE_CLASS       
 	= "java.lang.Double";
     public static final String INTEGER_CLASS      
 	= "java.lang.Integer";
     public static final String RUNTIME_NODE_CLASS 
-	= "org.apache.xalan.xsltc.runtime.Node";
+	= "com.sun.xalan.org.apache.xalan.xsltc.runtime.Node";
     public static final String MATH_CLASS         
 	= "java.lang.Math";
 
@@ -449,7 +449,7 @@
     public static final String ADD_ATTRIBUTE           
 	= "addAttribute";
     public static final String ATTRIBUTE_LIST_IMPL_SIG 
-	= "Lorg/apache/xalan/xsltc/runtime/AttributeListImpl;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/runtime/AttributeListImpl;";
     public static final String CLEAR_ATTRIBUTES_SIG    
 	= "()" + ATTRIBUTE_LIST_IMPL_SIG;
     public static final String ADD_ATTRIBUTE_SIG   
@@ -467,13 +467,13 @@
 	= "(" + NODE_SIG + ")" + NODE_ITERATOR_SIG;
 
     public static final String NODE_COUNTER 
-	= "org.apache.xalan.xsltc.dom.NodeCounter";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.NodeCounter";
     public static final String NODE_COUNTER_SIG 
-	= "Lorg/apache/xalan/xsltc/dom/NodeCounter;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/NodeCounter;";
     public static final String DEFAULT_NODE_COUNTER 
-	= "org.apache.xalan.xsltc.dom.DefaultNodeCounter";
+	= "com.sun.xalan.org.apache.xalan.xsltc.dom.DefaultNodeCounter";
     public static final String DEFAULT_NODE_COUNTER_SIG 
-	= "Lorg/apache/xalan/xsltc/dom/DefaultNodeCounter;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/DefaultNodeCounter;";
     public static final String TRANSLET_FIELD 
 	= "translet";
     public static final String TRANSLET_FIELD_SIG 
@@ -501,11 +501,11 @@
     public static final String STRIP_SPACE
 	= "stripSpace";
     public static final String STRIP_SPACE_INTF
-	= "org/apache/xalan/xsltc/StripFilter";
+	= "com.sun.xalan.org.apache.xalan/xsltc/StripFilter";
     public static final String STRIP_SPACE_SIG
-	= "Lorg/apache/xalan/xsltc/StripFilter;";
+	= "Lcom.sun.xalan.org.apache.xalan/xsltc/StripFilter;";
     public static final String STRIP_SPACE_PARAMS
-	= "(Lorg/apache/xalan/xsltc/DOM;II)Z";
+	= "(Lcom.sun.xalan.org.apache.xalan/xsltc/DOM;II)Z";
 
     public static final String GET_NODE_VALUE_ITERATOR
 	= "getNodeValueIterator";
@@ -531,7 +531,7 @@
     public static final String REDIRECT_URI
         = "http://xml.apache.org/xalan/redirect";
     public static final String FALLBACK_CLASS
-	= "org.apache.xalan.xsltc.compiler.Fallback";
+	= "com.sun.xalan.org.apache.xalan.xsltc.compiler.Fallback";
 
     public static final int RTF_INITIAL_SIZE = 32;
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ContainsCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ContainsCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ContainsCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ContainsCall.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: ContainsCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -27,11 +27,11 @@
 import org.apache.bcel.generic.IFLT;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Copy.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Copy.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Copy.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Copy.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: Copy.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -34,12 +34,12 @@
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CopyOf.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CopyOf.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CopyOf.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CopyOf.java	Thu Aug 11 18:14:27 2011
@@ -19,23 +19,23 @@
  * $Id: CopyOf.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CurrentCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CurrentCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CurrentCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/CurrentCall.java	Thu Aug 11 18:14:27 2011
@@ -19,10 +19,10 @@
  * $Id: CurrentCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DecimalFormatting.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DecimalFormatting.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DecimalFormatting.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: DecimalFormatting.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETSTATIC;
@@ -28,12 +28,12 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DocumentCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DocumentCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DocumentCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/DocumentCall.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: DocumentCall.java 478657 2006-11-23 20:39:32Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -29,11 +29,11 @@
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java	Thu Aug 11 18:14:27 2011
@@ -19,17 +19,17 @@
  * $Id: ElementAvailableCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/EqualityExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/EqualityExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/EqualityExpr.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/EqualityExpr.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: EqualityExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.BranchInstruction;
@@ -33,20 +33,20 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.IntType;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.NumberType;
-import org.apache.xalan.xsltc.compiler.util.RealType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.runtime.Operators;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.IntType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NumberType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.RealType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Operators;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Expression.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Expression.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Expression.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Expression.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: Expression.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -29,14 +29,14 @@
 import org.apache.bcel.generic.IFEQ;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Fallback.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Fallback.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Fallback.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Fallback.java	Thu Aug 11 18:14:27 2011
@@ -19,14 +19,14 @@
  * $Id: Fallback.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterExpr.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterExpr.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FilterExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -34,13 +34,13 @@
 import org.apache.bcel.generic.ISTORE;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterParentPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterParentPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterParentPath.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilterParentPath.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FilterParentPath.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -30,14 +30,14 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FilteredAbsoluteLocationPath.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -29,12 +29,12 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author G. Todd Miller 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FloorCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FloorCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FloorCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FloorCall.java	Thu Aug 11 18:14:27 2011
@@ -19,13 +19,13 @@
  * $Id: FloorCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.INVOKESTATIC;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FlowList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FlowList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FlowList.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FlowList.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FlowList.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Iterator;
 import java.util.Vector;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ForEach.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ForEach.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ForEach.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ForEach.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: ForEach.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Vector;
@@ -30,16 +30,16 @@
 import org.apache.bcel.generic.IFGT;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FormatNumberCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FormatNumberCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FormatNumberCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FormatNumberCall.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FormatNumberCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -28,12 +28,12 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.RealType;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.RealType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FunctionAvailableCall.java 469266 2006-10-30 20:48:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -27,12 +27,12 @@
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author G. Todd Miller 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/FunctionCall.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: FunctionCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -40,17 +40,17 @@
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.IntType;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.MultiHashtable;
-import org.apache.xalan.xsltc.compiler.util.ObjectType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.IntType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MultiHashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ObjectType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
@@ -243,12 +243,12 @@
 	    _java2Internal.put(nodeClass, Type.NodeSet);
 	    
 	    // Initialize the extension namespace table
-	    _extensionNamespaceTable.put(EXT_XALAN, "org.apache.xalan.lib.Extensions");
-	    _extensionNamespaceTable.put(EXSLT_COMMON, "org.apache.xalan.lib.ExsltCommon");
-	    _extensionNamespaceTable.put(EXSLT_MATH, "org.apache.xalan.lib.ExsltMath");
-	    _extensionNamespaceTable.put(EXSLT_SETS, "org.apache.xalan.lib.ExsltSets");
-	    _extensionNamespaceTable.put(EXSLT_DATETIME, "org.apache.xalan.lib.ExsltDatetime");
-	    _extensionNamespaceTable.put(EXSLT_STRINGS, "org.apache.xalan.lib.ExsltStrings");
+	    _extensionNamespaceTable.put(EXT_XALAN, "com.sun.xalan.org.apache.xalan.lib.Extensions");
+	    _extensionNamespaceTable.put(EXSLT_COMMON, "com.sun.xalan.org.apache.xalan.lib.ExsltCommon");
+	    _extensionNamespaceTable.put(EXSLT_MATH, "com.sun.xalan.org.apache.xalan.lib.ExsltMath");
+	    _extensionNamespaceTable.put(EXSLT_SETS, "com.sun.xalan.org.apache.xalan.lib.ExsltSets");
+	    _extensionNamespaceTable.put(EXSLT_DATETIME, "com.sun.xalan.org.apache.xalan.lib.ExsltDatetime");
+	    _extensionNamespaceTable.put(EXSLT_STRINGS, "com.sun.xalan.org.apache.xalan.lib.ExsltStrings");
 	    
 	    // Initialize the extension function table
 	    _extensionFunctionTable.put(EXSLT_COMMON + ":nodeSet", "nodeset");
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/GenerateIdCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/GenerateIdCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/GenerateIdCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/GenerateIdCall.java	Thu Aug 11 18:14:27 2011
@@ -19,15 +19,15 @@
  * $Id: GenerateIdCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdKeyPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdKeyPattern.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdKeyPattern.java	Thu Aug 11 18:14:27 2011
@@ -19,7 +19,7 @@
  * $Id: IdKeyPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GOTO;
@@ -28,10 +28,10 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdPattern.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IdPattern.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: IdPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/If.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/If.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/If.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/If.java	Thu Aug 11 18:14:28 2011
@@ -19,17 +19,17 @@
  * $Id: If.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IllegalCharException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IllegalCharException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IllegalCharException.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IllegalCharException.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: IllegalCharException.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Import.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Import.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Import.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Import.java	Thu Aug 11 18:14:28 2011
@@ -19,19 +19,19 @@
  * $Id: Import.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.File;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.Enumeration;
 
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Include.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Include.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Include.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Include.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Include.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,12 +27,12 @@
 import java.net.URL;
 import java.util.Enumeration;
 
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Instruction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Instruction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Instruction.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Instruction.java	Thu Aug 11 18:14:28 2011
@@ -19,13 +19,13 @@
  * $Id: Instruction.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IntExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IntExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IntExpr.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/IntExpr.java	Thu Aug 11 18:14:28 2011
@@ -19,15 +19,15 @@
  * $Id: IntExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Key.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Key.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Key.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Key.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Key.java 478664 2006-11-23 20:46:53Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -37,16 +37,16 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyCall.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: KeyCall.java 476471 2006-11-18 08:36:27Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -37,12 +37,12 @@
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyPattern.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/KeyPattern.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: KeyPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LangCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LangCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LangCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LangCall.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: LangCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -27,12 +27,12 @@
 import org.apache.bcel.generic.ILOAD;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.FilterGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.FilterGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LastCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LastCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LastCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LastCall.java	Thu Aug 11 18:14:28 2011
@@ -19,16 +19,16 @@
  * $Id: LastCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.ILOAD;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.CompareGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.TestGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.CompareGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TestGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralAttribute.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralAttribute.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralAttribute.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralAttribute.java	Thu Aug 11 18:14:28 2011
@@ -19,19 +19,19 @@
  * $Id: LiteralAttribute.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
-import org.apache.xml.serializer.ElemDesc;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.ElemDesc;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralElement.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralElement.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: LiteralElement.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -28,15 +28,15 @@
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
-import org.apache.xml.serializer.ElemDesc;
-import org.apache.xml.serializer.ToHTMLStream;
+import com.sun.xalan.org.apache.xml.serializer.ElemDesc;
+import com.sun.xalan.org.apache.xml.serializer.ToHTMLStream;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralExpr.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LiteralExpr.java	Thu Aug 11 18:14:28 2011
@@ -20,15 +20,15 @@
  * $Id: LiteralExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocalNameCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocalNameCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocalNameCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocalNameCall.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: LocalNameCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -27,8 +27,8 @@
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocationPathPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocationPathPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocationPathPattern.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LocationPathPattern.java	Thu Aug 11 18:14:28 2011
@@ -19,13 +19,13 @@
  * $Id: LocationPathPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LogicalExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LogicalExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LogicalExpr.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/LogicalExpr.java	Thu Aug 11 18:14:28 2011
@@ -19,16 +19,16 @@
  * $Id: LogicalExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.GOTO;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Message.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Message.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Message.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Message.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Message.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEINTERFACE;
@@ -28,10 +28,10 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Mode.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Mode.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Mode.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Mode.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Mode.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -42,13 +42,13 @@
 import org.apache.bcel.generic.SWITCH;
 import org.apache.bcel.generic.TargetLostException;
 import org.apache.bcel.util.InstructionFinder;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NamedMethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NamedMethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * Mode gathers all the templates belonging to a given mode; 
@@ -759,7 +759,7 @@
 				argTypes, argNames, functionName(),
 				getClassName(), mainIL,
 				classGen.getConstantPool());
-	methodGen.addException("org.apache.xalan.xsltc.TransletException");
+	methodGen.addException("com.sun.xalan.org.apache.xalan.xsltc.TransletException");
 
         // Insert an extra NOP just to keep "current" from appearing as if it
         // has a value before the start of the loop.
@@ -1124,7 +1124,7 @@
 				argTypes, argNames, functionName()+'_'+max,
 				getClassName(), mainIL,
 				classGen.getConstantPool());
-	methodGen.addException("org.apache.xalan.xsltc.TransletException");
+	methodGen.addException("com.sun.xalan.org.apache.xalan.xsltc.TransletException");
 
 	// Create the local variable to hold the current node
 	final LocalVariableGen current;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameBase.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameBase.java	Thu Aug 11 18:14:28 2011
@@ -19,17 +19,17 @@
  * $Id: NameBase.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NameCall.java	Thu Aug 11 18:14:28 2011
@@ -19,15 +19,15 @@
  * $Id: NameCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceAlias.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceAlias.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceAlias.java	Thu Aug 11 18:14:28 2011
@@ -19,12 +19,12 @@
  * $Id: NamespaceAlias.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java	Thu Aug 11 18:14:28 2011
@@ -19,15 +19,15 @@
  * $Id: NamespaceUriCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NodeTest.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NodeTest.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NodeTest.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NodeTest.java	Thu Aug 11 18:14:28 2011
@@ -19,10 +19,10 @@
  * $Id: NodeTest.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NotCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NotCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NotCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NotCall.java	Thu Aug 11 18:14:28 2011
@@ -19,15 +19,15 @@
  * $Id: NotCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.GOTO;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Number.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Number.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Number.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Number.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Number.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.ArrayList;
 
@@ -41,14 +41,14 @@
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.PUTFIELD;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MatchGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeCounterGenerator;
-import org.apache.xalan.xsltc.compiler.util.RealType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MatchGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeCounterGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.RealType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
@@ -60,9 +60,9 @@
     private static final int LEVEL_ANY      = 2;
 
     static final private String[] ClassNames = { 
-	"org.apache.xalan.xsltc.dom.SingleNodeCounter",	  // LEVEL_SINGLE
-	"org.apache.xalan.xsltc.dom.MultipleNodeCounter", // LEVEL_MULTIPLE
-	"org.apache.xalan.xsltc.dom.AnyNodeCounter"	  // LEVEL_ANY
+	"com.sun.xalan.org.apache.xalan.xsltc.dom.SingleNodeCounter",	  // LEVEL_SINGLE
+	"com.sun.xalan.org.apache.xalan.xsltc.dom.MultipleNodeCounter", // LEVEL_MULTIPLE
+	"com.sun.xalan.org.apache.xalan.xsltc.dom.AnyNodeCounter"	  // LEVEL_ANY
     };
 
     static final private String[] FieldNames = { 
@@ -348,7 +348,7 @@
 				  Util.getJCRefType(TRANSLET_SIG),
 				  null, null);
 	field = cpg.addFieldref(NODE_COUNTER, "_translet",
-				"Lorg/apache/xalan/xsltc/Translet;");
+				"Lcom.sun.xalan.org.apache.xalan/xsltc/Translet;");
 	il.append(ALOAD_0); // 'this' pointer on stack
 	il.append(new GETFIELD(field));
 	il.append(new CHECKCAST(cpg.addClass(TRANSLET_CLASS)));
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NumberCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NumberCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NumberCall.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/NumberCall.java	Thu Aug 11 18:14:28 2011
@@ -19,15 +19,15 @@
  * $Id: NumberCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ObjectFactory.java	Mon Nov 14 16:40:56 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ObjectFactory.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Otherwise.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Otherwise.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Otherwise.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Otherwise.java	Thu Aug 11 18:14:28 2011
@@ -19,14 +19,14 @@
  * $Id: Otherwise.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Output.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Output.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Output.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Output.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Output.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.OutputStreamWriter;
 import java.util.Properties;
@@ -32,12 +32,12 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.PUTFIELD;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.serializer.Encodings;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.serializer.Encodings;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Param.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Param.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Param.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Param.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Param.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.classfile.Field;
 import org.apache.bcel.generic.BranchHandle;
@@ -31,14 +31,14 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.PUTFIELD;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ObjectType;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ObjectType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParameterRef.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParameterRef.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParameterRef.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParameterRef.java	Thu Aug 11 18:14:28 2011
@@ -19,17 +19,17 @@
  * $Id: ParameterRef.java 528589 2007-04-13 18:50:56Z zongaro $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.CHECKCAST;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETFIELD;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentLocationPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentLocationPath.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentLocationPath.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: ParentLocationPath.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -30,13 +30,13 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentPattern.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ParentPattern.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: ParentPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.ILOAD;
@@ -28,11 +28,11 @@
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Parser.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Parser.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Parser.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Parser.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Parser.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,11 +38,11 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.runtime.AttributeList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AttributeList;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Pattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Pattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Pattern.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Pattern.java	Thu Aug 11 18:14:28 2011
@@ -19,12 +19,12 @@
  * $Id: Pattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
@@ -46,7 +46,7 @@
      * make sure to backpatch both true and false lists. True lists are the 
      * default, in the sense that they always <em>"fall through"</em>. If this
      * is not the intended semantics (e.g., see 
-     * {@link org.apache.xalan.xsltc.compiler.AlternativePattern#translate})
+     * {@link com.sun.xalan.org.apache.xalan.xsltc.compiler.AlternativePattern#translate})
      * then a GOTO must be appended to the instruction list after calling
      * <code>translate</code>. 
      */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/PositionCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/PositionCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/PositionCall.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/PositionCall.java	Thu Aug 11 18:14:28 2011
@@ -19,16 +19,16 @@
  * $Id: PositionCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.ILOAD;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.CompareGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.TestGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.CompareGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TestGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Predicate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Predicate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Predicate.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Predicate.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: Predicate.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.ArrayList;
 
@@ -34,19 +34,19 @@
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.PUTFIELD;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.FilterGenerator;
-import org.apache.xalan.xsltc.compiler.util.IntType;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NumberType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.TestGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xalan.xsltc.runtime.Operators;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.FilterGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.IntType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NumberType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TestGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Operators;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: ProcessingInstruction.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -30,13 +30,13 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: ProcessingInstructionPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.ConstantPoolGen;
@@ -31,12 +31,12 @@
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/QName.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/QName.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/QName.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/QName.java	Thu Aug 11 18:14:28 2011
@@ -19,7 +19,7 @@
  * $Id: QName.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RealExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RealExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RealExpr.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RealExpr.java	Thu Aug 11 18:14:29 2011
@@ -19,15 +19,15 @@
  * $Id: RealExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelationalExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelationalExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelationalExpr.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelationalExpr.java	Thu Aug 11 18:14:29 2011
@@ -19,27 +19,27 @@
  * $Id: RelationalExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.BranchInstruction;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.IntType;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.RealType;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.runtime.Operators;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.IntType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.RealType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Operators;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: RelativeLocationPath.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativePathPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativePathPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativePathPattern.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RelativePathPattern.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: RelativePathPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RoundCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RoundCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RoundCall.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/RoundCall.java	Thu Aug 11 18:14:29 2011
@@ -19,15 +19,15 @@
  * $Id: RoundCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport12.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SecuritySupport12.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java	Thu Aug 11 18:14:29 2011
@@ -19,15 +19,15 @@
  * $Id: SimpleAttributeValue.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Sort.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Sort.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Sort.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Sort.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: Sort.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -49,18 +49,18 @@
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.PUTFIELD;
 import org.apache.bcel.generic.TABLESWITCH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.CompareGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.IntType;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSortRecordFactGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSortRecordGenerator;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.CompareGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.IntType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSortRecordFactGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSortRecordGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SourceLoader.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SourceLoader.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SourceLoader.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SourceLoader.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: SourceLoader.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.xml.sax.InputSource;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StartsWithCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StartsWithCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StartsWithCall.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StartsWithCall.java	Thu Aug 11 18:14:29 2011
@@ -19,18 +19,18 @@
  * $Id: StartsWithCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Step.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Step.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Step.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Step.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: Step.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -36,14 +36,14 @@
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StepPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StepPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StepPattern.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StepPattern.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: StepPattern.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -47,13 +47,13 @@
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.PUTFIELD;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringCall.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringCall.java	Thu Aug 11 18:14:29 2011
@@ -19,16 +19,16 @@
  * $Id: StringCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringLengthCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringLengthCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringLengthCall.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/StringLengthCall.java	Thu Aug 11 18:14:29 2011
@@ -19,16 +19,16 @@
  * $Id: StringLengthCall.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Stylesheet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Stylesheet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Stylesheet.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Stylesheet.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: Stylesheet.java 577935 2007-09-20 21:35:20Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 import java.util.Enumeration;
@@ -28,7 +28,7 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 import org.apache.bcel.generic.ANEWARRAY;
 import org.apache.bcel.generic.BasicType;
 import org.apache.bcel.generic.ConstantPoolGen;
@@ -49,14 +49,14 @@
 import org.apache.bcel.generic.PUTSTATIC;
 import org.apache.bcel.generic.TargetLostException;
 import org.apache.bcel.util.InstructionFinder;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 public final class Stylesheet extends SyntaxTreeNode {
 
@@ -1148,7 +1148,7 @@
 				"topLevel", _className, il,
 				classGen.getConstantPool());
 
-	toplevel.addException("org.apache.xalan.xsltc.TransletException");
+	toplevel.addException("com.sun.xalan.org.apache.xalan.xsltc.TransletException");
 
 	// Define and initialize 'current' variable with the root node
 	final LocalVariableGen current = 
@@ -1158,7 +1158,7 @@
 
 	final int setFilter = cpg.addInterfaceMethodref(DOM_INTF,
 			       "setFilter",
-			       "(Lorg/apache/xalan/xsltc/StripFilter;)V");
+			       "(Lcom.sun.xalan.org.apache.xalan/xsltc/StripFilter;)V");
 
 	final int gitr = cpg.addInterfaceMethodref(DOM_INTF,
 							"getIterator",
@@ -1312,7 +1312,7 @@
 				"buildKeys", _className, il,
 				classGen.getConstantPool());
 
-	buildKeys.addException("org.apache.xalan.xsltc.TransletException");
+	buildKeys.addException("com.sun.xalan.org.apache.xalan.xsltc.TransletException");
 	
 	final Enumeration elements = elements();
 	while (elements.hasMoreElements()) {
@@ -1365,7 +1365,7 @@
 				_className,
 				il,
 				classGen.getConstantPool());
-	transf.addException("org.apache.xalan.xsltc.TransletException");
+	transf.addException("com.sun.xalan.org.apache.xalan.xsltc.TransletException");
 
 	// Define and initialize current with the root node
 	final LocalVariableGen current = 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SymbolTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SymbolTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SymbolTable.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SymbolTable.java	Thu Aug 11 18:14:29 2011
@@ -19,13 +19,13 @@
  * $Id: SymbolTable.java 476471 2006-11-18 08:36:27Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Hashtable;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: SyntaxTreeNode.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -40,13 +40,13 @@
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.NEWARRAY;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.runtime.AttributeList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AttributeList;
 
 import org.xml.sax.Attributes;
 
@@ -682,7 +682,7 @@
 	// function is not used.
 	if (stylesheet.callsNodeset()
 	    && !DOM_CLASS.equals(DOM_IMPL_CLASS)) {
-	    // new org.apache.xalan.xsltc.dom.DOMAdapter(DOMImpl,String[]);
+	    // new com.sun.xalan.org.apache.xalan.xsltc.dom.DOMAdapter(DOMImpl,String[]);
 	    index = cpg.addMethodref(DOM_ADAPTER_CLASS,
 				     "<init>",
 				     "("+DOM_INTF_SIG+
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Template.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Template.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Template.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Template.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: Template.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -27,14 +27,14 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NamedMethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NamedMethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TestSeq.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TestSeq.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TestSeq.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TestSeq.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: TestSeq.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Dictionary;
 import java.util.Vector;
@@ -27,8 +27,8 @@
 import org.apache.bcel.generic.GOTO_W;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 
 /**
  * A test sequence is a sequence of patterns that
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Text.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Text.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Text.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Text.java	Thu Aug 11 18:14:29 2011
@@ -19,16 +19,16 @@
  * $Id: Text.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETSTATIC;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TopLevelElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TopLevelElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TopLevelElement.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TopLevelElement.java	Thu Aug 11 18:14:29 2011
@@ -19,17 +19,17 @@
  * $Id: TopLevelElement.java 476471 2006-11-18 08:36:27Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 class TopLevelElement extends SyntaxTreeNode {
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TransletOutput.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TransletOutput.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TransletOutput.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/TransletOutput.java	Thu Aug 11 18:14:29 2011
@@ -19,20 +19,20 @@
  * $Id: TransletOutput.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java	Thu Aug 11 18:14:29 2011
@@ -19,14 +19,14 @@
  * $Id: UnaryOpExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnionPathExpr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnionPathExpr.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnionPathExpr.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: UnionPathExpr.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -29,12 +29,12 @@
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java	Thu Aug 11 18:14:29 2011
@@ -19,18 +19,18 @@
  * $Id: UnparsedEntityUriCall.java 478670 2006-11-23 20:52:22Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.StringType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.StringType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnresolvedRef.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnresolvedRef.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnresolvedRef.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnresolvedRef.java	Thu Aug 11 18:14:29 2011
@@ -19,13 +19,13 @@
  * $Id: UnresolvedRef.java 476471 2006-11-18 08:36:27Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnsupportedElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnsupportedElement.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UnsupportedElement.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: UnsupportedElement.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -28,12 +28,12 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
 
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UseAttributeSets.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UseAttributeSets.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/UseAttributeSets.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: UseAttributeSets.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -27,11 +27,11 @@
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKESPECIAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ValueOf.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ValueOf.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ValueOf.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/ValueOf.java	Thu Aug 11 18:14:29 2011
@@ -19,19 +19,19 @@
  * $Id: ValueOf.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Variable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Variable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Variable.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Variable.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: Variable.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.classfile.Field;
 import org.apache.bcel.generic.ACONST_NULL;
@@ -29,15 +29,15 @@
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUTFIELD;
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.IntType;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeType;
-import org.apache.xalan.xsltc.compiler.util.RealType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.IntType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.RealType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 final class Variable extends VariableBase {
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableBase.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableBase.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: VariableBase.java 528589 2007-04-13 18:50:56Z zongaro $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -30,13 +30,13 @@
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRef.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRef.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRef.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRef.java	Thu Aug 11 18:14:29 2011
@@ -19,16 +19,16 @@
  * $Id: VariableRef.java 528589 2007-04-13 18:50:56Z zongaro $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.CHECKCAST;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETFIELD;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.NodeSetType;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRefBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRefBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRefBase.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/VariableRefBase.java	Thu Aug 11 18:14:29 2011
@@ -19,10 +19,10 @@
  * $Id: VariableRefBase.java 476471 2006-11-18 08:36:27Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/When.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/When.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/When.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/When.java	Thu Aug 11 18:14:29 2011
@@ -19,15 +19,15 @@
  * $Id: When.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
-import org.apache.xalan.xsltc.compiler.util.BooleanType;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.BooleanType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Whitespace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Whitespace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Whitespace.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/Whitespace.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: Whitespace.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -34,12 +34,12 @@
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Morten Jorgensen
@@ -350,7 +350,7 @@
 			new String[] { "dom","node","type" },
 			"stripSpace",classGen.getClassName(),il,cpg);
 
-	classGen.addInterface("org/apache/xalan/xsltc/StripFilter");
+	classGen.addInterface("com.sun.xalan.org.apache.xalan/xsltc/StripFilter");
 
 	final int paramDom = stripSpace.getLocalIndex("dom");
 	final int paramCurrent = stripSpace.getLocalIndex("node");
@@ -448,7 +448,7 @@
 			new String[] { "dom","node","type" },
 			"stripSpace",classGen.getClassName(),il,cpg);
 
-	classGen.addInterface("org/apache/xalan/xsltc/StripFilter");
+	classGen.addInterface("com.sun.xalan.org.apache.xalan/xsltc/StripFilter");
 
 	if (defaultAction == STRIP_SPACE)
 	    il.append(ICONST_1);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/WithParam.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/WithParam.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/WithParam.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/WithParam.java	Thu Aug 11 18:14:29 2011
@@ -19,20 +19,20 @@
  * $Id: WithParam.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathLexer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathLexer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathLexer.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathLexer.java	Thu Aug 11 18:14:29 2011
@@ -22,7 +22,7 @@
  * @author Morten Jorgensen
  *
  */
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 import java_cup.runtime.Symbol;
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathParser.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathParser.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathParser.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XPathParser.java	Thu Aug 11 18:14:29 2011
@@ -4,17 +4,17 @@
 // Thu Nov 22 16:41:50 EST 2007
 //----------------------------------------------------
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Stack;
 import java.util.Vector;
 import java.io.StringReader;
 import java_cup.runtime.*;
-import org.apache.xml.dtm.DTM;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xml.dtm.Axis;
-import org.apache.xalan.xsltc.runtime.Operators;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Operators;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 
 /** CUP v0.10k generated parser.
   * @version Thu Nov 22 16:41:50 EST 2007
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XSLTC.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XSLTC.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XSLTC.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XSLTC.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: XSLTC.java 577935 2007-09-20 21:35:20Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -40,9 +40,9 @@
 import java.util.jar.Manifest;
 
 import org.apache.bcel.classfile.JavaClass;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslAttribute.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslAttribute.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslAttribute.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslAttribute.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: XslAttribute.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
@@ -32,16 +32,16 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
 
-import org.apache.xml.serializer.ElemDesc;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xml.serializer.ElemDesc;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslElement.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslElement.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslElement.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/XslElement.java	Thu Aug 11 18:14:29 2011
@@ -19,7 +19,7 @@
  * $Id: XslElement.java 468650 2006-10-28 07:03:30Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -30,13 +30,13 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/sym.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/sym.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/sym.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/sym.java	Thu Aug 11 18:14:29 2011
@@ -4,7 +4,7 @@
 // Thu Nov 22 16:41:50 EST 2007
 //----------------------------------------------------
 
-package org.apache.xalan.xsltc.compiler;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler;
 
 /** CUP generated class containing symbol constants. */
 public class sym {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java	Mon Nov 14 16:40:57 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: AttributeSetMethodGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/BooleanType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/BooleanType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/BooleanType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/BooleanType.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: BooleanType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.BranchInstruction;
@@ -43,7 +43,7 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
 
 /**
  * @author Jacek Ambroziak
@@ -77,7 +77,7 @@
      * translation to int is undefined since booleans are always converted to
      * reals in arithmetic expressions.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -102,7 +102,7 @@
      * stack is zero, then the string 'false' is pushed. Otherwise, the string
      * 'true' is pushed.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
@@ -119,7 +119,7 @@
      * Expects a boolean on the stack and pushes a real. The value "true" is
      * converted to 1.0 and the value "false" to 0.0.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    RealType type) {
@@ -131,7 +131,7 @@
      * Boxed booleans are represented by an instance of
      * <code>java.lang.Boolean</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,15 +19,15 @@
  * $Id: ClassGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.classfile.Method;
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.Instruction;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Parser;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
 
 /**
  * The class that implements any class that inherits from 
@@ -68,12 +68,12 @@
 	_aloadTranslet = new ALOAD(TRANSLET_INDEX);
 	
 	if (stylesheet.isMultiDocument()) {
-	    _domClass = "org.apache.xalan.xsltc.dom.MultiDOM";
-	    _domClassSig = "Lorg/apache/xalan/xsltc/dom/MultiDOM;";
+	    _domClass = "com.sun.xalan.org.apache.xalan.xsltc.dom.MultiDOM";
+	    _domClassSig = "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/MultiDOM;";
 	}
 	else {
-	    _domClass = "org.apache.xalan.xsltc.dom.DOMAdapter";
-	    _domClassSig = "Lorg/apache/xalan/xsltc/dom/DOMAdapter;";
+	    _domClass = "com.sun.xalan.org.apache.xalan.xsltc.dom.DOMAdapter";
+	    _domClassSig = "Lcom.sun.xalan.org.apache.xalan/xsltc/dom/DOMAdapter;";
 	}
 	_applyTemplatesSig = "(" 
 	    + Constants.DOM_INTF_SIG
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: CompareGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ACONST_NULL;
 import org.apache.bcel.generic.ALOAD;
@@ -31,7 +31,7 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.Type;
-import org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -677,7 +677,7 @@
          */
         {ErrorMsg.COMPILE_USAGE_STR,
         "SYNOPSIS\n"+
-        "   java org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n"+
+        "   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n"+
         "      [-d <directory>] [-j <jarfile>] [-p <package>]\n"+
         "      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n"+
         "OPTIONS\n"+
@@ -709,7 +709,7 @@
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
         "SYNOPSIS \n"+
-        "   java org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n"+
+        "   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n"+
         "      [-x] [-n <iterations>] {-u <document_url> | <document>}\n"+
         "      <class> [<param1>=<value1> ...]\n\n"+
         "   uses the translet <class> to transform an XML document \n"+
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ca.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "RESUM\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <sortida>]\n      [-d <directori>] [-j <fitxer_jar>] [-p <paquet>]\n      [-n] [-x] [-u] [-v] [-h] { <full_estil> | -i }\n\nOPCIONS\n   -o <sortida>    assigna el nom <sortida> al translet\n                  generat. Per defecte, el nom del translet s'obt\u00e9\n                  del nom de <full_estils>. Aquesta opci\u00f3\n no es t\u00e9 en compte si es compilen diversos fulls d'estils.\n   -d <directori> especifica un directori de destinaci\u00f3 per al translet\n   -j <fitxer_jar>   empaqueta les classes translet en un fitxer jar del nom\n                  especificat com a <fitxer_jar>\n   -p <paquet> especifica un prefix de nom de paquet per a totes les classes\n                  translet generades.\n   -n habilita l'inlining (com a mitjana, el funcionament per defecte\n \u00e9s millor).\n   -x             habilita la sortida de missatges de depuraci\u00f3 addicionals\n   -u             interpreta els arguments del <full_estil> com URL\n   -i             obliga el compilador a llegir el full d'estil des de l'entrada est\u00e0ndardn\n   -v          imprimeix la versi\u00f3 del compilador\n   -h             imprimeix aquesta sent\u00e8ncia d'\u00fas\n"},
+        "RESUM\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <sortida>]\n      [-d <directori>] [-j <fitxer_jar>] [-p <paquet>]\n      [-n] [-x] [-u] [-v] [-h] { <full_estil> | -i }\n\nOPCIONS\n   -o <sortida>    assigna el nom <sortida> al translet\n                  generat. Per defecte, el nom del translet s'obt\u00e9\n                  del nom de <full_estils>. Aquesta opci\u00f3\n no es t\u00e9 en compte si es compilen diversos fulls d'estils.\n   -d <directori> especifica un directori de destinaci\u00f3 per al translet\n   -j <fitxer_jar>   empaqueta les classes translet en un fitxer jar del nom\n                  especificat com a <fitxer_jar>\n   -p <paquet> especifica un prefix de nom de paquet per a totes les classes\n                  translet generades.\n   -n habilita l'inlining (com a mitjana, el funcionament per defecte\n \u00e9s millor).\n   -x             habilita la sortida de missatges de depuraci\u00f3 addicionals\n   -u             interpreta els arguments del <full_estil> com URL\n   -i             obliga el compilador a llegir el full d'estil des de l'entrada est\u00e0ndardn\n   -v          imprimeix la versi\u00f3 del compilador\n   -h             imprimeix aquesta sent\u00e8ncia d'\u00fas\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "RESUM \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <fitxer_jar>]\n      [-x] [-n <iteracions>] {-u <url_document> | <document>}\n      <classe> [<param1>=<valor1> ...]\n\n   fa servir la <classe> translet per transformar un document XML \n   especificat com <document>. La <classe> translet es troba\n   o b\u00e9 a la CLASSPATH de l'usuari o b\u00e9 al <fitxer_jar> que es pot especificar opcionalment.\nOPCIONS\n   -j <fitxer_jar>    especifica un fitxer jar des del qual es carrega la classe translet\n   -x              habilita la sortida de missatges de depuraci\u00f3 addicionals \n   -n <iteracions> executa la transformaci\u00f3 el nombre de vegades <iteracions> i\n                   mostra la informaci\u00f3 de perfil\n   -u <url_document> especifica el document d'entrada XML com una URL\n"},
+        "RESUM \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <fitxer_jar>]\n      [-x] [-n <iteracions>] {-u <url_document> | <document>}\n      <classe> [<param1>=<valor1> ...]\n\n   fa servir la <classe> translet per transformar un document XML \n   especificat com <document>. La <classe> translet es troba\n   o b\u00e9 a la CLASSPATH de l'usuari o b\u00e9 al <fitxer_jar> que es pot especificar opcionalment.\nOPCIONS\n   -j <fitxer_jar>    especifica un fitxer jar des del qual es carrega la classe translet\n   -x              habilita la sortida de missatges de depuraci\u00f3 addicionals \n   -n <iteracions> executa la transformaci\u00f3 el nombre de vegades <iteracions> i\n                   mostra la informaci\u00f3 de perfil\n   -u <url_document> especifica el document d'entrada XML com una URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_cs.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSE\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <v\u00fdstup>]\n      [-d <adres\u00e1\u0159>] [-j <soubor_jar>] [-p <bal\u00edk>]\n      [-n] [-x] [-u] [-v] [-h] { <p\u0159edloha_stylu> | -i }\n\nVOLBY\n   -o <v\u00fdstup>    p\u0159i\u0159ad\u00ed k vygenerovan\u00e9mu transletu n\u00e1zev <v\u00fdstup>. \n                  Podle v\u00fdchoz\u00edho nastaven\u00ed je jm\u00e9no transletu\n                  odvozeno z n\u00e1zvu <p\u0159edloha_stylu>. Tato volba\n                  se ignoruje, pokud se kompiluj\u00ed n\u00e1sobn\u00e9 p\u0159edlohy styl\u016f.\n   -d <adres\u00e1\u0159>  ur\u010duje v\u00fdchoz\u00ed adres\u00e1\u0159 pro translet\n   -j <soubor_jar> zabal\u00ed t\u0159\u00eddu transletu do souboru jar\n                  pojmenovan\u00e9ho jako <soubor_jar>\n   -p <bal\u00edk>     ur\u010duje p\u0159edponu n\u00e1zvu bal\u00ed\u010dku pro v\u0161echny generovan\u00e9 \n                  t\u0159\u00eddy transletu.\n   -n             povoluje zarovn\u00e1n\u00ed \u0161ablony (v\u00fdchoz\u00ed chov\u00e1n\u00ed je v pr\u016fm\u011bru lep\u0161\u00ed)\n   -x             zapne dal\u0161\u00ed v\u00fdstup zpr\u00e1vy lad\u011bn\u00ed\n   -u             interpretuje  argumenty <p\u0159edloha_stylu> jako URL \n   -i             vynut\u00ed \u010dten\u00ed p\u0159edlohy styl\u016f kompil\u00e1torem ze vstupu stdin\n   -v             tiskne verzi kompil\u00e1toru\n   -h             tiskne tyto pokyny k pou\u017eit\u00ed\n"},
+        "SYNOPSE\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <v\u00fdstup>]\n      [-d <adres\u00e1\u0159>] [-j <soubor_jar>] [-p <bal\u00edk>]\n      [-n] [-x] [-u] [-v] [-h] { <p\u0159edloha_stylu> | -i }\n\nVOLBY\n   -o <v\u00fdstup>    p\u0159i\u0159ad\u00ed k vygenerovan\u00e9mu transletu n\u00e1zev <v\u00fdstup>. \n                  Podle v\u00fdchoz\u00edho nastaven\u00ed je jm\u00e9no transletu\n                  odvozeno z n\u00e1zvu <p\u0159edloha_stylu>. Tato volba\n                  se ignoruje, pokud se kompiluj\u00ed n\u00e1sobn\u00e9 p\u0159edlohy styl\u016f.\n   -d <adres\u00e1\u0159>  ur\u010duje v\u00fdchoz\u00ed adres\u00e1\u0159 pro translet\n   -j <soubor_jar> zabal\u00ed t\u0159\u00eddu transletu do souboru jar\n                  pojmenovan\u00e9ho jako <soubor_jar>\n   -p <bal\u00edk>     ur\u010duje p\u0159edponu n\u00e1zvu bal\u00ed\u010dku pro v\u0161echny generovan\u00e9 \n                  t\u0159\u00eddy transletu.\n   -n             povoluje zarovn\u00e1n\u00ed \u0161ablony (v\u00fdchoz\u00ed chov\u00e1n\u00ed je v pr\u016fm\u011bru lep\u0161\u00ed)\n   -x             zapne dal\u0161\u00ed v\u00fdstup zpr\u00e1vy lad\u011bn\u00ed\n   -u             interpretuje  argumenty <p\u0159edloha_stylu> jako URL \n   -i             vynut\u00ed \u010dten\u00ed p\u0159edlohy styl\u016f kompil\u00e1torem ze vstupu stdin\n   -v             tiskne verzi kompil\u00e1toru\n   -h             tiskne tyto pokyny k pou\u017eit\u00ed\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSE\n   java org.apache.xalan.xsltc.cmdline.Transform [-j <soubor_jar>]\n      [-x] [-n <iterace>] {-u <URL_dokumentu> | <dokument>}\n         <t\u0159\u00edda> [<param1>=<hodn1>...]\n\n   Pou\u017e\u00edv\u00e1 translet <t\u0159\u00edda> k transformaci dokumentu XML \n   ur\u010den\u00e9ho parametrem <dokument>. Translet <t\u0159\u00edda> je bu\u010f\n   v u\u017eivatelsk\u00e9 cest\u011b CLASSPATH, nebo ve voliteln\u011b ur\u010den\u00e9m souboru <soubor_jar>.\nVOLBY\n   -j <soubor_jar>    ur\u010duje soubor jar, z n\u011bj\u017e m\u00e1 b\u00fdt translet na\u010dten\n   -x                 zap\u00edn\u00e1 v\u00fdstup dal\u0161\u00edch ladic\u00edch zpr\u00e1v\n   -n <iterace>       spou\u0161t\u00ed transformaci opakovan\u011b, parametr <iterace> ur\u010duje po\u010det opakov\u00e1n\u00ed,\n                      a zobraz\u00ed informace o profilu\n   -u <URL_dokumentu> ur\u010duje adresu URL vstupn\u00edho dokumentu XML\n"},
+        "SYNOPSE\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <soubor_jar>]\n      [-x] [-n <iterace>] {-u <URL_dokumentu> | <dokument>}\n         <t\u0159\u00edda> [<param1>=<hodn1>...]\n\n   Pou\u017e\u00edv\u00e1 translet <t\u0159\u00edda> k transformaci dokumentu XML \n   ur\u010den\u00e9ho parametrem <dokument>. Translet <t\u0159\u00edda> je bu\u010f\n   v u\u017eivatelsk\u00e9 cest\u011b CLASSPATH, nebo ve voliteln\u011b ur\u010den\u00e9m souboru <soubor_jar>.\nVOLBY\n   -j <soubor_jar>    ur\u010duje soubor jar, z n\u011bj\u017e m\u00e1 b\u00fdt translet na\u010dten\n   -x                 zap\u00edn\u00e1 v\u00fdstup dal\u0161\u00edch ladic\u00edch zpr\u00e1v\n   -n <iterace>       spou\u0161t\u00ed transformaci opakovan\u011b, parametr <iterace> ur\u010duje po\u010det opakov\u00e1n\u00ed,\n                      a zobraz\u00ed informace o profilu\n   -u <URL_dokumentu> ur\u010duje adresu URL vstupn\u00edho dokumentu XML\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_de.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <Ausgabe>]\n      [-d <Verzeichnis>] [-j <jarDatei>] [-p <Paket>]\n      [-n] [-x] [-u] [-v] [-h] { <Formatvorlage> | -i }\n\nOPTIONEN\n   -o <Ausgabe>    Ordnet dem generierten Translet den Namen <Ausgabe> zu.\n Der Translet-Name wird standardm\u00e4\u00dfig\n                 von dem Namen von <formatvorlage> abgeleitet. Diese Option\n                  wird ignoriert, wenn mehrere Formatvorlagen kompiliert werden. \n      -d <verzeichnis> Gibt ein Zielverzeichnis f\u00fcr Translet an.\n   -j <jardatei>   Packt Translet-Klassen in eine jar-Datei mit dem\n                  Namen, der f\u00fcr <jardatei> angegeben wurde.\n   -p <paket>   Gibt ein Paketnamenpr\u00e4fix f\u00fcr alle\n                   generierten Translet-Klassen an.\n   -n             Aktiviert Inline-Anordnung von Vorlagen (Standardverhalten \n                  durchschnittlich besser).\n   -x             Aktiviert zus\u00e4tzliche Debugnachrichtenausgabe.\n   -u             Interpretiert Argumente <Formatvorlage> als URLs.\n   -i             Erzwingt, dass der Compiler die Formatvorlage aus der Standardeingabe liest.\n   -v             Gibt die Version des Compilers aus.\n   -h             Gibt diese Syntaxanweisung aus.\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <Ausgabe>]\n      [-d <Verzeichnis>] [-j <jarDatei>] [-p <Paket>]\n      [-n] [-x] [-u] [-v] [-h] { <Formatvorlage> | -i }\n\nOPTIONEN\n   -o <Ausgabe>    Ordnet dem generierten Translet den Namen <Ausgabe> zu.\n Der Translet-Name wird standardm\u00e4\u00dfig\n                 von dem Namen von <formatvorlage> abgeleitet. Diese Option\n                  wird ignoriert, wenn mehrere Formatvorlagen kompiliert werden. \n      -d <verzeichnis> Gibt ein Zielverzeichnis f\u00fcr Translet an.\n   -j <jardatei>   Packt Translet-Klassen in eine jar-Datei mit dem\n                  Namen, der f\u00fcr <jardatei> angegeben wurde.\n   -p <paket>   Gibt ein Paketnamenpr\u00e4fix f\u00fcr alle\n                   generierten Translet-Klassen an.\n   -n             Aktiviert Inline-Anordnung von Vorlagen (Standardverhalten \n                  durchschnittlich besser).\n   -x             Aktiviert zus\u00e4tzliche Debugnachrichtenausgabe.\n   -u             Interpretiert Argumente <Formatvorlage> als URLs.\n   -i             Erzwingt, dass der Compiler die Formatvorlage aus der Standardeingabe liest.\n   -v             Gibt die Version des Compilers aus.\n   -h             Gibt diese Syntaxanweisung aus.\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNTAX \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <JAR-Datei>]\n      [-x] [-n <Iterationen>] {-u <Dokument-URL> | <Dokument>}\n      <Klasse> [<Param1>=<Wert1> ...]\n\n   Verwendet die <Klasse> von Translet, um ein  XML-Dokument umzusetzen,\n   das als <Dokument> angegeben wurde. Die <klasse> von Translet befindet sich entweder in\n   der CLASSPATH-Angabe des Benutzers oder in der optional angegebenen <jardatei>.\nOPTIONEN\n   -j <JAR-Datei>    Gibt eine JAR-Datei an, aus der das Translet geladen wird.\n   -x              Aktiviert zus\u00e4tzliche Debugnachrichtenausgabe.\n   -n <Iterationen> F\u00fchrt die Umsetzung <Iterationen> Mal aus und \n                   zeigt Profilinformationen an.\n   -u <Dokument-URL> Gibt das XML-Eingabedokument als URL an.\n"},
+        "SYNTAX \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <JAR-Datei>]\n      [-x] [-n <Iterationen>] {-u <Dokument-URL> | <Dokument>}\n      <Klasse> [<Param1>=<Wert1> ...]\n\n   Verwendet die <Klasse> von Translet, um ein  XML-Dokument umzusetzen,\n   das als <Dokument> angegeben wurde. Die <klasse> von Translet befindet sich entweder in\n   der CLASSPATH-Angabe des Benutzers oder in der optional angegebenen <jardatei>.\nOPTIONEN\n   -j <JAR-Datei>    Gibt eine JAR-Datei an, aus der das Translet geladen wird.\n   -x              Aktiviert zus\u00e4tzliche Debugnachrichtenausgabe.\n   -n <Iterationen> F\u00fchrt die Umsetzung <Iterationen> Mal aus und \n                   zeigt Profilinformationen an.\n   -u <Dokument-URL> Gibt das XML-Eingabedokument als URL an.\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_es.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SINOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <salida>]\n      [-d <directory>] [-j <archivojar>] [-p <paquete>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPCIONES\n   -o <salida>    asigna el nombre <salida> al translet\n                  generado.  De forma predeterminada, el nombre del translet\n                  se deriva del nombre de la <hojaestilos>. Esta opci\u00f3n\n                  se ignora si se compilan varias hojas de estilos.\n   -d <directorio> especificar un directorio de destino para el translet\n   -j <archivojar>   empaqueta las clases translet en el archivo jar del\n                  nombre especificado por <archivojar>\n   -p <paquete>   especifica un prefijo de nombre de paquete para todas las\n                  clases translet generadas.\n   -n             habilita la inclusi\u00f3n en l\u00ednea de plantillas (comportamiento predeterminado\n                  mejor seg\u00fan promedio).\n   -x             activa la salida de mensajes de depuraci\u00f3n adicionales\n   -u             interpreta los argumentos <stylesheet>  como URL\n   -i             fuerza que el compilador lea la hoja de estilos de stdin\n   -v             imprime la versi\u00f3n del compilador\n   -h             imprime esta sentencia de uso\n"},
+        "SINOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <salida>]\n      [-d <directory>] [-j <archivojar>] [-p <paquete>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPCIONES\n   -o <salida>    asigna el nombre <salida> al translet\n                  generado.  De forma predeterminada, el nombre del translet\n                  se deriva del nombre de la <hojaestilos>. Esta opci\u00f3n\n                  se ignora si se compilan varias hojas de estilos.\n   -d <directorio> especificar un directorio de destino para el translet\n   -j <archivojar>   empaqueta las clases translet en el archivo jar del\n                  nombre especificado por <archivojar>\n   -p <paquete>   especifica un prefijo de nombre de paquete para todas las\n                  clases translet generadas.\n   -n             habilita la inclusi\u00f3n en l\u00ednea de plantillas (comportamiento predeterminado\n                  mejor seg\u00fan promedio).\n   -x             activa la salida de mensajes de depuraci\u00f3n adicionales\n   -u             interpreta los argumentos <stylesheet>  como URL\n   -i             fuerza que el compilador lea la hoja de estilos de stdin\n   -v             imprime la versi\u00f3n del compilador\n   -h             imprime esta sentencia de uso\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SINOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <archivojar>]\n      [-x] [-n <iteraciones>] {-u <url_documento | <documento>}\n      <clase> [<param1>=<valor1> ...]\n\n   utiliza la <clase> translet para transformar  un documento XML \n   especificado como <documento>. La <clase> translet est\u00e1 en\n   la CLASSPATH del usuario o en el <archivojar> especificado opcionalmente.\nOPCIONES\n   -j <archivojar>    especifica un archivo jar desde el que se va a cargar el translet\n   -x           activa la salida de mensajes de depuraci\u00f3n adicionales\n   -n <iteraciones> ejecuta la transformaci\u00f3n <iteraciones> veces y\n       muestra informaci\u00f3n de perfiles\n   -u <url_documento> especifica el documento de entrada XML como un URL\n"},
+        "SINOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <archivojar>]\n      [-x] [-n <iteraciones>] {-u <url_documento | <documento>}\n      <clase> [<param1>=<valor1> ...]\n\n   utiliza la <clase> translet para transformar  un documento XML \n   especificado como <documento>. La <clase> translet est\u00e1 en\n   la CLASSPATH del usuario o en el <archivojar> especificado opcionalmente.\nOPCIONES\n   -j <archivojar>    especifica un archivo jar desde el que se va a cargar el translet\n   -x           activa la salida de mensajes de depuraci\u00f3n adicionales\n   -n <iteraciones> ejecuta la transformaci\u00f3n <iteraciones> veces y\n       muestra informaci\u00f3n de perfiles\n   -u <url_documento> especifica el documento de entrada XML como un URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_fr.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <sortie>]\n      [-d <r\u00e9pertoire>] [-j <fichierjar>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <feuille_de_style> | -i }\n\nOPTIONS\n   -o <sortie>    attribue le nom <sortie> au translet\n                  g\u00e9n\u00e9r\u00e9. Par d\u00e9faut, le nom du translet est\n                  d\u00e9riv\u00e9 du nom <feuille_de_style>.  Cette option\n                  est ignor\u00e9e si plusieurs feuilles de style sont compil\u00e9es.\n   -d <r\u00e9pertoire> sp\u00e9cifie un r\u00e9pertoire de destination pour translet\n   -j <fichier_jar>   rassemble les classes translet dans le fichier \n       <fichier_jar>\n   -p <module>   sp\u00e9cifie un pr\u00e9fixe de nom de module pour toutes les classes\n              translet g\u00e9n\u00e9r\u00e9es.\n   -n             active la mise en ligne de mod\u00e8le (comportement par d\u00e9faut - pr\u00e9f\u00e9rable \n                  on en moyenne).\n   -x             active le d\u00e9bogage suppl\u00e9mentaire de sortie de message\n   -u             interpr\u00e8te les arguments <feuille_de_style> comme des adresses URL\n   -i             force le compilateur \u00e0 lire la feuille de style dans stdin\n   -v             imprime la version du compilateur\n   -h             imprime cette instruction de syntaxe\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <sortie>]\n      [-d <r\u00e9pertoire>] [-j <fichierjar>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <feuille_de_style> | -i }\n\nOPTIONS\n   -o <sortie>    attribue le nom <sortie> au translet\n                  g\u00e9n\u00e9r\u00e9. Par d\u00e9faut, le nom du translet est\n                  d\u00e9riv\u00e9 du nom <feuille_de_style>.  Cette option\n                  est ignor\u00e9e si plusieurs feuilles de style sont compil\u00e9es.\n   -d <r\u00e9pertoire> sp\u00e9cifie un r\u00e9pertoire de destination pour translet\n   -j <fichier_jar>   rassemble les classes translet dans le fichier \n       <fichier_jar>\n   -p <module>   sp\u00e9cifie un pr\u00e9fixe de nom de module pour toutes les classes\n              translet g\u00e9n\u00e9r\u00e9es.\n   -n             active la mise en ligne de mod\u00e8le (comportement par d\u00e9faut - pr\u00e9f\u00e9rable \n                  on en moyenne).\n   -x             active le d\u00e9bogage suppl\u00e9mentaire de sortie de message\n   -u             interpr\u00e8te les arguments <feuille_de_style> comme des adresses URL\n   -i             force le compilateur \u00e0 lire la feuille de style dans stdin\n   -v             imprime la version du compilateur\n   -h             imprime cette instruction de syntaxe\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <fichierjar>]\n      [-x] [-n <it\u00e9rations>] {-u <url_document> | <document>}\n    <classe> [<param1>=<valeur1> ...]\n\n   utilise la <classe> translet pour transformer un document XML \n   d\u00e9fini comme <document>. La <classe> translet se trouve dans la\n   fonction CLASSPATH de l'utilisateur ou dans le <fichier_jar> indiqu\u00e9 en option.\nOPTIONS\n   -j <fichierjar>    sp\u00e9cifie un fichier jar \u00e0 partir duquel charger le translet\n   -x              active le d\u00e9bogage suppl\u00e9mentaire de sortie de message\n   -n <it\u00e9rations> ex\u00e9cute la transformation <it\u00e9rations> fois et\n                   affiche des informations de profil\n   -u <url_document> d\u00e9finit le document d'entr\u00e9e XML comme une URL\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <fichierjar>]\n      [-x] [-n <it\u00e9rations>] {-u <url_document> | <document>}\n    <classe> [<param1>=<valeur1> ...]\n\n   utilise la <classe> translet pour transformer un document XML \n   d\u00e9fini comme <document>. La <classe> translet se trouve dans la\n   fonction CLASSPATH de l'utilisateur ou dans le <fichier_jar> indiqu\u00e9 en option.\nOPTIONS\n   -j <fichierjar>    sp\u00e9cifie un fichier jar \u00e0 partir duquel charger le translet\n   -x              active le d\u00e9bogage suppl\u00e9mentaire de sortie de message\n   -n <it\u00e9rations> ex\u00e9cute la transformation <it\u00e9rations> fois et\n                   affiche des informations de profil\n   -u <url_document> d\u00e9finit le document d'entr\u00e9e XML comme une URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_hu.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "Haszn\u00e1lat:\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <kimenet>]\n      [-d <k\u00f6nyvt\u00e1r>] [-j <jar_f\u00e1jl>] [-p <csomag>]\n      [-n] [-x] [-u] [-v] [-h] { <st\u00edluslap> | -i }\n\nBE\u00c1LL\u00cdT\u00c1SOK\n   -o <kimenet>   hozz\u00e1rendeli a <kimenet> nevet az el\u0151\u00e1ll\u00edtott\n                  translethez. Alap\u00e9rtelmez\u00e9s szerint\n                  a translet neve a <st\u00edluslap>\n                  nev\u00e9b\u0151l sz\u00e1rmazik. Ez a be\u00e1ll\u00edt\u00e1s figyelmen\n                  k\u00edv\u00fcl marad, ha t\u00f6bb st\u00edluslapot ford\u00edt.\n   -d <k\u00f6nyvt\u00e1r>  meghat\u00e1rozza a translet c\u00e9lk\u00f6nyvt\u00e1r\u00e1t\n   -j <jar_f\u00e1jl>  a translet oszt\u00e1lyokat egy jar f\u00e1jlba csomagolja,\n                  aminek a nev\u00e9t a <jar_f\u00e1jl> attrib\u00fatum adja meg\n   -p <csomag>    meghat\u00e1rozza az \u00f6sszes el\u0151\u00e1ll\u00edtott translet oszt\u00e1ly\n                  csomagn\u00e9v el\u0151tagj\u00e1t.\n   -n             enged\u00e9lyezi a sablonbeemel\u00e9st\n                  (az alap\u00e9rtelmezett viselked\u00e9s \u00e1ltal\u00e1ban jobb).\n   -x             bekapcsolja a tov\u00e1bbi hibakeres\u00e9si \u00fczeneteket\n   -u             \u00e9rtelmezi a <st\u00edluslap> argumentumokat \u00e9s URL c\u00edmeket\n   -i             k\u00e9nyszer\u00edti a ford\u00edt\u00f3t, hogy a st\u00edluslapot az stdin\n                  bemenetr\u0151l olvassa\n   -v             megjelen\u00edti a ford\u00edt\u00f3 verzi\u00f3sz\u00e1m\u00e1t\n   -h             megjelen\u00edti ezt a haszn\u00e1lati utas\u00edt\u00e1st\n"},
+        "Haszn\u00e1lat:\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <kimenet>]\n      [-d <k\u00f6nyvt\u00e1r>] [-j <jar_f\u00e1jl>] [-p <csomag>]\n      [-n] [-x] [-u] [-v] [-h] { <st\u00edluslap> | -i }\n\nBE\u00c1LL\u00cdT\u00c1SOK\n   -o <kimenet>   hozz\u00e1rendeli a <kimenet> nevet az el\u0151\u00e1ll\u00edtott\n                  translethez. Alap\u00e9rtelmez\u00e9s szerint\n                  a translet neve a <st\u00edluslap>\n                  nev\u00e9b\u0151l sz\u00e1rmazik. Ez a be\u00e1ll\u00edt\u00e1s figyelmen\n                  k\u00edv\u00fcl marad, ha t\u00f6bb st\u00edluslapot ford\u00edt.\n   -d <k\u00f6nyvt\u00e1r>  meghat\u00e1rozza a translet c\u00e9lk\u00f6nyvt\u00e1r\u00e1t\n   -j <jar_f\u00e1jl>  a translet oszt\u00e1lyokat egy jar f\u00e1jlba csomagolja,\n                  aminek a nev\u00e9t a <jar_f\u00e1jl> attrib\u00fatum adja meg\n   -p <csomag>    meghat\u00e1rozza az \u00f6sszes el\u0151\u00e1ll\u00edtott translet oszt\u00e1ly\n                  csomagn\u00e9v el\u0151tagj\u00e1t.\n   -n             enged\u00e9lyezi a sablonbeemel\u00e9st\n                  (az alap\u00e9rtelmezett viselked\u00e9s \u00e1ltal\u00e1ban jobb).\n   -x             bekapcsolja a tov\u00e1bbi hibakeres\u00e9si \u00fczeneteket\n   -u             \u00e9rtelmezi a <st\u00edluslap> argumentumokat \u00e9s URL c\u00edmeket\n   -i             k\u00e9nyszer\u00edti a ford\u00edt\u00f3t, hogy a st\u00edluslapot az stdin\n                  bemenetr\u0151l olvassa\n   -v             megjelen\u00edti a ford\u00edt\u00f3 verzi\u00f3sz\u00e1m\u00e1t\n   -h             megjelen\u00edti ezt a haszn\u00e1lati utas\u00edt\u00e1st\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "HASZN\u00c1LAT:\n   java org.apache.xalan.xsltc.cmdline.Transform [-j <jar_f\u00e1jl>]\n      [-x] [-n <ism\u00e9tl\u00e9s>] {-u <dokumentum_url_c\u00edme> | <dokumentum>}\n      <oszt\u00e1ly> [<param1>=<\u00e9rt\u00e9k1> ...]\n\n   a translet <oszt\u00e1ly> seg\u00edts\u00e9g\u00e9vel \u00e1talak\u00edtja a\n   <dokumentum> param\u00e9terben megadott dokumentumot. A translet\n   <oszt\u00e1ly> vagy a felhaszn\u00e1l\u00f3 CLASSPATH v\u00e1ltoz\u00f3ja\n   alapj\u00e1n, vagy a megadott <jar_f\u00e1jl>-ban tal\u00e1lhat\u00f3 meg.\nBE\u00c1LL\u00cdT\u00c1SOK\n   -j <jar_f\u00e1jl>   megadja a jar f\u00e1jlt a translet bet\u00f6lt\u00e9s\u00e9hez\n   -x              bekapcsolja a tov\u00e1bbi hibakeres\u00e9si \u00fczeneteket\n   -n <ism\u00e9tl\u00e9s>   az \u00e1talak\u00edt\u00e1st az <ism\u00e9tl\u00e9s> param\u00e9terben megadott\n                   alkalommal futtatja le, \u00e9s megjelen\u00edti a profiloz\u00e1si\n                   inform\u00e1ci\u00f3kat\n   -u <dokumentum_url_c\u00edme> megadja a bemeneti XML dokumentum URL c\u00edm\u00e9t\n"},
+        "HASZN\u00c1LAT:\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jar_f\u00e1jl>]\n      [-x] [-n <ism\u00e9tl\u00e9s>] {-u <dokumentum_url_c\u00edme> | <dokumentum>}\n      <oszt\u00e1ly> [<param1>=<\u00e9rt\u00e9k1> ...]\n\n   a translet <oszt\u00e1ly> seg\u00edts\u00e9g\u00e9vel \u00e1talak\u00edtja a\n   <dokumentum> param\u00e9terben megadott dokumentumot. A translet\n   <oszt\u00e1ly> vagy a felhaszn\u00e1l\u00f3 CLASSPATH v\u00e1ltoz\u00f3ja\n   alapj\u00e1n, vagy a megadott <jar_f\u00e1jl>-ban tal\u00e1lhat\u00f3 meg.\nBE\u00c1LL\u00cdT\u00c1SOK\n   -j <jar_f\u00e1jl>   megadja a jar f\u00e1jlt a translet bet\u00f6lt\u00e9s\u00e9hez\n   -x              bekapcsolja a tov\u00e1bbi hibakeres\u00e9si \u00fczeneteket\n   -n <ism\u00e9tl\u00e9s>   az \u00e1talak\u00edt\u00e1st az <ism\u00e9tl\u00e9s> param\u00e9terben megadott\n                   alkalommal futtatja le, \u00e9s megjelen\u00edti a profiloz\u00e1si\n                   inform\u00e1ci\u00f3kat\n   -u <dokumentum_url_c\u00edme> megadja a bemeneti XML dokumentum URL c\u00edm\u00e9t\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_it.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <output>    assegna il nome <output> al translet generato\n.  Per impostazione predefinita, il nome translet \u00e8\n                  derivato dal nome <stylesheet>.  Questa opzione\n                  viene ignorata se vengono compilati pi\u00f9 fogli di stile.\n   -d <directory> specifica una directory di destinazione per il translet\n   -j <jarfile>   raggruppa le classi translet in un file jar del\n                  nome specificato come <jarfile>\n   -p <package>   specifica un prefisso del nome pacchetto per tutte le classi\n                  translet generate.\n   -n             abilita l'allineamento della maschera (funzionamento predefinito migliore\n                  in media).\n   -x             attiva ulteriori emissioni dei messaggi di debug\n   -u             interpreta gli argomenti <stylesheet> come URL\n   -i             impone al programma di compilazione di leggere il foglio di lavoro da stdin\n   -v             stampa la versione del programma di compilazione \n   -h             stampa queste istruzioni sull'utilizzo\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <output>    assegna il nome <output> al translet generato\n.  Per impostazione predefinita, il nome translet \u00e8\n                  derivato dal nome <stylesheet>.  Questa opzione\n                  viene ignorata se vengono compilati pi\u00f9 fogli di stile.\n   -d <directory> specifica una directory di destinazione per il translet\n   -j <jarfile>   raggruppa le classi translet in un file jar del\n                  nome specificato come <jarfile>\n   -p <package>   specifica un prefisso del nome pacchetto per tutte le classi\n                  translet generate.\n   -n             abilita l'allineamento della maschera (funzionamento predefinito migliore\n                  in media).\n   -x             attiva ulteriori emissioni dei messaggi di debug\n   -u             interpreta gli argomenti <stylesheet> come URL\n   -i             impone al programma di compilazione di leggere il foglio di lavoro da stdin\n   -v             stampa la versione del programma di compilazione \n   -h             stampa queste istruzioni sull'utilizzo\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   utilizza il translet <class> per convertire un documento XML \n   specificato come <document>. Il translet <classe> si trova \n   nella istruzione CLASSPATH dell'utente o nel <jarfile> eventualmente specificato.\nOPTIONS\n   -j <jarfile>    specifica un jarfile dal quale caricare il translet\n   -x    attiva ulteriori output dei messaggi di debug\n   -n <iterations> esegue la trasformazione <iterazioni> e\n                   visualizza le informazioni relative al profilo\n   -u <document_url> specifica il documento di immissione XML come URL\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   utilizza il translet <class> per convertire un documento XML \n   specificato come <document>. Il translet <classe> si trova \n   nella istruzione CLASSPATH dell'utente o nel <jarfile> eventualmente specificato.\nOPTIONS\n   -j <jarfile>    specifica un jarfile dal quale caricare il translet\n   -x    attiva ulteriori output dei messaggi di debug\n   -n <iterations> esegue la trasformazione <iterazioni> e\n                   visualizza le informazioni relative al profilo\n   -u <document_url> specifica il documento di immissione XML come URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ja.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "\u5f62\u5f0f\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n\u30aa\u30d7\u30b7\u30e7\u30f3\n   -o <output>    \u540d\u524d <output> \u3092\u751f\u6210\u3055\u308c\u308b translet \u306b\n                  \u5272\u308a\u5f53\u3066\u307e\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u3001translet \u540d\u306f <stylesheet>\n                  \u540d\u304b\u3089\u6d3e\u751f\u3057\u307e\u3059\u3002\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u8907\u6570\u306e\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\n                \u30b3\u30f3\u30d1\u30a4\u30eb\u3059\u308b\u5834\u5408\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002\n-d <directory> translet \u306e\u5b9b\u5148\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3092\u6307\u5b9a\u3057\u307e\u3059\n -j <jarfile>   translet \u30af\u30e9\u30b9\u3092 <jarfile> \u3068\u3057\u3066\u6307\u5b9a\u3055\u308c\u305f\n                \u540d\u524d\u306e JAR \u30d5\u30a1\u30a4\u30eb\u306b\u30d1\u30c3\u30b1\u30fc\u30b8\u3057\u307e\u3059\n -p <package>   \u751f\u6210\u5f8c\u306e\u3059\u3079\u3066\u306e translet \u30af\u30e9\u30b9\u306b\u30d1\u30c3\u30b1\u30fc\u30b8\u540d\n                \u63a5\u982d\u90e8\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002\n-n             \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30a4\u30f3\u30e9\u30a4\u30f3\u5316\u3092\u4f7f\u7528\u53ef\u80fd\u306b\u3057\u307e\u3059 (\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30a4\u30f3\n                \u30e9\u30a4\u30f3\u5316\u3067\u5e73\u5747\u3068\u3057\u3066\u826f\u597d\u306a\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3092\u5f97\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059)\n-x             \u8ffd\u52a0\u306e\u30c7\u30d0\u30c3\u30b0\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u51fa\u529b\u3092\u30aa\u30f3\u306b\u3057\u307e\u3059\n   -u             <stylesheet> \u5f15\u6570\u3092 URL \u3068\u3057\u3066\u89e3\u91c8\u3057\u307e\u3059\n   -i             \u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u6a19\u6e96\u5165\u529b\u304b\u3089\u8aad\u307f\u53d6\u308b\u3088\u3046\u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306b\u5f37\u5236\u3057\u307e\u3059\n   -v             \u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5370\u5237\u3057\u307e\u3059\n   -h             \u3053\u306e\u4f7f\u7528\u6cd5\u3092\u5370\u5237\u3057\u307e\u3059\n"},
+        "\u5f62\u5f0f\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n\u30aa\u30d7\u30b7\u30e7\u30f3\n   -o <output>    \u540d\u524d <output> \u3092\u751f\u6210\u3055\u308c\u308b translet \u306b\n                  \u5272\u308a\u5f53\u3066\u307e\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u3001translet \u540d\u306f <stylesheet>\n                  \u540d\u304b\u3089\u6d3e\u751f\u3057\u307e\u3059\u3002\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u8907\u6570\u306e\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\n                \u30b3\u30f3\u30d1\u30a4\u30eb\u3059\u308b\u5834\u5408\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002\n-d <directory> translet \u306e\u5b9b\u5148\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3092\u6307\u5b9a\u3057\u307e\u3059\n -j <jarfile>   translet \u30af\u30e9\u30b9\u3092 <jarfile> \u3068\u3057\u3066\u6307\u5b9a\u3055\u308c\u305f\n                \u540d\u524d\u306e JAR \u30d5\u30a1\u30a4\u30eb\u306b\u30d1\u30c3\u30b1\u30fc\u30b8\u3057\u307e\u3059\n -p <package>   \u751f\u6210\u5f8c\u306e\u3059\u3079\u3066\u306e translet \u30af\u30e9\u30b9\u306b\u30d1\u30c3\u30b1\u30fc\u30b8\u540d\n                \u63a5\u982d\u90e8\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002\n-n             \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30a4\u30f3\u30e9\u30a4\u30f3\u5316\u3092\u4f7f\u7528\u53ef\u80fd\u306b\u3057\u307e\u3059 (\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30a4\u30f3\n                \u30e9\u30a4\u30f3\u5316\u3067\u5e73\u5747\u3068\u3057\u3066\u826f\u597d\u306a\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3092\u5f97\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059)\n-x             \u8ffd\u52a0\u306e\u30c7\u30d0\u30c3\u30b0\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u51fa\u529b\u3092\u30aa\u30f3\u306b\u3057\u307e\u3059\n   -u             <stylesheet> \u5f15\u6570\u3092 URL \u3068\u3057\u3066\u89e3\u91c8\u3057\u307e\u3059\n   -i             \u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u3092\u6a19\u6e96\u5165\u529b\u304b\u3089\u8aad\u307f\u53d6\u308b\u3088\u3046\u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306b\u5f37\u5236\u3057\u307e\u3059\n   -v             \u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5370\u5237\u3057\u307e\u3059\n   -h             \u3053\u306e\u4f7f\u7528\u6cd5\u3092\u5370\u5237\u3057\u307e\u3059\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "\u5f62\u5f0f\n   java org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   translet <class> \u3092\u4f7f\u7528\u3057\u3066 <document> \u3067\u6307\u5b9a\u3055\u308c\u305f\n   XML \u6587\u66f8\u3092\u5909\u63db\u3057\u307e\u3059\u3002translet <class> \u306f\u30e6\u30fc\u30b6\u30fc\u306e CLASSPATH\n \u307e\u305f\u306f\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u6307\u5b9a\u3055\u308c\u308b <jarfile> \u306b\u5165\u3063\u3066\u3044\u307e\u3059\u3002\n\u30aa\u30d7\u30b7\u30e7\u30f3\n   -j <jarfile>    \u30ed\u30fc\u30c9\u3059\u308b translet \u304c\u5165\u3063\u3066\u3044\u308b JAR \u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u307e\u3059\n   -x              \u8ffd\u52a0\u306e\u30c7\u30d0\u30c3\u30b0\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u51fa\u529b\u3092\u30aa\u30f3\u306b\u3057\u307e\u3059\n   -n <iterations> \u306f\u5909\u63db\u3092 <iterations> \u56de\u5b9f\u884c\u3057\u3066\n                   \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u60c5\u5831\u3092\u8868\u793a\u3057\u307e\u3059\n   -u <document_url> \u306f XML \u5165\u529b\u6587\u66f8\u3092 URL \u3068\u3057\u3066\u6307\u5b9a\u3057\u307e\u3059\n"},
+        "\u5f62\u5f0f\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   translet <class> \u3092\u4f7f\u7528\u3057\u3066 <document> \u3067\u6307\u5b9a\u3055\u308c\u305f\n   XML \u6587\u66f8\u3092\u5909\u63db\u3057\u307e\u3059\u3002translet <class> \u306f\u30e6\u30fc\u30b6\u30fc\u306e CLASSPATH\n \u307e\u305f\u306f\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u6307\u5b9a\u3055\u308c\u308b <jarfile> \u306b\u5165\u3063\u3066\u3044\u307e\u3059\u3002\n\u30aa\u30d7\u30b7\u30e7\u30f3\n   -j <jarfile>    \u30ed\u30fc\u30c9\u3059\u308b translet \u304c\u5165\u3063\u3066\u3044\u308b JAR \u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u307e\u3059\n   -x              \u8ffd\u52a0\u306e\u30c7\u30d0\u30c3\u30b0\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u51fa\u529b\u3092\u30aa\u30f3\u306b\u3057\u307e\u3059\n   -n <iterations> \u306f\u5909\u63db\u3092 <iterations> \u56de\u5b9f\u884c\u3057\u3066\n                   \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u60c5\u5831\u3092\u8868\u793a\u3057\u307e\u3059\n   -u <document_url> \u306f XML \u5165\u529b\u6587\u66f8\u3092 URL \u3068\u3057\u3066\u6307\u5b9a\u3057\u307e\u3059\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ko.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n java org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n [-d <directory>] [-j <jarfile>] [-p <package>]\n [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n \uc635\uc158\n -o <output>    \uc0dd\uc131\ub41c Translet\uc5d0 <output> \uc774\ub984\uc744 \uc9c0\uc815\ud569\ub2c8\ub2e4. \n                \uae30\ubcf8\uc801\uc73c\ub85c Translet \uc774\ub984\uc744 <stylesheet> \uc774\ub984\uc5d0\uc11c\n \uac00\uc838\uc635\ub2c8\ub2e4. \uc774 \uc635\uc158\uc740 \uc5ec\ub7ec \uac1c\uc758 \uc2a4\ud0c0\uc77c\uc2dc\ud2b8\ub97c \n \ucef4\ud30c\uc77c\ud560 \uacbd\uc6b0 \ubb34\uc2dc\ub429\ub2c8\ub2e4.\n -d <directory> Translet\uc758 \ub300\uc0c1 \ub514\ub809\ud1a0\ub9ac\ub97c \uc9c0\uc815\ud569\ub2c8\ub2e4.\n -j <jarfile>   <jarfile>\ub85c \uc9c0\uc815\ub41c jar \ud30c\uc77c \uc774\ub984\uc73c\ub85c\n Translet \ud074\ub798\uc2a4\ub97c \ud328\ud0a4\uc9c0\ud569\ub2c8\ub2e4.\n -p <package>   \uc0dd\uc131\ub41c \ubaa8\ub4e0 Translet \ud074\ub798\uc2a4\uc5d0 \ub300\ud574 \ud328\ud0a4\uc9c0 \uc774\ub984 \uc811\ub450\ubd80\ub97c\n \uc9c0\uc815\ud569\ub2c8\ub2e4.\n -n             \ud15c\ud50c\ub9ac\ud2b8 \uc778\ub77c\uc774\ub2dd(\ud3c9\uade0\ubcf4\ub2e4 \uc6b0\uc218\ud55c)\uc744\n \uc0ac\uc6a9 \uac00\ub2a5\ud558\uac8c \ud569\ub2c8\ub2e4.\n -x             \ucd94\uac00 \ub514\ubc84\uae45 \uba54\uc2dc\uc9c0 \ucd9c\ub825\uc744 \uc2dc\uc791\ud569\ub2c8\ub2e4.\n -u             <stylesheet> \uc778\uc218\ub97c URL\ub85c \ud574\uc11d\ud569\ub2c8\ub2e4.\n -i             stdin\uc73c\ub85c\ubd80\ud130 \uc2a4\ud0c0\uc77c\uc2dc\ud2b8\ub97c \uc77d\ub3c4\ub85d \ucef4\ud30c\uc77c\ub7ec\ub97c \uac15\uc81c \uc2e4\ud589\ud569\ub2c8\ub2e4.\n -v             \ucef4\ud30c\uc77c\ub7ec \ubc84\uc804\uc744 \uc778\uc1c4\ud569\ub2c8\ub2e4.\n -h             \uc0ac\uc6a9\ubc95 \uba85\ub839\ubb38\uc744 \uc778\uc1c4\ud569\ub2c8\ub2e4.\n"},
+        "SYNOPSIS\n java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n [-d <directory>] [-j <jarfile>] [-p <package>]\n [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n \uc635\uc158\n -o <output>    \uc0dd\uc131\ub41c Translet\uc5d0 <output> \uc774\ub984\uc744 \uc9c0\uc815\ud569\ub2c8\ub2e4. \n                \uae30\ubcf8\uc801\uc73c\ub85c Translet \uc774\ub984\uc744 <stylesheet> \uc774\ub984\uc5d0\uc11c\n \uac00\uc838\uc635\ub2c8\ub2e4. \uc774 \uc635\uc158\uc740 \uc5ec\ub7ec \uac1c\uc758 \uc2a4\ud0c0\uc77c\uc2dc\ud2b8\ub97c \n \ucef4\ud30c\uc77c\ud560 \uacbd\uc6b0 \ubb34\uc2dc\ub429\ub2c8\ub2e4.\n -d <directory> Translet\uc758 \ub300\uc0c1 \ub514\ub809\ud1a0\ub9ac\ub97c \uc9c0\uc815\ud569\ub2c8\ub2e4.\n -j <jarfile>   <jarfile>\ub85c \uc9c0\uc815\ub41c jar \ud30c\uc77c \uc774\ub984\uc73c\ub85c\n Translet \ud074\ub798\uc2a4\ub97c \ud328\ud0a4\uc9c0\ud569\ub2c8\ub2e4.\n -p <package>   \uc0dd\uc131\ub41c \ubaa8\ub4e0 Translet \ud074\ub798\uc2a4\uc5d0 \ub300\ud574 \ud328\ud0a4\uc9c0 \uc774\ub984 \uc811\ub450\ubd80\ub97c\n \uc9c0\uc815\ud569\ub2c8\ub2e4.\n -n             \ud15c\ud50c\ub9ac\ud2b8 \uc778\ub77c\uc774\ub2dd(\ud3c9\uade0\ubcf4\ub2e4 \uc6b0\uc218\ud55c)\uc744\n \uc0ac\uc6a9 \uac00\ub2a5\ud558\uac8c \ud569\ub2c8\ub2e4.\n -x             \ucd94\uac00 \ub514\ubc84\uae45 \uba54\uc2dc\uc9c0 \ucd9c\ub825\uc744 \uc2dc\uc791\ud569\ub2c8\ub2e4.\n -u             <stylesheet> \uc778\uc218\ub97c URL\ub85c \ud574\uc11d\ud569\ub2c8\ub2e4.\n -i             stdin\uc73c\ub85c\ubd80\ud130 \uc2a4\ud0c0\uc77c\uc2dc\ud2b8\ub97c \uc77d\ub3c4\ub85d \ucef4\ud30c\uc77c\ub7ec\ub97c \uac15\uc81c \uc2e4\ud589\ud569\ub2c8\ub2e4.\n -v             \ucef4\ud30c\uc77c\ub7ec \ubc84\uc804\uc744 \uc778\uc1c4\ud569\ub2c8\ub2e4.\n -h             \uc0ac\uc6a9\ubc95 \uba85\ub839\ubb38\uc744 \uc778\uc1c4\ud569\ub2c8\ub2e4.\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n java org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n [-x] [-n <iterations>] {-u <document_url> | <document>}\n <class> [<param1>=<value1> ...]\n\n Translet <class>\ub97c \uc0ac\uc6a9\ud558\uc5ec <document>\ub85c \uc9c0\uc815\ub41c XML \ubb38\uc11c\ub97c \n \ubcc0\ud658\ud569\ub2c8\ub2e4. Translet <class>\ub294 \uc0ac\uc6a9\uc790\uc758 CLASSPATH \ub610\ub294\n \uc120\ud0dd\uc801\uc73c\ub85c \uc9c0\uc815\ub41c <jarfile> \ub0b4\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.\n\uc635\uc158\n -j <jarfile>      Translet\uc744 \ub85c\ub4dc\ud574\uc62c jarfile\uc744 \uc9c0\uc815\ud569\ub2c8\ub2e4.\n -x                \ucd94\uac00 \ub514\ubc84\uae45 \uba54\uc2dc\uc9c0 \ucd9c\ub825\uc744 \uc2dc\uc791\ud569\ub2c8\ub2e4.\n -n <iterations>   <iterations> \ucc28\ub840 \ubcc0\ud658\uc744 \uc2e4\ud589\ud558\uba70\n \ud504\ub85c\ud30c\uc77c\ub9c1 \uc815\ubcf4\ub97c \ud45c\uc2dc\ud569\ub2c8\ub2e4.\n -u <document_url> XML \uc785\ub825 \ubb38\uc11c\ub97c URL\ub85c \uc9c0\uc815\ud569\ub2c8\ub2e4.\n"},
+        "SYNOPSIS \n java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n [-x] [-n <iterations>] {-u <document_url> | <document>}\n <class> [<param1>=<value1> ...]\n\n Translet <class>\ub97c \uc0ac\uc6a9\ud558\uc5ec <document>\ub85c \uc9c0\uc815\ub41c XML \ubb38\uc11c\ub97c \n \ubcc0\ud658\ud569\ub2c8\ub2e4. Translet <class>\ub294 \uc0ac\uc6a9\uc790\uc758 CLASSPATH \ub610\ub294\n \uc120\ud0dd\uc801\uc73c\ub85c \uc9c0\uc815\ub41c <jarfile> \ub0b4\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.\n\uc635\uc158\n -j <jarfile>      Translet\uc744 \ub85c\ub4dc\ud574\uc62c jarfile\uc744 \uc9c0\uc815\ud569\ub2c8\ub2e4.\n -x                \ucd94\uac00 \ub514\ubc84\uae45 \uba54\uc2dc\uc9c0 \ucd9c\ub825\uc744 \uc2dc\uc791\ud569\ub2c8\ub2e4.\n -n <iterations>   <iterations> \ucc28\ub840 \ubcc0\ud658\uc744 \uc2e4\ud589\ud558\uba70\n \ud504\ub85c\ud30c\uc77c\ub9c1 \uc815\ubcf4\ub97c \ud45c\uc2dc\ud569\ub2c8\ub2e4.\n -u <document_url> XML \uc785\ub825 \ubb38\uc11c\ub97c URL\ub85c \uc9c0\uc815\ud569\ub2c8\ub2e4.\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_no.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_pl.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SK\u0141ADNIA\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <wyj\u015bcie>]\n      [-d <katalog>] [-j <plik_jar>] [-p <pakiet>]\n      [-n] [-x] [-u] [-v] [-h] { <arkusz_styl\u00f3w> | -i }\n\nOPCJE\n   -o <wyj\u015bcie>    przypisanie nazwy <wyj\u015bcie> do wygenerowanego\n                   transletu.  Domy\u015blnie nazwa transletu pochodzi \n                   od nazwy <arkusza_styl\u00f3w>. Opcja ta jest ignorowana \n                   w przypadku kompilowania wielu arkuszy styl\u00f3w.\n   -d <katalog>    Okre\u015blenie katalogu docelowego transletu.\n   -j <plik_jar>   Pakowanie klas transletu do pliku jar o nazwie\n                   okre\u015blonej jako <plik_jar>.\n   -p <pakiet>     Okre\u015blenie przedrostka nazwy pakietu dla wszystkich\n                   wygenerowanych klas translet\u00f3w.\n   -n              W\u0142\u0105czenie wstawiania szablon\u00f3w (zachowanie domy\u015blne\n                   zwykle lepsze).\n   -x              W\u0142\u0105czenie wypisywania dodatkowych komunikat\u00f3w debugowania.\n    -u              Interpretowanie argument\u00f3w <arkusz_styl\u00f3w> jako\n                   adres\u00f3w URL.\n   -i              Wymuszenie odczytywania przez kompilator arkusza styl\u00f3w\n                   ze standardowego wej\u015bcia (stdin).\n   -v              Wypisanie wersji kompilatora.\n   -h              Wypisanie informacji o sk\u0142adni.\n"},
+        "SK\u0141ADNIA\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <wyj\u015bcie>]\n      [-d <katalog>] [-j <plik_jar>] [-p <pakiet>]\n      [-n] [-x] [-u] [-v] [-h] { <arkusz_styl\u00f3w> | -i }\n\nOPCJE\n   -o <wyj\u015bcie>    przypisanie nazwy <wyj\u015bcie> do wygenerowanego\n                   transletu.  Domy\u015blnie nazwa transletu pochodzi \n                   od nazwy <arkusza_styl\u00f3w>. Opcja ta jest ignorowana \n                   w przypadku kompilowania wielu arkuszy styl\u00f3w.\n   -d <katalog>    Okre\u015blenie katalogu docelowego transletu.\n   -j <plik_jar>   Pakowanie klas transletu do pliku jar o nazwie\n                   okre\u015blonej jako <plik_jar>.\n   -p <pakiet>     Okre\u015blenie przedrostka nazwy pakietu dla wszystkich\n                   wygenerowanych klas translet\u00f3w.\n   -n              W\u0142\u0105czenie wstawiania szablon\u00f3w (zachowanie domy\u015blne\n                   zwykle lepsze).\n   -x              W\u0142\u0105czenie wypisywania dodatkowych komunikat\u00f3w debugowania.\n    -u              Interpretowanie argument\u00f3w <arkusz_styl\u00f3w> jako\n                   adres\u00f3w URL.\n   -i              Wymuszenie odczytywania przez kompilator arkusza styl\u00f3w\n                   ze standardowego wej\u015bcia (stdin).\n   -v              Wypisanie wersji kompilatora.\n   -h              Wypisanie informacji o sk\u0142adni.\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SK\u0141ADNIA \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <plik_jar>]\n      [-x] [-n <iteracje>] {-u <url_dokumentu> | <dokument>}\n <klasa> [<param1>=<warto\u015b\u01071> ...]\n\n   U\u017cycie transletu <klasa> do transformacji dokumentu XML \n   okre\u015blonego jako <dokument>. Translet <klasa> znajduje si\u0119 w\n   \u015bcie\u017cce CLASSPATH u\u017cytkownika lub w opcjonalnie podanym pliku <plik_jar>.\nOPCJE\n   -j <plik_jar>   Okre\u015blenie pliku jar, z kt\u00f3rego nale\u017cy za\u0142adowa\u0107 translet.\n   -x              W\u0142\u0105czenie wypisywania dodatkowych komunikat\u00f3w debugowania.\n   -n <iteracje>   Okre\u015blenie krotno\u015bci wykonywania transformacji oraz \n                   w\u0142\u0105czenie wy\u015bwietlania informacji z profilowania.\n   -u <url_dokumentu>\n                   Okre\u015blenie wej\u015bciowego dokumentu XML w postaci adresu URL.\n"},
+        "SK\u0141ADNIA \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <plik_jar>]\n      [-x] [-n <iteracje>] {-u <url_dokumentu> | <dokument>}\n <klasa> [<param1>=<warto\u015b\u01071> ...]\n\n   U\u017cycie transletu <klasa> do transformacji dokumentu XML \n   okre\u015blonego jako <dokument>. Translet <klasa> znajduje si\u0119 w\n   \u015bcie\u017cce CLASSPATH u\u017cytkownika lub w opcjonalnie podanym pliku <plik_jar>.\nOPCJE\n   -j <plik_jar>   Okre\u015blenie pliku jar, z kt\u00f3rego nale\u017cy za\u0142adowa\u0107 translet.\n   -x              W\u0142\u0105czenie wypisywania dodatkowych komunikat\u00f3w debugowania.\n   -n <iteracje>   Okre\u015blenie krotno\u015bci wykonywania transformacji oraz \n                   w\u0142\u0105czenie wy\u015bwietlania informacji z profilowania.\n   -u <url_dokumentu>\n                   Okre\u015blenie wej\u015bciowego dokumentu XML w postaci adresu URL.\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_pt_BR.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <sa\u00edda>]\n      [-d <directory>] [-j <arquivo_jar>] [-p <pacote>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <sa\u00edda>    atribui o nome <sa\u00edda> para o\n                  translet gerado.  Por padr\u00e3o, o nome convertido \u00e9\n                  derivado do nome de <folha_de_estilo>. Esta op\u00e7\u00e3o\nser\u00e1 ignorada se estiverem sendo compiladas v\u00e1rias p\u00e1ginas de estilo.\n   -d <diret\u00f3rio> especifica um diret\u00f3rio de destino para translet\n   -j <arquivo_jar>   empacota classes translet em um arquivo jar do\nnome especificado como <arquivo_jar>\n   -p <pacote>  especifica um prefixo de nome de pacote para todas as\nclasses translet geradas.\n   -n ativa a seq\u00fc\u00eancia de templates (melhor comportamento padr\u00e3o\nna m\u00e9dia).\n   -x ativa a sa\u00edda de mensagem de depura\u00e7\u00e3o adicional\n  -u interpreta argumentos <stylesheet> como URLs\n   -i for\u00e7a o compilador a ler a folha de estilo de stdin\n   -v imprime a vers\u00e3o do compilador\n   -h imprime esta instru\u00e7\u00e3o de uso\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <sa\u00edda>]\n      [-d <directory>] [-j <arquivo_jar>] [-p <pacote>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <sa\u00edda>    atribui o nome <sa\u00edda> para o\n                  translet gerado.  Por padr\u00e3o, o nome convertido \u00e9\n                  derivado do nome de <folha_de_estilo>. Esta op\u00e7\u00e3o\nser\u00e1 ignorada se estiverem sendo compiladas v\u00e1rias p\u00e1ginas de estilo.\n   -d <diret\u00f3rio> especifica um diret\u00f3rio de destino para translet\n   -j <arquivo_jar>   empacota classes translet em um arquivo jar do\nnome especificado como <arquivo_jar>\n   -p <pacote>  especifica um prefixo de nome de pacote para todas as\nclasses translet geradas.\n   -n ativa a seq\u00fc\u00eancia de templates (melhor comportamento padr\u00e3o\nna m\u00e9dia).\n   -x ativa a sa\u00edda de mensagem de depura\u00e7\u00e3o adicional\n  -u interpreta argumentos <stylesheet> como URLs\n   -i for\u00e7a o compilador a ler a folha de estilo de stdin\n   -v imprime a vers\u00e3o do compilador\n   -h imprime esta instru\u00e7\u00e3o de uso\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <arquivo_jar>]\n      [-x] [-n <itera\u00e7\u00f5es>] {-u <url_de_documento> | <documento>}\n      <classe> [<param1>=<valor1> ...]\n\n   utiliza o translet <classe> para transformar um documento XML \n   especificado como <documento>. A <classe> translet no\n  CLASSPATH do usu\u00e1rio ou no <arquivo_jar> opcionalmente especificado.\nOPTIONS\n   -j <arquivo_jar> especifica um arquivo jar a partir do qual ser\u00e1 carregado o translet\n   -x ativa a sa\u00edda de mensagem de depura\u00e7\u00e3o adicional\n  -n <itera\u00e7\u00f5es> executa os hor\u00e1rios de transforma\u00e7\u00e3o <itera\u00e7\u00f5es> e\n exibe informa\u00e7\u00f5es sobre tra\u00e7ado de perfil\n   -u <url_de_documento> especifica o documento XML de entrada como uma URL\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <arquivo_jar>]\n      [-x] [-n <itera\u00e7\u00f5es>] {-u <url_de_documento> | <documento>}\n      <classe> [<param1>=<valor1> ...]\n\n   utiliza o translet <classe> para transformar um documento XML \n   especificado como <documento>. A <classe> translet no\n  CLASSPATH do usu\u00e1rio ou no <arquivo_jar> opcionalmente especificado.\nOPTIONS\n   -j <arquivo_jar> especifica um arquivo jar a partir do qual ser\u00e1 carregado o translet\n   -x ativa a sa\u00edda de mensagem de depura\u00e7\u00e3o adicional\n  -n <itera\u00e7\u00f5es> executa os hor\u00e1rios de transforma\u00e7\u00e3o <itera\u00e7\u00f5es> e\n exibe informa\u00e7\u00f5es sobre tra\u00e7ado de perfil\n   -u <url_de_documento> especifica o documento XML de entrada como uma URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ru.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n java org.apache.xalan.xsltc.cmdline.Compile [-o <\u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0439-\u0444\u0430\u0439\u043b>]\n [-d <\u043a\u0430\u0442\u0430\u043b\u043e\u0433>] [-j <\u0444\u0430\u0439\u043b-jar>] [-p <\u043f\u0430\u043a\u0435\u0442>]\n [-n] [-x] [-u] [-v] [-h] { <\u0442\u0430\u0431\u043b\u0438\u0446\u0430-\u0441\u0442\u0438\u043b\u0435\u0439> | -i }\n\n\u041e\u041f\u0426\u0418\u0418\n -o <\u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0439-\u0444\u0430\u0439\u043b> \u043f\u0440\u0438\u0441\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u0438\u043c\u044f <\u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0439-\u0444\u0430\u0439\u043b> \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u043e\u043c\u0443 \u043e\u0431\u044a\u0435\u043a\u0442\u0443 \n translet. \u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0438\u043c\u044f \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\n            \u0431\u0435\u0440\u0435\u0442\u0441\u044f \u0438\u0437 \u0438\u043c\u0435\u043d\u0438 <\u0442\u0430\u0431\u043b\u0438\u0446\u044b-\u0441\u0442\u0438\u043b\u0435\u0439>. \u041f\u0440\u0438 \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u0445 \u0442\u0430\u0431\u043b\u0438\u0446 \u0441\u0442\u0438\u043b\u0435\u0439\n                  \u044d\u0442\u0430 \u043e\u043f\u0446\u0438\u044f \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0443\u0435\u0442\u0441\u044f.\n   -d <\u043a\u0430\u0442\u0430\u043b\u043e\u0433> \u0437\u0430\u0434\u0430\u0435\u0442 \u0446\u0435\u043b\u0435\u0432\u043e\u0439 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0434\u043b\u044f \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\n   -j <\u0444\u0430\u0439\u043b-jar> \u0443\u043f\u0430\u043a\u043e\u0432\u044b\u0432\u0430\u0435\u0442 \u043a\u043b\u0430\u0441\u0441\u044b \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \n                  \u0432 <\u0444\u0430\u0439\u043b-jar> \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c\n   -p <\u043f\u0430\u043a\u0435\u0442>   \u0437\u0430\u0434\u0430\u0435\u0442 \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u0438\u043c\u0435\u043d\u0438 \u043f\u0430\u043a\u0435\u0442\u0430 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0445\n                  \u043a\u043b\u0430\u0441\u0441\u043e\u0432 \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\n   -n             \u0440\u0430\u0437\u0440\u0435\u0448\u0430\u0435\u0442 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0441\u0442\u0440\u043e\u043a \u0448\u0430\u0431\u043b\u043e\u043d\u0430 (\u043e\u0431\u044b\u0447\u043d\u043e \u0441\u043f\u043e\u0441\u043e\u0431, \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0435\u043c\u044b\u0439 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e,\n \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043b\u0443\u0447\u0448\u0435).\n   -x \u0432\u044b\u0434\u0430\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0435 \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u044b\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \n -u \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u044b <\u0442\u0430\u0431\u043b\u0438\u0446\u044b-\u0441\u0442\u0438\u043b\u0435\u0439> \u043a\u0430\u043a URL\n -i \u0447\u0438\u0442\u0430\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443 \u0441\u0442\u0438\u043b\u0435\u0439 \u0438\u0437 stdin\n -v \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0442\u043e\u0440\u0430\n -h \u0432\u044b\u0434\u0430\u0442\u044c \u044d\u0442\u043e \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435\n"},
+        "SYNOPSIS\n java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <\u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0439-\u0444\u0430\u0439\u043b>]\n [-d <\u043a\u0430\u0442\u0430\u043b\u043e\u0433>] [-j <\u0444\u0430\u0439\u043b-jar>] [-p <\u043f\u0430\u043a\u0435\u0442>]\n [-n] [-x] [-u] [-v] [-h] { <\u0442\u0430\u0431\u043b\u0438\u0446\u0430-\u0441\u0442\u0438\u043b\u0435\u0439> | -i }\n\n\u041e\u041f\u0426\u0418\u0418\n -o <\u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0439-\u0444\u0430\u0439\u043b> \u043f\u0440\u0438\u0441\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u0438\u043c\u044f <\u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0439-\u0444\u0430\u0439\u043b> \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u043e\u043c\u0443 \u043e\u0431\u044a\u0435\u043a\u0442\u0443 \n translet. \u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0438\u043c\u044f \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\n            \u0431\u0435\u0440\u0435\u0442\u0441\u044f \u0438\u0437 \u0438\u043c\u0435\u043d\u0438 <\u0442\u0430\u0431\u043b\u0438\u0446\u044b-\u0441\u0442\u0438\u043b\u0435\u0439>. \u041f\u0440\u0438 \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u0445 \u0442\u0430\u0431\u043b\u0438\u0446 \u0441\u0442\u0438\u043b\u0435\u0439\n                  \u044d\u0442\u0430 \u043e\u043f\u0446\u0438\u044f \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0443\u0435\u0442\u0441\u044f.\n   -d <\u043a\u0430\u0442\u0430\u043b\u043e\u0433> \u0437\u0430\u0434\u0430\u0435\u0442 \u0446\u0435\u043b\u0435\u0432\u043e\u0439 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0434\u043b\u044f \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\n   -j <\u0444\u0430\u0439\u043b-jar> \u0443\u043f\u0430\u043a\u043e\u0432\u044b\u0432\u0430\u0435\u0442 \u043a\u043b\u0430\u0441\u0441\u044b \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \n                  \u0432 <\u0444\u0430\u0439\u043b-jar> \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c\n   -p <\u043f\u0430\u043a\u0435\u0442>   \u0437\u0430\u0434\u0430\u0435\u0442 \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u0438\u043c\u0435\u043d\u0438 \u043f\u0430\u043a\u0435\u0442\u0430 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0445\n                  \u043a\u043b\u0430\u0441\u0441\u043e\u0432 \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\n   -n             \u0440\u0430\u0437\u0440\u0435\u0448\u0430\u0435\u0442 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0441\u0442\u0440\u043e\u043a \u0448\u0430\u0431\u043b\u043e\u043d\u0430 (\u043e\u0431\u044b\u0447\u043d\u043e \u0441\u043f\u043e\u0441\u043e\u0431, \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0435\u043c\u044b\u0439 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e,\n \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043b\u0443\u0447\u0448\u0435).\n   -x \u0432\u044b\u0434\u0430\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0435 \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u044b\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \n -u \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u044b <\u0442\u0430\u0431\u043b\u0438\u0446\u044b-\u0441\u0442\u0438\u043b\u0435\u0439> \u043a\u0430\u043a URL\n -i \u0447\u0438\u0442\u0430\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443 \u0441\u0442\u0438\u043b\u0435\u0439 \u0438\u0437 stdin\n -v \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0442\u043e\u0440\u0430\n -h \u0432\u044b\u0434\u0430\u0442\u044c \u044d\u0442\u043e \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <\u0444\u0430\u0439\u043b-jar>]\n      [-x] [-n <\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438>] {-u <URL-\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430> | <\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442>}\n      <\u043a\u043b\u0430\u0441\u0441> [<\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u04401>=<\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u04351> ...]\n\n   \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0439 <\u043a\u043b\u0430\u0441\u0441> \u0434\u043b\u044f \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 XML,\n   \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u0432 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0435 <\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442>. <\u041a\u043b\u0430\u0441\u0441> \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u043b\u0438\u0431\u043e \n   \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e CLASSPATH \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f, \u043b\u0438\u0431\u043e \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e <\u0444\u0430\u0439\u043b\u0430-jar>.\n\u041e\u041f\u0426\u0418\u0418\n   -j <\u0444\u0430\u0439\u043b-jar> \u0444\u0430\u0439\u043b jar, \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u043d\u0443\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c translet\n   -x              \u0432\u044b\u0434\u0430\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0435 \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u044b\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f\n   -n <\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438> \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0435 \u0447\u0438\u0441\u043b\u043e \u0440\u0430\u0437 \u0438\n                   \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0440\u043e\u0444\u0430\u0439\u043b\u0430\u0445\n   -u <URL-\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430> URL \u0432\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 XML\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <\u0444\u0430\u0439\u043b-jar>]\n      [-x] [-n <\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438>] {-u <URL-\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430> | <\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442>}\n      <\u043a\u043b\u0430\u0441\u0441> [<\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u04401>=<\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u04351> ...]\n\n   \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0439 <\u043a\u043b\u0430\u0441\u0441> \u0434\u043b\u044f \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 XML,\n   \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u0432 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0435 <\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442>. <\u041a\u043b\u0430\u0441\u0441> \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u043b\u0438\u0431\u043e \n   \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e CLASSPATH \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f, \u043b\u0438\u0431\u043e \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e <\u0444\u0430\u0439\u043b\u0430-jar>.\n\u041e\u041f\u0426\u0418\u0418\n   -j <\u0444\u0430\u0439\u043b-jar> \u0444\u0430\u0439\u043b jar, \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u043d\u0443\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c translet\n   -x              \u0432\u044b\u0434\u0430\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0435 \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u044b\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f\n   -n <\u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438> \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0435 \u0447\u0438\u0441\u043b\u043e \u0440\u0430\u0437 \u0438\n                   \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0440\u043e\u0444\u0430\u0439\u043b\u0430\u0445\n   -u <URL-\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430> URL \u0432\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 XML\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_sk.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <output>    prirad\u00ed n\u00e1zov <output> k vygenerovan\u00e9mu\n                  transletu.  \u0160tandardne sa n\u00e1zov objektu translet \n                  odvodzuje od n\u00e1zvu <stylesheet>.  T\u00e1to vo\u013eba sa ignoruje pri kompilovan\u00ed viacer\u00fdch \u0161t\u00fdlov dokumentov\n\n.   -d <directory> uv\u00e1dza cie\u013eov\u00fd adres\u00e1r pre translet\n   -j <jarfile>   pakuje triedy transletov do s\u00faboru jar n\u00e1zvu \n uveden\u00e9ho ako <jarfile>\n   -p <package>   uv\u00e1dza predponu n\u00e1zvu bal\u00edku pre v\u0161etky generovan\u00e9 triedy transletu.\n\n   -n             povo\u013euje zoradenie vzorov v riadku (\u0161tandardn\u00e9 chovanie v priemere lep\u0161ie). \n\n   -x             zapne \u010fal\u0161\u00ed v\u00fdstup spr\u00e1v z procesu ladenia\n   -u             argumenty <stylesheet> prelo\u017e\u00ed do URL\n   -i             prin\u00fati kompil\u00e1tor, aby pre\u010d\u00edtal \u0161t\u00fdl dokumentu zo stdin\n   -v             vytla\u010d\u00ed verziu kompil\u00e1tora\n   -h             vytla\u010d\u00ed tento n\u00e1vod na pou\u017eitie\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <output>    prirad\u00ed n\u00e1zov <output> k vygenerovan\u00e9mu\n                  transletu.  \u0160tandardne sa n\u00e1zov objektu translet \n                  odvodzuje od n\u00e1zvu <stylesheet>.  T\u00e1to vo\u013eba sa ignoruje pri kompilovan\u00ed viacer\u00fdch \u0161t\u00fdlov dokumentov\n\n.   -d <directory> uv\u00e1dza cie\u013eov\u00fd adres\u00e1r pre translet\n   -j <jarfile>   pakuje triedy transletov do s\u00faboru jar n\u00e1zvu \n uveden\u00e9ho ako <jarfile>\n   -p <package>   uv\u00e1dza predponu n\u00e1zvu bal\u00edku pre v\u0161etky generovan\u00e9 triedy transletu.\n\n   -n             povo\u013euje zoradenie vzorov v riadku (\u0161tandardn\u00e9 chovanie v priemere lep\u0161ie). \n\n   -x             zapne \u010fal\u0161\u00ed v\u00fdstup spr\u00e1v z procesu ladenia\n   -u             argumenty <stylesheet> prelo\u017e\u00ed do URL\n   -i             prin\u00fati kompil\u00e1tor, aby pre\u010d\u00edtal \u0161t\u00fdl dokumentu zo stdin\n   -v             vytla\u010d\u00ed verziu kompil\u00e1tora\n   -h             vytla\u010d\u00ed tento n\u00e1vod na pou\u017eitie\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   pou\u017eije translet <class> na transform\u00e1ciu XML dokumentu \n,   ktor\u00fd je \u0161pecifikovan\u00fd ako <document>. <class> transletu je bu\u010f v \n u\u017e\u00edvate\u013eovej CLASSPATH alebo vo volite\u013ene uvedenom <jarfile>.\nOPTIONS\n   -j <jarfile>    \u0161pecifikuje jarfile, z ktor\u00e9ho sa m\u00e1 zavies\u0165 translet\n   -x              zapne \u010fal\u0161\u00ed v\u00fdstup spr\u00e1v z procesu ladenia\n   -n <iterations> spust\u00ed transform\u00e1ciu <iterations> \u010dasov a\n                   zobraz\u00ed profilovacie inform\u00e1cie\n   -u <document_url> \u0161pecifikuje vstupn\u00fd dokument XML ako URL\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   pou\u017eije translet <class> na transform\u00e1ciu XML dokumentu \n,   ktor\u00fd je \u0161pecifikovan\u00fd ako <document>. <class> transletu je bu\u010f v \n u\u017e\u00edvate\u013eovej CLASSPATH alebo vo volite\u013ene uvedenom <jarfile>.\nOPTIONS\n   -j <jarfile>    \u0161pecifikuje jarfile, z ktor\u00e9ho sa m\u00e1 zavies\u0165 translet\n   -x              zapne \u010fal\u0161\u00ed v\u00fdstup spr\u00e1v z procesu ladenia\n   -n <iterations> spust\u00ed transform\u00e1ciu <iterations> \u010dasov a\n                   zobraz\u00ed profilovacie inform\u00e1cie\n   -u <document_url> \u0161pecifikuje vstupn\u00fd dokument XML ako URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_sl.java,v 1.25 2004/12/15 17:35:40 jycli Exp $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <izhodna datoteka>]\n      [-d <directory>] [-j  <datoteka jar>] [-p <paket>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <izhodna datoteka>    dodeli ime <izhodna datoteka> generiranemu\n                  transletu.  Ime transleta se po privzetih nastavitvah\n                 izpelje iz imena <stylesheet>.  Pri prevajanju\n                  ve\u010d slogovnih datotek je ta mo\u017enost prezrta.\n   -d <directory> dolo\u010di ciljno mapo za translet\n   -j <datoteka jar>   zdru\u017ei razrede translet v datoteko jar\n       pod imenom, dolo\u010denim z <datoteka jar>\n   -p <paket>   dolo\u010di predpono imena paketa vsem generiranim\n               razredom translet.\n   -n             omogo\u010da vrivanje predlog (v povpre\u010dju bolj\u0161e privzeto\n                      obna\u0161anje).\n   -x             vklopi dodatna izhodna sporo\u010dila za iskanje napak\n   -u             prevede argumente <stylesheet> kot URL-je\n   -i             prisili prevajalnik k branju slogovne datoteke iz stdin\n   -v             natisne razli\u010dico prevajalnika\n   -h             natisne ta stavek za uporabo\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <izhodna datoteka>]\n      [-d <directory>] [-j  <datoteka jar>] [-p <paket>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <izhodna datoteka>    dodeli ime <izhodna datoteka> generiranemu\n                  transletu.  Ime transleta se po privzetih nastavitvah\n                 izpelje iz imena <stylesheet>.  Pri prevajanju\n                  ve\u010d slogovnih datotek je ta mo\u017enost prezrta.\n   -d <directory> dolo\u010di ciljno mapo za translet\n   -j <datoteka jar>   zdru\u017ei razrede translet v datoteko jar\n       pod imenom, dolo\u010denim z <datoteka jar>\n   -p <paket>   dolo\u010di predpono imena paketa vsem generiranim\n               razredom translet.\n   -n             omogo\u010da vrivanje predlog (v povpre\u010dju bolj\u0161e privzeto\n                      obna\u0161anje).\n   -x             vklopi dodatna izhodna sporo\u010dila za iskanje napak\n   -u             prevede argumente <stylesheet> kot URL-je\n   -i             prisili prevajalnik k branju slogovne datoteke iz stdin\n   -v             natisne razli\u010dico prevajalnika\n   -h             natisne ta stavek za uporabo\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <datoteka jar>]\n      [-x] [-n <ponovitve>] {-u <document_url> | <dokument>}\n      <razred> [<param1>=<value1> ...]\n\n   uporablja translet <razred> za pretvorbo dokumenta XML \n   navedenega kot <dokument>. Translet <razred> je ali v\n   uporabnikovem CLASSPATH ali v izbirno navedeni datoteki <datoteka jar>.\nOPTIONS\n   -j <datoteka jar>    dolo\u010di datoteko jar, iz katere bo nalo\u017een translet\n   -x               vklopi dodatna sporo\u010dila za iskanje napak\n   n  <ponovitve> <ponovitve>-krat po\u017eene preoblikovanje in\n                   prika\u017ee informacije profiliranja\n   -u <document_url> dolo\u010di vhodni dokument XML za URL\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <datoteka jar>]\n      [-x] [-n <ponovitve>] {-u <document_url> | <dokument>}\n      <razred> [<param1>=<value1> ...]\n\n   uporablja translet <razred> za pretvorbo dokumenta XML \n   navedenega kot <dokument>. Translet <razred> je ali v\n   uporabnikovem CLASSPATH ali v izbirno navedeni datoteki <datoteka jar>.\nOPTIONS\n   -j <datoteka jar>    dolo\u010di datoteko jar, iz katere bo nalo\u017een translet\n   -x               vklopi dodatna sporo\u010dila za iskanje napak\n   n  <ponovitve> <ponovitve>-krat po\u017eene preoblikovanje in\n                   prika\u017ee informacije profiliranja\n   -u <document_url> dolo\u010di vhodni dokument XML za URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_tr.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "\u00d6ZET\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <\u00e7\u0131k\u0131\u015f>]\n      [-d <dizin>] [-j <jardosyas\u0131>] [-p <paket>]\n      [-n] [-x] [-u] [-v] [-h] { <bi\u00e7emyapra\u011f\u0131> | -i }\n\nSE\u00c7ENEKLER\n   -o <\u00e7\u0131k\u0131\u015f>    derleme sonucu s\u0131n\u0131f dosyas\u0131na <\u00e7\u0131k\u0131\u015f>\n                  ad\u0131n\u0131 atar. Varsay\u0131lan olarak, derleme sonucu s\u0131n\u0131f dosyas\u0131\n                  ad\u0131 <bi\u00e7emyapra\u011f\u0131> ad\u0131ndan al\u0131n\u0131r.  Birden \u00e7ok bi\u00e7em yapra\u011f\u0131 derleniyorsa\n                  bu se\u00e7enek dikkate al\u0131nmaz.\n   -d <dizin> derleme sonucu s\u0131n\u0131f dosyas\u0131 i\u00e7in hedef dizini belirtir.\n   -j <jardosyas\u0131>   derleme sonucu s\u0131n\u0131f dosyalar\u0131n\u0131\n                  <jardosyas\u0131> dosyas\u0131nda paketler.\n   -p <paket>   derleme sonucu \u00fcretilen t\u00fcm s\u0131n\u0131f dosyalar\u0131 i\u00e7in\n                  bir paket ad\u0131 \u00f6neki belirtir.\n   -n             \u015fablona do\u011frudan yerle\u015ftirmeyi etkinle\u015ftirir (ortalama olarak\n                  daha y\u00fcksek ba\u015far\u0131m sa\u011flar).\n   -x             ek hata ay\u0131klama iletisi \u00e7\u0131k\u0131\u015f\u0131n\u0131 etkinle\u015ftirir\n   -u             <bi\u00e7emyapra\u011f\u0131> ba\u011f\u0131ms\u0131z de\u011fi\u015fkenlerini URL olarak yorumlars\n   -i             derleyiciyi stdin'den bi\u00e7em yapra\u011f\u0131n\u0131 okumaya zorlar\n   -v             derleyici s\u00fcr\u00fcm\u00fcn\u00fc yazd\u0131r\u0131r.\n   -h             bu kullan\u0131m bilgilerini yazd\u0131r\u0131r\n"},
+        "\u00d6ZET\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <\u00e7\u0131k\u0131\u015f>]\n      [-d <dizin>] [-j <jardosyas\u0131>] [-p <paket>]\n      [-n] [-x] [-u] [-v] [-h] { <bi\u00e7emyapra\u011f\u0131> | -i }\n\nSE\u00c7ENEKLER\n   -o <\u00e7\u0131k\u0131\u015f>    derleme sonucu s\u0131n\u0131f dosyas\u0131na <\u00e7\u0131k\u0131\u015f>\n                  ad\u0131n\u0131 atar. Varsay\u0131lan olarak, derleme sonucu s\u0131n\u0131f dosyas\u0131\n                  ad\u0131 <bi\u00e7emyapra\u011f\u0131> ad\u0131ndan al\u0131n\u0131r.  Birden \u00e7ok bi\u00e7em yapra\u011f\u0131 derleniyorsa\n                  bu se\u00e7enek dikkate al\u0131nmaz.\n   -d <dizin> derleme sonucu s\u0131n\u0131f dosyas\u0131 i\u00e7in hedef dizini belirtir.\n   -j <jardosyas\u0131>   derleme sonucu s\u0131n\u0131f dosyalar\u0131n\u0131\n                  <jardosyas\u0131> dosyas\u0131nda paketler.\n   -p <paket>   derleme sonucu \u00fcretilen t\u00fcm s\u0131n\u0131f dosyalar\u0131 i\u00e7in\n                  bir paket ad\u0131 \u00f6neki belirtir.\n   -n             \u015fablona do\u011frudan yerle\u015ftirmeyi etkinle\u015ftirir (ortalama olarak\n                  daha y\u00fcksek ba\u015far\u0131m sa\u011flar).\n   -x             ek hata ay\u0131klama iletisi \u00e7\u0131k\u0131\u015f\u0131n\u0131 etkinle\u015ftirir\n   -u             <bi\u00e7emyapra\u011f\u0131> ba\u011f\u0131ms\u0131z de\u011fi\u015fkenlerini URL olarak yorumlars\n   -i             derleyiciyi stdin'den bi\u00e7em yapra\u011f\u0131n\u0131 okumaya zorlar\n   -v             derleyici s\u00fcr\u00fcm\u00fcn\u00fc yazd\u0131r\u0131r.\n   -h             bu kullan\u0131m bilgilerini yazd\u0131r\u0131r\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "\u00d6ZET \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <jardosyas\u0131>]\n      [-x] [-n <yinelemesay\u0131s\u0131>] {-u <belge_url> | <belge>}\n      <s\u0131n\u0131f> [<de\u011fi\u015ftirge1>=<de\u011fer1> ...]\n\n   <belge> ile belirtilen XML belgesini d\u00f6n\u00fc\u015ft\u00fcrmek i\u00e7in <s\u0131n\u0131f>\n   s\u0131n\u0131f dosyas\u0131n\u0131 kullan\u0131r. <s\u0131n\u0131f> s\u0131n\u0131f dosyas\u0131\n   kullan\u0131c\u0131n\u0131n CLASSPATH de\u011fi\u015fkeninde ya da iste\u011fe ba\u011fl\u0131 olarak belirtilen <jardosyas\u0131> dosyas\u0131ndad\u0131r.\nSE\u00c7ENEKLER\n   -j <jardosyas\u0131>    derleme sonucu s\u0131n\u0131f dosyas\u0131n\u0131n hangi jar dosyas\u0131ndan y\u00fcklenece\u011fini belirtir\n   -x              ek hata ay\u0131klama iletisi \u00e7\u0131k\u0131\u015f\u0131n\u0131 etkinle\u015ftirir\n   -n <yinelemesay\u0131s\u0131> d\u00f6n\u00fc\u015ft\u00fcrmeyi <yineleme say\u0131s\u0131> ile belirtilen say\u0131 kadar \u00e7al\u0131\u015ft\u0131r\u0131r\n                   ve yakalama bilgilerini g\u00f6r\u00fcnt\u00fcler\n   -u <belge_url> XML giri\u015f belgesini URL olarak belirtir\n"},
+        "\u00d6ZET \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jardosyas\u0131>]\n      [-x] [-n <yinelemesay\u0131s\u0131>] {-u <belge_url> | <belge>}\n      <s\u0131n\u0131f> [<de\u011fi\u015ftirge1>=<de\u011fer1> ...]\n\n   <belge> ile belirtilen XML belgesini d\u00f6n\u00fc\u015ft\u00fcrmek i\u00e7in <s\u0131n\u0131f>\n   s\u0131n\u0131f dosyas\u0131n\u0131 kullan\u0131r. <s\u0131n\u0131f> s\u0131n\u0131f dosyas\u0131\n   kullan\u0131c\u0131n\u0131n CLASSPATH de\u011fi\u015fkeninde ya da iste\u011fe ba\u011fl\u0131 olarak belirtilen <jardosyas\u0131> dosyas\u0131ndad\u0131r.\nSE\u00c7ENEKLER\n   -j <jardosyas\u0131>    derleme sonucu s\u0131n\u0131f dosyas\u0131n\u0131n hangi jar dosyas\u0131ndan y\u00fcklenece\u011fini belirtir\n   -x              ek hata ay\u0131klama iletisi \u00e7\u0131k\u0131\u015f\u0131n\u0131 etkinle\u015ftirir\n   -n <yinelemesay\u0131s\u0131> d\u00f6n\u00fc\u015ft\u00fcrmeyi <yineleme say\u0131s\u0131> ile belirtilen say\u0131 kadar \u00e7al\u0131\u015ft\u0131r\u0131r\n                   ve yakalama bilgilerini g\u00f6r\u00fcnt\u00fcler\n   -u <belge_url> XML giri\u015f belgesini URL olarak belirtir\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_zh.java 338081 2004-12-15 17:35:58Z jycli $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "SYNOPSIS\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <output>    \u5c06\u540d\u79f0 <output> \u6307\u5b9a\u7ed9\u751f\u6210\u7684\n                  translet\u3002\u7f3a\u7701\u60c5\u51b5\u4e0b\uff0ctranslet \u540d\u79f0\n                  \u6d3e\u751f\u81ea <stylesheet> \u540d\u79f0\u3002\n                  \u5982\u679c\u7f16\u8bd1\u591a\u4e2a\u6837\u5f0f\u8868\uff0c\u5219\u5ffd\u7565\u6b64\u9009\u9879\u3002\n-d <directory> \u6307\u5b9a translet \u7684\u76ee\u6807\u76ee\u5f55\n   -j <jarfile>   \u5c06 translet \u7c7b\u6253\u5305\u6210\u547d\u540d\u4e3a <jarfile>\n                  \u7684 jar \u6587\u4ef6\n   -p <package>   \u4e3a\u6240\u6709\u751f\u6210\u7684 translet \u7c7b\n                  \u6307\u5b9a\u8f6f\u4ef6\u5305\u540d\u79f0\u7684\u524d\u7f00\u3002\n   -n             \u542f\u7528\u6a21\u677f\u5728\u7ebf\uff08\u5e73\u5747\u7f3a\u7701\n                  \u884c\u4e3a\u66f4\u4f73\uff09\u3002\n   -x             \u6253\u5f00\u989d\u5916\u8c03\u8bd5\u6d88\u606f\u8f93\u51fa\n   -u             \u5c06 <stylesheet> \u81ea\u53d8\u91cf\u89e3\u91ca\u4e3a URL\n   -i             \u5f3a\u5236\u7f16\u8bd1\u5668\u4ece stdin \u8bfb\u5165\u6837\u5f0f\u8868\n   -v             \u6253\u5370\u7f16\u8bd1\u5668\u7684\u7248\u672c\n   -h             \u6253\u5370\u6b64\u7528\u6cd5\u8bed\u53e5\n"},
+        "SYNOPSIS\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <output>    \u5c06\u540d\u79f0 <output> \u6307\u5b9a\u7ed9\u751f\u6210\u7684\n                  translet\u3002\u7f3a\u7701\u60c5\u51b5\u4e0b\uff0ctranslet \u540d\u79f0\n                  \u6d3e\u751f\u81ea <stylesheet> \u540d\u79f0\u3002\n                  \u5982\u679c\u7f16\u8bd1\u591a\u4e2a\u6837\u5f0f\u8868\uff0c\u5219\u5ffd\u7565\u6b64\u9009\u9879\u3002\n-d <directory> \u6307\u5b9a translet \u7684\u76ee\u6807\u76ee\u5f55\n   -j <jarfile>   \u5c06 translet \u7c7b\u6253\u5305\u6210\u547d\u540d\u4e3a <jarfile>\n                  \u7684 jar \u6587\u4ef6\n   -p <package>   \u4e3a\u6240\u6709\u751f\u6210\u7684 translet \u7c7b\n                  \u6307\u5b9a\u8f6f\u4ef6\u5305\u540d\u79f0\u7684\u524d\u7f00\u3002\n   -n             \u542f\u7528\u6a21\u677f\u5728\u7ebf\uff08\u5e73\u5747\u7f3a\u7701\n                  \u884c\u4e3a\u66f4\u4f73\uff09\u3002\n   -x             \u6253\u5f00\u989d\u5916\u8c03\u8bd5\u6d88\u606f\u8f93\u51fa\n   -u             \u5c06 <stylesheet> \u81ea\u53d8\u91cf\u89e3\u91ca\u4e3a URL\n   -i             \u5f3a\u5236\u7f16\u8bd1\u5668\u4ece stdin \u8bfb\u5165\u6837\u5f0f\u8868\n   -v             \u6253\u5370\u7f16\u8bd1\u5668\u7684\u7248\u672c\n   -h             \u6253\u5370\u6b64\u7528\u6cd5\u8bed\u53e5\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "SYNOPSIS \n   java org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   \u4f7f\u7528 translet <class> \u6765\u8f6c\u6362\u6307\u5b9a\u4e3a <document>\n   \u7684 XML \u6587\u6863\u3002translet <class> \u8981\u4e48\u5728\n   \u7528\u6237\u7684 CLASSPATH \u4e2d\uff0c\u8981\u4e48\u5728\u4efb\u610f\u6307\u5b9a\u7684 <jarfile> \u4e2d\u3002\nOPTIONS\n   -j <jarfile>    \u6307\u5b9a\u88c5\u5165 translet \u7684 jarfile\n   -x              \u6253\u5f00\u989d\u5916\u8c03\u8bd5\u6d88\u606f\u8f93\u51fa\n   -n <iterations> \u8fd0\u884c\u8f6c\u6362\u8fc7\u7a0b <iterations> \u6570\u6b21\u5e76\n                   \u663e\u793a\u6982\u8981\u5206\u6790\u4fe1\u606f\n   -u <document_url> \u5c06 XML \u8f93\u5165\u6307\u5b9a\u4e3a URL\n"},
+        "SYNOPSIS \n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <jarfile>]\n      [-x] [-n <iterations>] {-u <document_url> | <document>}\n      <class> [<param1>=<value1> ...]\n\n   \u4f7f\u7528 translet <class> \u6765\u8f6c\u6362\u6307\u5b9a\u4e3a <document>\n   \u7684 XML \u6587\u6863\u3002translet <class> \u8981\u4e48\u5728\n   \u7528\u6237\u7684 CLASSPATH \u4e2d\uff0c\u8981\u4e48\u5728\u4efb\u610f\u6307\u5b9a\u7684 <jarfile> \u4e2d\u3002\nOPTIONS\n   -j <jarfile>    \u6307\u5b9a\u88c5\u5165 translet \u7684 jarfile\n   -x              \u6253\u5f00\u989d\u5916\u8c03\u8bd5\u6d88\u606f\u8f93\u51fa\n   -n <iterations> \u8fd0\u884c\u8f6c\u6362\u8fc7\u7a0b <iterations> \u6570\u6b21\u5e76\n                   \u663e\u793a\u6982\u8981\u5206\u6790\u4fe1\u606f\n   -u <document_url> \u5c06 XML \u8f93\u5165\u6307\u5b9a\u4e3a URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_zh_TW.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ListResourceBundle;
 
@@ -674,7 +674,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "\u7528\u6cd5\u6982\u8981\n   java org.apache.xalan.xsltc.cmdline.Compile [-o <\u8f38\u51fa>]\n      [-d <directory>] [-j <Jar \u6a94>] [-p <\u5957\u4ef6>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <\u8f38\u51fa>    \u6307\u5b9a\u540d\u7a31 <\u8f38\u51fa> \u7d66\u7522\u751f\u7684\n                  translet\u3002\u4f9d\u9810\u8a2d\uff0ctranslet \u540d\u7a31\u662f\n                  \u884d\u751f\u81ea <stylesheet> \u540d\u7a31\u3002\u82e5\u7de8\u8b6f\n                  \u591a\u4efd\u6a23\u5f0f\u8868\u6642\uff0c\u6b64\u9078\u9805\u6703\u88ab\u5ffd\u7565\u3002\n   -d <directory> \u6307\u5b9a translet \u7684\u76ee\u6a19\u76ee\u9304\n   -j <jarfile>   \u5c07 translet \u985e\u5225\u5c01\u88dd\u5728 jar \u6a94\u6848\u4e2d\uff0c\u8a72\u6a94\u6848\n                  \u540d\u7a31\u7531 <jarfile> \u6307\u5b9a\n   -p <package>   \u6307\u5b9a\u6240\u6709\u7522\u751f\u7684\n                  translet \u985e\u5225\u4e4b\u5957\u4ef6\u540d\u7a31\u5b57\u9996\u3002\n   -n             \u555f\u7528\u7bc4\u672c\u5217\u5165\uff08\u5e73\u5747\u800c\u8a00\uff0c\u9810\u8a2d\u884c\u70ba\u8f03\u4f73\uff09\u3002\n                  \n   -x             \u958b\u555f\u984d\u5916\u7684\u9664\u932f\u8a0a\u606f\u8f38\u51fa\n   -u             \u5c07\u5f15\u6578 <stylesheet> \u89e3\u8b6f\u70ba URL\n   -i             \u5f37\u5236\u7de8\u8b6f\u5668\u5f9e stdin \u8b80\u53d6\u6a23\u5f0f\u8868\n   -v          \u5217\u5370\u7de8\u8b6f\u5668\u7684\u7248\u672c\n   -h             \u5217\u5370\u6b64\u7528\u6cd5\u9673\u8ff0\u5f0f\n"},
+        "\u7528\u6cd5\u6982\u8981\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Compile [-o <\u8f38\u51fa>]\n      [-d <directory>] [-j <Jar \u6a94>] [-p <\u5957\u4ef6>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n   -o <\u8f38\u51fa>    \u6307\u5b9a\u540d\u7a31 <\u8f38\u51fa> \u7d66\u7522\u751f\u7684\n                  translet\u3002\u4f9d\u9810\u8a2d\uff0ctranslet \u540d\u7a31\u662f\n                  \u884d\u751f\u81ea <stylesheet> \u540d\u7a31\u3002\u82e5\u7de8\u8b6f\n                  \u591a\u4efd\u6a23\u5f0f\u8868\u6642\uff0c\u6b64\u9078\u9805\u6703\u88ab\u5ffd\u7565\u3002\n   -d <directory> \u6307\u5b9a translet \u7684\u76ee\u6a19\u76ee\u9304\n   -j <jarfile>   \u5c07 translet \u985e\u5225\u5c01\u88dd\u5728 jar \u6a94\u6848\u4e2d\uff0c\u8a72\u6a94\u6848\n                  \u540d\u7a31\u7531 <jarfile> \u6307\u5b9a\n   -p <package>   \u6307\u5b9a\u6240\u6709\u7522\u751f\u7684\n                  translet \u985e\u5225\u4e4b\u5957\u4ef6\u540d\u7a31\u5b57\u9996\u3002\n   -n             \u555f\u7528\u7bc4\u672c\u5217\u5165\uff08\u5e73\u5747\u800c\u8a00\uff0c\u9810\u8a2d\u884c\u70ba\u8f03\u4f73\uff09\u3002\n                  \n   -x             \u958b\u555f\u984d\u5916\u7684\u9664\u932f\u8a0a\u606f\u8f38\u51fa\n   -u             \u5c07\u5f15\u6578 <stylesheet> \u89e3\u8b6f\u70ba URL\n   -i             \u5f37\u5236\u7de8\u8b6f\u5668\u5f9e stdin \u8b80\u53d6\u6a23\u5f0f\u8868\n   -v          \u5217\u5370\u7de8\u8b6f\u5668\u7684\u7248\u672c\n   -h             \u5217\u5370\u6b64\u7528\u6cd5\u9673\u8ff0\u5f0f\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
@@ -686,7 +686,7 @@
          * documentation.
          */
         {ErrorMsg.TRANSFORM_USAGE_STR,
-        "\u7528\u6cd5\u6982\u8981\n   java org.apache.xalan.xsltc.cmdline.Transform [-j <Jar \u6a94>]\n   [-x] [-n <\u758a\u4ee3>] {-u <document_url> | <\u6587\u4ef6>}\n      <\u985e\u5225> [<param1>=<value1> ...]\n\n   \u4f7f\u7528 translet <\u985e\u5225> \u8f49\u63db\u6307\u5b9a\u70ba <\u6587\u4ef6> \u7684 \n   XML \u6587\u4ef6\u3002translet <class> \u4f4d\u65bc\n   \u4f7f\u7528\u8005\u7684 CLASSPATH \u4e2d\uff0c\u6216\u9078\u64c7\u6027\u6307\u5b9a\u7684 <jarfile> \u4e2d\u3002\nOPTIONS\n   -j <Jar \u6a94>    \u6307\u5b9a\u7528\u4f86\u8f09\u5165 translet \u7684 Jar \u6a94\n   -x              \u958b\u555f\u984d\u5916\u7684\u9664\u932f\u8a0a\u606f\u8f38\u51fa\n-n <\u758a\u4ee3> \u57f7\u884c\u8f49\u63db <\u758a\u4ee3> \u6b21\u4ee5\u53ca\n                   \u986f\u793a\u8a2d\u5b9a\u6a94\u8cc7\u8a0a\n   -u <document_url> \u6307\u5b9a XML \u8f38\u5165\u6587\u4ef6\u70ba URL\n"},
+        "\u7528\u6cd5\u6982\u8981\n   java com.sun.xalan.org.apache.xalan.xsltc.cmdline.Transform [-j <Jar \u6a94>]\n   [-x] [-n <\u758a\u4ee3>] {-u <document_url> | <\u6587\u4ef6>}\n      <\u985e\u5225> [<param1>=<value1> ...]\n\n   \u4f7f\u7528 translet <\u985e\u5225> \u8f49\u63db\u6307\u5b9a\u70ba <\u6587\u4ef6> \u7684 \n   XML \u6587\u4ef6\u3002translet <class> \u4f4d\u65bc\n   \u4f7f\u7528\u8005\u7684 CLASSPATH \u4e2d\uff0c\u6216\u9078\u64c7\u6027\u6307\u5b9a\u7684 <jarfile> \u4e2d\u3002\nOPTIONS\n   -j <Jar \u6a94>    \u6307\u5b9a\u7528\u4f86\u8f09\u5165 translet \u7684 Jar \u6a94\n   -x              \u958b\u555f\u984d\u5916\u7684\u9664\u932f\u8a0a\u606f\u8f38\u51fa\n-n <\u758a\u4ee3> \u57f7\u884c\u8f49\u63db <\u758a\u4ee3> \u6b21\u4ee5\u53ca\n                   \u986f\u793a\u8a2d\u5b9a\u6a94\u8cc7\u8a0a\n   -u <document_url> \u6307\u5b9a XML \u8f38\u5165\u6587\u4ef6\u70ba URL\n"},
 
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java	Thu Aug 11 18:14:30 2011
@@ -19,14 +19,14 @@
  * $Id: ErrorMsg.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.apache.xalan.xsltc.compiler.Stylesheet;
-import org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
 
 /**
  * @author Jacek Ambroziak
@@ -173,7 +173,7 @@
 
     static {
         _bundle = ResourceBundle.getBundle(
-                          "org.apache.xalan.xsltc.compiler.util.ErrorMessages",
+                          "com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMessages",
                           Locale.getDefault());
     }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,11 +19,11 @@
  * $Id: FilterGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.Instruction;
-import org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
 
 /**
  * This class implements auxliary classes needed to compile 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/IntType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/IntType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/IntType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/IntType.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: IntType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.BranchInstruction;
@@ -44,8 +44,8 @@
 import org.apache.bcel.generic.InstructionConstants;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
 
 /**
  * @author Jacek Ambroziak
@@ -71,7 +71,7 @@
     }
 
     /**
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#distanceTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#distanceTo
      */
     public int distanceTo(Type type) {
 	if (type == this) {
@@ -87,7 +87,7 @@
     /**
      * Translates an integer into an object of internal type <code>type</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    final Type type) {
@@ -113,7 +113,7 @@
     /**
      * Expects an integer on the stack and pushes a real.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    RealType type) {
@@ -124,7 +124,7 @@
      * Expects an integer on the stack and pushes its string value by calling
      * <code>Integer.toString(int i)</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
@@ -139,7 +139,7 @@
      * Expects an integer on the stack and pushes a 0 if its value is 0 and
      * a 1 otherwise.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    BooleanType type) {
@@ -156,7 +156,7 @@
      * boolean. It does not push a 0 or a 1 but instead returns branchhandle 
      * list to be appended to the false list.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen, 
 					     MethodGenerator methodGen, 
@@ -170,7 +170,7 @@
      * Boxed integers are represented by an instance of
      * <code>java.lang.Integer</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/InternalError.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/InternalError.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/InternalError.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/InternalError.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 /**
  * Marks a class of errors in which XSLTC has reached some incorrect internal
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: MatchGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ConstantPoolGen;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: MethodGenerator.java 469275 2006-10-30 21:04:47Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -69,15 +69,15 @@
 import org.apache.bcel.generic.TargetLostException;
 import org.apache.bcel.generic.Type;
 
-import org.apache.xalan.xsltc.compiler.Pattern;
-import org.apache.xalan.xsltc.compiler.XSLTC;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Pattern;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.XSLTC;
 
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  */
 public class MethodGenerator extends MethodGen
-    implements org.apache.xalan.xsltc.compiler.Constants {
+    implements com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants {
     protected static final int INVALID_INDEX   = -1;
     
     private static final String START_ELEMENT_SIG   
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MethodType.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: MethodType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: MultiHashtable.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.Hashtable;
 import java.util.Vector;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: NamedMethodGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,11 +19,11 @@
  * $Id: NodeCounterGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.Instruction;
-import org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
 
 /**
  * This class implements auxiliary classes needed to compile 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSetType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSetType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSetType.java	Thu Aug 11 18:14:30 2011
@@ -19,7 +19,7 @@
  * $Id: NodeSetType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -32,8 +32,8 @@
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
 
 /**
  * @author Jacek Ambroziak
@@ -64,7 +64,7 @@
      * since node-sets are always converted to
      * reals in arithmetic expressions.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -147,7 +147,7 @@
      * and "false" otherwise. Notice that the 
      * function getFirstNode() is called in translateToDesynthesized().
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    BooleanType type) {
@@ -163,7 +163,7 @@
      * Translates a node-set into a string. The string value of a node-set is
      * value of its first element.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
@@ -182,7 +182,7 @@
      * Expects a node-set on the stack and pushes a real.
      * First the node-set is converted to string, and from string to real.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    RealType type) {
@@ -193,7 +193,7 @@
     /**
      * Expects a node-set on the stack and pushes a node.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    NodeType type) {
@@ -203,7 +203,7 @@
     /**
      * Subsume node-set into ObjectType.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ObjectType type) {
@@ -215,7 +215,7 @@
      * push a 0 or a 1 but instead returns branchhandle list to be appended 
      * to the false list.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen, 
 					     MethodGenerator methodGen, 
@@ -229,7 +229,7 @@
      * Expects a node-set on the stack and pushes a boxed node-set.
      * Node sets are already boxed so the translation is just a NOP.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,9 +19,9 @@
  * $Id: NodeSortRecordFactGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
-import org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
 
 /**
  * Generator for subclasses of NodeSortRecordFactory.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java	Thu Aug 11 18:14:30 2011
@@ -19,11 +19,11 @@
  * $Id: NodeSortRecordGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.Instruction;
-import org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
 
 /**
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NodeType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: NodeType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.CHECKCAST;
@@ -35,9 +35,9 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
-import org.apache.xalan.xsltc.compiler.NodeTest;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.NodeTest;
 
 /**
  * @author Jacek Ambroziak
@@ -83,7 +83,7 @@
      * The translation to int is undefined since nodes are always converted
      * to reals in arithmetic expressions.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -115,7 +115,7 @@
     /**
      * Expects a node on the stack and pushes its string value. 
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
@@ -159,7 +159,7 @@
      * then "true" is pushed iff "attr" is an attribute of the current node.
      * If the expression is ".", the result is always "true".	
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    BooleanType type) {
@@ -175,7 +175,7 @@
      * Expects a node on the stack and pushes a real.
      * First the node is converted to string, and from string to real.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    RealType type) {
@@ -187,7 +187,7 @@
      * Expects a node on the stack and pushes a singleton node-set. Singleton
      * iterators are already started after construction.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    NodeSetType type) {
@@ -206,7 +206,7 @@
     /**
      * Subsume Node into ObjectType.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ObjectType type) {
@@ -218,7 +218,7 @@
      * 0 or a 1 but instead returns branchhandle list to be appended to the 
      * false list.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen, 
 					     MethodGenerator methodGen, 
@@ -229,9 +229,9 @@
 
     /**
      * Expects a node on the stack and pushes a boxed node. Boxed nodes
-     * are represented by an instance of <code>org.apache.xalan.xsltc.dom.Node</code>.
+     * are represented by an instance of <code>com.sun.xalan.org.apache.xalan.xsltc.dom.Node</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NumberType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NumberType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NumberType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/NumberType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: NumberType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ObjectType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -31,7 +31,7 @@
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
 
 /**
  * @author Todd Miller
@@ -107,7 +107,7 @@
      * This translation is needed when calling external functions
      * that return void.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -125,7 +125,7 @@
      * Expects an integer on the stack and pushes its string value by calling
      * <code>Integer.toString(int i)</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.Instruction;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.Instruction;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RealType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RealType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RealType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RealType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: RealType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.CHECKCAST;
@@ -37,8 +37,8 @@
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
 
 /**
  * @author Jacek Ambroziak
@@ -64,7 +64,7 @@
     }
 
     /**
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#distanceTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#distanceTo
      */
     public int distanceTo(Type type) {
 	if (type == this) {
@@ -82,7 +82,7 @@
      * Translates a real into an object of internal type <code>type</code>. The
      * translation to int is undefined since reals are never converted to ints.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -109,7 +109,7 @@
      * Expects a real on the stack and pushes its string value by calling
      * <code>Double.toString(double d)</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
@@ -124,7 +124,7 @@
      * Expects a real on the stack and pushes a 0 if that number is 0.0 and
      * a 1 otherwise.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    BooleanType type) {
@@ -139,7 +139,7 @@
     /**
      * Expects a real on the stack and pushes a truncated integer value
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    IntType type) {
@@ -154,7 +154,7 @@
      * 0 or a 1 but instead returns branchhandle list to be appended to the 
      * false list. A NaN must be converted to "false".
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen, 
 					     MethodGenerator methodGen, 
@@ -189,7 +189,7 @@
      * Expects a double on the stack and pushes a boxed double. Boxed 
      * double are represented by an instance of <code>java.lang.Double</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ReferenceType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ReferenceType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ReferenceType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: ReferenceType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.ALOAD;
@@ -32,10 +32,10 @@
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionList;
 
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * @author Jacek Ambroziak
@@ -66,7 +66,7 @@
      * The translation to int is undefined since references
      * are always converted to reals in arithmetic expressions.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    Type type) {
@@ -102,7 +102,7 @@
     /**
      * Translates reference into object of internal type <code>type</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    StringType type) {
@@ -131,7 +131,7 @@
     /**
      * Translates a reference into an object of internal type <code>type</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    RealType type) {
@@ -150,7 +150,7 @@
     /**
      * Translates a reference to an object of internal type <code>type</code>.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    BooleanType type) {
@@ -167,7 +167,7 @@
     /**
      * Casts a reference into a NodeIterator.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    NodeSetType type) {
@@ -188,7 +188,7 @@
     /**
      * Casts a reference into a Node.
      *
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    NodeType type) {
@@ -199,7 +199,7 @@
     /**
      * Casts a reference into a ResultTree.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    ResultTreeType type) {
@@ -213,7 +213,7 @@
     /**
      * Subsume reference into ObjectType.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    ObjectType type) {
@@ -282,7 +282,7 @@
 	    il.append(methodGen.loadDOM());
 	    il.append(new INVOKESTATIC(index));
 	}
-	else if (clazz.getName().equals("org.apache.xalan.xsltc.DOM")) {
+	else if (clazz.getName().equals("com.sun.xalan.org.apache.xalan.xsltc.DOM")) {
 	    translateTo(classGen, methodGen, Type.ResultTree);
 	}
 	else if (clazz == Long.TYPE) {
@@ -342,7 +342,7 @@
      * boolean. It does not push a 0 or a 1 but instead returns branchhandle
      * list to be appended to the false list.
      *
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen,
 					     MethodGenerator methodGen,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: ResultTreeType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -35,8 +35,8 @@
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
 
 /**
  * @author Jacek Ambroziak
@@ -86,7 +86,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of the type to translate the result tree to
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -122,7 +122,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of BooleanType (any)
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    BooleanType type) {
@@ -140,7 +140,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of StringType (any)
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    StringType type) {
@@ -201,7 +201,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of RealType (any)
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    RealType type) {
@@ -216,7 +216,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of ReferenceType (any)
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
@@ -311,7 +311,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of NodeSetType (any)
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    NodeSetType type) {
@@ -360,7 +360,7 @@
     /**
      * Subsume result tree into ObjectType.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ObjectType type) {
@@ -375,7 +375,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param type An instance of BooleanType (any)
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen, 
 					     MethodGenerator methodGen, 
@@ -395,7 +395,7 @@
      * @param classGen A BCEL class generator
      * @param methodGen A BCEL method generator
      * @param clazz An reference to the Class to translate to
-     * @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Class clazz) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: RtMethodGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport12.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SecuritySupport12.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: SlotAllocator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.Type;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringStack.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringStack.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: StringStack.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.Stack;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/StringType.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: StringType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
@@ -33,8 +33,8 @@
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
 
 /**
  * @author Jacek Ambroziak
@@ -68,7 +68,7 @@
      * The translation to int is undefined since strings are always converted
      * to reals in arithmetic expressions.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Type type) {
@@ -91,7 +91,7 @@
     /**
      * Translates a string into a synthesized boolean.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    BooleanType type) {
@@ -107,7 +107,7 @@
      * Translates a string into a real by calling stringToReal() from the
      * basis library.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    RealType type) {
@@ -123,7 +123,7 @@
      * 0 or a 1 but instead returns branchhandle list to be appended to the 
      * false list.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateToDesynthesized
      */
     public FlowList translateToDesynthesized(ClassGenerator classGen, 
 					     MethodGenerator methodGen, 
@@ -140,7 +140,7 @@
      * Expects a string on the stack and pushes a boxed string.
      * Strings are already boxed so the translation is just a NOP.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    ReferenceType type) {
@@ -150,7 +150,7 @@
     /**
      * Translates a internal string into an external (Java) string. 
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateFrom
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateFrom
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen, 
 			    Class clazz) 
@@ -169,7 +169,7 @@
     /**
      * Translates an external (primitive) Java type into a string. 
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateFrom
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateFrom
      */
     public void translateFrom(ClassGenerator classGen, 
 	MethodGenerator methodGen, Class clazz) 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TestGenerator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TestGenerator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TestGenerator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TestGenerator.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: TestGenerator.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Type.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Type.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Type.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Type.java	Thu Aug 11 18:14:31 2011
@@ -19,13 +19,13 @@
  * $Id: Type.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.BranchInstruction;
 import org.apache.bcel.generic.Instruction;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.FlowList;
-import org.apache.xalan.xsltc.compiler.NodeTest;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.FlowList;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.NodeTest;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java	Thu Aug 11 18:14:31 2011
@@ -19,9 +19,9 @@
  * $Id: TypeCheckError.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
-import org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Util.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Util.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Util.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/Util.java	Thu Aug 11 18:14:31 2011
@@ -19,13 +19,13 @@
  * $Id: Util.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import java.util.StringTokenizer;
 
 import org.apache.bcel.generic.Type;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/VoidType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/VoidType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/VoidType.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/compiler/util/VoidType.java	Thu Aug 11 18:14:31 2011
@@ -19,12 +19,12 @@
  * $Id: VoidType.java 468649 2006-10-28 07:00:55Z minchau $
  */
 
-package org.apache.xalan.xsltc.compiler.util;
+package com.sun.xalan.org.apache.xalan.xsltc.compiler.util;
 
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;
-import org.apache.xalan.xsltc.compiler.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Constants;
 
 /**
  * @author Jacek Ambroziak
@@ -58,7 +58,7 @@
      * This translation is needed when calling external functions
      * that return void.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    Type type) {
@@ -75,7 +75,7 @@
     /**
      * Translates a void into a string by pushing the empty string ''.
      *
-     * @see	org.apache.xalan.xsltc.compiler.util.Type#translateTo
+     * @see	com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Type#translateTo
      */
     public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
 			    StringType type) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AbsoluteIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AbsoluteIterator.java	Mon Nov 14 16:40:58 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AbsoluteIterator.java	Thu Aug 11 18:14:31 2011
@@ -19,12 +19,12 @@
  * $Id: AbsoluteIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
 
 /**
  * Absolute iterators ignore the node that is passed to setStartNode(). 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java	Thu Aug 11 18:14:31 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: AdaptiveResultTreeImpl.java 468651 2006-10-28 07:04:25Z minchau $
  */
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.AttributeList;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AttributeList;
 
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
 
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 import javax.xml.transform.SourceLocator;
 import org.w3c.dom.Node;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AnyNodeCounter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AnyNodeCounter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/AnyNodeCounter.java	Thu Aug 11 18:14:31 2011
@@ -19,11 +19,11 @@
  * $Id: AnyNodeCounter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/BitArray.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/BitArray.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/BitArray.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/BitArray.java	Thu Aug 11 18:14:31 2011
@@ -19,14 +19,14 @@
  * $Id: BitArray.java 478667 2006-11-23 20:50:36Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java	Thu Aug 11 18:14:31 2011
@@ -19,11 +19,11 @@
  * $Id: CachedNodeListIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xalan.xsltc.util.IntegerArray;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.util.IntegerArray;
 
 /**
  * CachedNodeListIterator is used for select expressions in a 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java	Thu Aug 11 18:14:31 2011
@@ -19,10 +19,10 @@
  * $Id: ClonedNodeListIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * A ClonedNodeListIterator is returned by the cloneIterator() method
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java	Thu Aug 11 18:14:31 2011
@@ -19,12 +19,12 @@
  * $Id: CollatorFactoryBase.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.text.Collator;
 import java.util.Locale;
 
-import org.apache.xalan.xsltc.CollatorFactory;
+import com.sun.xalan.org.apache.xalan.xsltc.CollatorFactory;
 
 /**
  * @author W. Eliot Kimber (eliot@isogen.com)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java	Thu Aug 11 18:14:31 2011
@@ -19,10 +19,10 @@
  * $Id: CurrentNodeListFilter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java	Thu Aug 11 18:14:31 2011
@@ -19,13 +19,13 @@
  * $Id: CurrentNodeListIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.util.IntegerArray;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.util.IntegerArray;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * Iterators of this kind use a CurrentNodeListFilter to filter a subset of 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMAdapter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMAdapter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMAdapter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMAdapter.java	Thu Aug 11 18:14:31 2011
@@ -19,16 +19,16 @@
  * $Id: DOMAdapter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMBuilder.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMBuilder.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMBuilder.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMBuilder.java	Thu Aug 11 18:14:31 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOMBuilder.java 468651 2006-10-28 07:04:25Z minchau $
  */
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMWSFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMWSFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMWSFilter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DOMWSFilter.java	Thu Aug 11 18:14:31 2011
@@ -18,20 +18,20 @@
 /*
  * $Id: DOMWSFilter.java 468651 2006-10-28 07:04:25Z minchau $
  */
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
 
 /**
  * A wrapper class that adapts the
- * {@link org.apache.xml.dtm.DTMWSFilter DTMWSFilter} interface to the XSLTC
- * DOM {@link org.apache.xalan.xsltc.StripFilter StripFilter} interface.
+ * {@link com.sun.xalan.org.apache.xml.dtm.DTMWSFilter DTMWSFilter} interface to the XSLTC
+ * DOM {@link com.sun.xalan.org.apache.xalan.xsltc.StripFilter StripFilter} interface.
  */
 public class DOMWSFilter implements DTMWSFilter {
 
@@ -52,8 +52,8 @@
      * @param translet A translet that also implements the StripFilter
      * interface.
      *
-     * @see org.apache.xml.dtm.DTMWSFilter
-     * @see org.apache.xalan.xsltc.StripFilter
+     * @see com.sun.xalan.org.apache.xml.dtm.DTMWSFilter
+     * @see com.sun.xalan.org.apache.xalan.xsltc.StripFilter
      */
     public DOMWSFilter(AbstractTranslet translet) {
         m_translet = translet;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DocumentCache.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DocumentCache.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DocumentCache.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DocumentCache.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: DocumentCache.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -35,14 +35,14 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.sax.SAXSource;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMCache;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.Constants;
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMCache;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Constants;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DupFilterIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DupFilterIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DupFilterIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/DupFilterIterator.java	Thu Aug 11 18:14:31 2011
@@ -19,13 +19,13 @@
  * $Id: DupFilterIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.util.IntegerArray;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.util.IntegerArray;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
 
 /**
  * Removes duplicates and sorts a source iterator. The nodes from the 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/EmptyFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/EmptyFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/EmptyFilter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/EmptyFilter.java	Thu Aug 11 18:14:31 2011
@@ -19,7 +19,7 @@
  * $Id: EmptyFilter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ExtendedSAX.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ExtendedSAX.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ExtendedSAX.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ExtendedSAX.java	Thu Aug 11 18:14:31 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtendedSAX.java 468651 2006-10-28 07:04:25Z minchau $
  */
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DTDHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/Filter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/Filter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/Filter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/Filter.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: Filter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilterIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilterIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilterIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilterIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,13 +19,13 @@
  * $Id: FilterIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * Similar to a CurrentNodeListIterator except that the filter has a 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilteredStepIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilteredStepIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/FilteredStepIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,9 +19,9 @@
  * $Id: FilteredStepIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
 
 /**
  * Extends a StepIterator by adding the ability to filter nodes. It 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,11 +19,11 @@
  * $Id: ForwardPositionIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * This iterator is a wrapper that always returns the position of
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/KeyIndex.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/KeyIndex.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/KeyIndex.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/KeyIndex.java	Thu Aug 11 18:14:32 2011
@@ -19,20 +19,20 @@
  * $Id: KeyIndex.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.util.StringTokenizer;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xalan.xsltc.util.IntegerArray;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.util.IntegerArray;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * Stores mappings of key values or IDs to DTM nodes.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/LoadDocument.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/LoadDocument.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/LoadDocument.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/LoadDocument.java	Thu Aug 11 18:14:32 2011
@@ -19,24 +19,24 @@
  * $Id: LoadDocument.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.io.FileNotFoundException;
 
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMCache;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.trax.TemplatesImpl;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
-import org.apache.xml.dtm.ref.EmptyIterator;
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMCache;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.trax.TemplatesImpl;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xml.dtm.ref.EmptyIterator;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
@@ -51,7 +51,7 @@
 
     /**
      * Interprets the arguments passed from the document() function (see
-     * org/apache/xalan/xsltc/compiler/DocumentCall.java) and returns an
+     * com.sun.xalan.org.apache.xalan/xsltc/compiler/DocumentCall.java) and returns an
      * iterator containing the requested nodes. Builds a union-iterator if
      * several documents are requested.
      * 2 arguments arg1 and arg2.  document(Obj, node-set) call 
@@ -92,7 +92,7 @@
     }
     /**
      * Interprets the arguments passed from the document() function (see
-     * org/apache/xalan/xsltc/compiler/DocumentCall.java) and returns an
+     * com.sun.xalan.org.apache.xalan/xsltc/compiler/DocumentCall.java) and returns an
      * iterator containing the requested nodes. Builds a union-iterator if
      * several documents are requested.
      * 1 arguments arg.  document(Obj) call
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MatchingIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MatchingIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MatchingIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MatchingIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,11 +19,11 @@
  * $Id: MatchingIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * This is a special kind of iterator that takes a source iterator and a 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiDOM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiDOM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiDOM.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiDOM.java	Thu Aug 11 18:14:32 2011
@@ -19,21 +19,21 @@
  * $Id: MultiDOM.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
-import org.apache.xml.utils.SuballocatedIntVector;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xml.utils.SuballocatedIntVector;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,19 +19,19 @@
  * $Id: UnionIterator.java 337874 2004-02-16 23:06:53Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * <p><code>MultiValuedNodeHeapIterator</code> takes a set of multi-valued
  * heap nodes and produces a merged NodeSet in document order with duplicates
  * removed.</p>
  * <p>Each multi-valued heap node (which might be a
- * {@link org.apache.xml.dtm.DTMAxisIterator}, but that's  not necessary)
+ * {@link com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator}, but that's  not necessary)
  * generates DTM node handles in document order.  The class
  * maintains the multi-valued heap nodes in a heap, not surprisingly, sorted by
  * the next DTM node handle available form the heap node.</p>
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java	Thu Aug 11 18:14:32 2011
@@ -19,13 +19,13 @@
  * $Id: MultipleNodeCounter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.util.IntegerArray;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.util.IntegerArray;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeCounter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeCounter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeCounter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeCounter.java	Thu Aug 11 18:14:32 2011
@@ -19,15 +19,15 @@
  * $Id: NodeCounter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.util.Vector;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeIteratorBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeIteratorBase.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeIteratorBase.java	Thu Aug 11 18:14:32 2011
@@ -19,10 +19,10 @@
  * $Id: NodeIteratorBase.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.NodeIterator;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecord.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecord.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecord.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecord.java	Thu Aug 11 18:14:32 2011
@@ -19,17 +19,17 @@
  * $Id: NodeSortRecord.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.text.CollationKey;
 import java.text.Collator;
 import java.util.Locale;
 
-import org.apache.xalan.xsltc.CollatorFactory;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.utils.StringComparable;
+import com.sun.xalan.org.apache.xalan.xsltc.CollatorFactory;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xml.utils.StringComparable;
 
 /**
  * Base class for sort records containing application specific sort keys 
@@ -107,7 +107,7 @@
   
 	// -- W. Eliot Kimber (eliot@isogen.com)
         String colFactClassname = 
-	    System.getProperty("org.apache.xalan.xsltc.COLLATOR_FACTORY");
+	    System.getProperty("com.sun.xalan.org.apache.xalan.xsltc.COLLATOR_FACTORY");
 
         if (colFactClassname != null) {
             try {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java	Thu Aug 11 18:14:32 2011
@@ -19,13 +19,13 @@
  * $Id: NodeSortRecordFactory.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.utils.LocaleUtility;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xml.utils.LocaleUtility;
 import java.util.Locale;
 import java.text.Collator;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NthIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NthIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NthIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/NthIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,11 +19,11 @@
  * $Id: NthIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ObjectFactory.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/ObjectFactory.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SAXImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SAXImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SAXImpl.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SAXImpl.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: SAXImpl.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.net.URL;
 import java.net.MalformedURLException;
@@ -28,26 +28,26 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.ref.DTMAxisIterNodeList;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
-import org.apache.xml.dtm.ref.EmptyIterator;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.serializer.ToXMLSAXHandler;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIterNodeList;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xml.dtm.ref.EmptyIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy;
+import com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm.SAX2DTM2;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.ToXMLSAXHandler;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Document;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport12.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SecuritySupport12.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java	Thu Aug 11 18:14:32 2011
@@ -18,24 +18,24 @@
 /*
  * $Id: SimpleResultTreeImpl.java 468651 2006-10-28 07:04:25Z minchau $
  */
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xml.dtm.ref.DTMManagerDefault;
-import org.apache.xml.serializer.EmptySerializer;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringDefault;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault;
+import com.sun.xalan.org.apache.xml.serializer.EmptySerializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringDefault;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingleNodeCounter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingleNodeCounter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingleNodeCounter.java	Thu Aug 11 18:14:32 2011
@@ -19,12 +19,12 @@
  * $Id: SingleNodeCounter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingletonIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingletonIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingletonIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SingletonIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,10 +19,10 @@
  * $Id: SingletonIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortSettings.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortSettings.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortSettings.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortSettings.java	Thu Aug 11 18:14:32 2011
@@ -19,12 +19,12 @@
  * $Id: SortSettings.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import java.text.Collator;
 import java.util.Locale;
 
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
 
 /**
  * Class for carrying settings that are to be used for a particular set
@@ -66,7 +66,7 @@
 
     /**
      * Create an instance of <code>SortSettings</code>.
-     * @param translet {@link org.apache.xalan.xsltc.runtime.AbstractTranslet}
+     * @param translet {@link com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet}
      *                 object for the transformation
      * @param sortOrders an array specifying the sort order for each sort level
      * @param types an array specifying the type of comparison for each sort
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortingIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortingIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortingIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/SortingIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,11 +19,11 @@
  * $Id: SortingIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StepIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StepIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StepIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StepIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,11 +19,11 @@
  * $Id: StepIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * A step iterator is used to evaluate expressions like "BOOK/TITLE". 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java	Thu Aug 11 18:14:32 2011
@@ -19,9 +19,9 @@
  * $Id: StripWhitespaceFilter.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/UnionIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/UnionIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/UnionIterator.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/UnionIterator.java	Thu Aug 11 18:14:32 2011
@@ -19,12 +19,12 @@
  * $Id: UnionIterator.java 468651 2006-10-28 07:04:25Z minchau $
  */
 
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.BasisLibrary;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMAxisIteratorBase;
 
 /**
  * UnionIterator takes a set of NodeIterators and produces
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java	Thu Aug 11 18:14:32 2011
@@ -18,22 +18,22 @@
 /*
  * $Id: XSLTCDTMManager.java 468651 2006-10-28 07:04:25Z minchau $
  */
-package org.apache.xalan.xsltc.dom;
+package com.sun.xalan.org.apache.xalan.xsltc.dom;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
-import org.apache.xml.dtm.DTMException;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.ref.DTMManagerDefault;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xalan.xsltc.trax.DOM2SAX;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xml.dtm.DTMException;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xalan.xsltc.trax.DOM2SAX;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXNotRecognizedException;
@@ -48,10 +48,10 @@
 	
     /** The default class name to use as the manager. */
     private static final String DEFAULT_CLASS_NAME =
-        "org.apache.xalan.xsltc.dom.XSLTCDTMManager";
+        "com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager";
 
     private static final String DEFAULT_PROP_NAME =
-        "org.apache.xalan.xsltc.dom.XSLTCDTMManager";
+        "com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager";
 
     /** Set this to true if you want a dump of the DTM after creation */
     private static final boolean DUMPTREE = false;
@@ -83,15 +83,15 @@
      * The following lookup procedure is used to find the service provider.
      * <ol>
      * <li>The value of the
-     * <code>org.apache.xalan.xsltc.dom.XSLTCDTMManager</code> property, is
+     * <code>com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager</code> property, is
      * checked.</li>
      * <li>The <code>xalan.propeties</code> file is checked for a property
      * of the same name.</li>
      * <li>The
-     * <code>META-INF/services/org.apache.xalan.xsltc.dom.XSLTCDTMManager</code>
+     * <code>META-INF/services/com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager</code>
      * file is checked.
      * </ol>
-     * The default is <code>org.apache.xalan.xsltc.dom.XSLTCDTMManager</code>.
+     * The default is <code>com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager</code>.
      */
     public static Class getDTMManagerClass() {
         Class mgrClass = ObjectFactory.lookUpFactoryClass(DEFAULT_PROP_NAME,
@@ -307,7 +307,7 @@
                 throw re;
             }
             catch (Exception e) {
-                throw new org.apache.xml.utils.WrappedRuntimeException(e);
+                throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
             }
       
             return dtm;
@@ -392,7 +392,7 @@
                     throw re;
                 }
                 catch (Exception e) {
-                    throw new org.apache.xml.utils.WrappedRuntimeException(e);
+                    throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
                 } finally {
                     if (!hasUserReader) {
                         releaseXMLReader(reader);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory	Fri Nov 23 03:13:54 2007
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory	Fri Aug 12 13:16:51 2011
@@ -1 +1 @@
-org.apache.xalan.xsltc.trax.TransformerFactoryImpl

+com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactoryImpl
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AbstractTranslet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AbstractTranslet.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AbstractTranslet.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: AbstractTranslet.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -34,18 +34,18 @@
 import org.w3c.dom.DOMImplementation;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMCache;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.dom.DOMAdapter;
-import org.apache.xalan.xsltc.dom.KeyIndex;
-import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMCache;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.DOMAdapter;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.KeyIndex;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AttributeList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AttributeList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AttributeList.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/AttributeList.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: AttributeList.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Attributes.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Attributes.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Attributes.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Attributes.java	Thu Aug 11 18:14:32 2011
@@ -19,9 +19,9 @@
  * $Id: Attributes.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
-import org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
 import org.xml.sax.AttributeList;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/BasisLibrary.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/BasisLibrary.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/BasisLibrary.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/BasisLibrary.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: BasisLibrary.java 505310 2007-02-09 14:39:50Z zongaro $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.text.DecimalFormat;
 import java.text.FieldPosition;
@@ -30,25 +30,25 @@
 
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.dom.AbsoluteIterator;
-import org.apache.xml.dtm.Axis;
-import org.apache.xalan.xsltc.dom.DOMAdapter;
-import org.apache.xalan.xsltc.dom.MultiDOM;
-import org.apache.xalan.xsltc.dom.SingletonIterator;
-import org.apache.xalan.xsltc.dom.StepIterator;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.AbsoluteIterator;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.DOMAdapter;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.MultiDOM;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.SingletonIterator;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.StepIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
-import org.apache.xml.serializer.NamespaceMappings;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.utils.XML11Char;
+import com.sun.xalan.org.apache.xml.serializer.NamespaceMappings;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.utils.XML11Char;
 
 /**
  * Standard XSLT functions. All standard functions expect the current node 
@@ -1277,7 +1277,7 @@
 		dom.copy(((Node) obj).node, handler);
 	    }
 	    else if (obj instanceof DOM) {
-		//((DOM)obj).copy(((org.apache.xml.dtm.ref.DTMDefaultBase)((DOMAdapter)obj).getDOMImpl()).getDocument(), handler);
+		//((DOM)obj).copy(((com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBase)((DOMAdapter)obj).getDOMImpl()).getDocument(), handler);
 		DOM newDom = (DOM)obj;
 		newDom.copy(newDom.getDocument(), handler);
 	    }
@@ -1393,7 +1393,7 @@
     /**
      * <p>Look up the namespace for a lexical QName using the namespace
      * declarations available at a particular location in the stylesheet.</p>
-     * <p>See {@link org.apache.xalan.xsltc.compiler.Stylesheet#compileStaticInitializer(org.apache.xalan.xsltc.compiler.util.ClassGenerator)}
+     * <p>See {@link com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet#compileStaticInitializer(com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator)}
      * for more information about the <code>ancestorNodeIDs</code>,
      * <code>prefixURIsIndex</code> and <code>prefixURIPairs</code arrays.</p>
      *
@@ -1467,7 +1467,7 @@
      * <p>Look up the namespace for a lexical QName using the namespace
      * declarations available at a particular location in the stylesheet and
      * return the expanded QName</p>
-     * <p>See {@link org.apache.xalan.xsltc.compiler.Stylesheet#compileStaticInitializer(org.apache.xalan.xsltc.compiler.util.ClassGenerator)}
+     * <p>See {@link com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet#compileStaticInitializer(com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ClassGenerator)}
      * for more information about the <code>ancestorNodeIDs</code>,
      * <code>prefixURIsIndex</code> and <code>prefixURIPairs</code arrays.</p>
      *
@@ -1592,7 +1592,7 @@
     public final static String ERROR_MESSAGES_KEY = "error-messages";
 
     static {
-	String resource = "org.apache.xalan.xsltc.runtime.ErrorMessages";
+	String resource = "com.sun.xalan.org.apache.xalan.xsltc.runtime.ErrorMessages";
 	m_bundle = ResourceBundle.getBundle(resource);
     }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Constants.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Constants.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Constants.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Constants.java	Thu Aug 11 18:14:32 2011
@@ -19,9 +19,9 @@
  * $Id: Constants.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * This class defines constants used by both the compiler and the 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ca.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_cs.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_de.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_es.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_fr.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_hu.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_it.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java	Mon Nov 14 16:40:59 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java	Thu Aug 11 18:14:32 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ja.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ko.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_no.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_pl.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_pt_BR.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_ru.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_sk.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_sl.java,v 1.11 2004/12/15 17:35:45 jycli Exp $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_tr.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_zh.java 338081 2004-12-15 17:35:58Z jycli $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ErrorMessages_zh_TW.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Hashtable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Hashtable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Hashtable.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Hashtable.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: Hashtable.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.util.Enumeration;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/MessageHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/MessageHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/MessageHandler.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/MessageHandler.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: MessageHandler.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 /**
  * @author Morten Jorgensen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Node.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Node.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Node.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Node.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: Node.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 /**
  * This class is used as "wrapper" for dom nodes. Wrappers are needed when
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ObjectFactory.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/ObjectFactory.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Operators.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Operators.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Operators.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Operators.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: Operators.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Parameter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Parameter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Parameter.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/Parameter.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: Parameter.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport12.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/SecuritySupport12.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/StringValueHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/StringValueHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/StringValueHandler.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/StringValueHandler.java	Thu Aug 11 18:14:33 2011
@@ -19,11 +19,11 @@
  * $Id: StringValueHandler.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime;
 
 import org.xml.sax.SAXException;
 
-import org.apache.xml.serializer.EmptySerializer;
+import com.sun.xalan.org.apache.xml.serializer.EmptySerializer;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: OutputBuffer.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime.output;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime.output;
 
 /**
  * @author Santiago Pericas-Geertsen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: StringOutputBuffer.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime.output;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime.output;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: TransletOutputHandlerFactory.java 475979 2006-11-16 23:32:48Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime.output;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime.output;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -27,13 +27,13 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.xalan.xsltc.trax.SAX2DOM;
-import org.apache.xml.serializer.ToHTMLStream;
-import org.apache.xml.serializer.ToTextStream;
-import org.apache.xml.serializer.ToUnknownStream;
-import org.apache.xml.serializer.ToXMLSAXHandler;
-import org.apache.xml.serializer.ToXMLStream;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.trax.SAX2DOM;
+import com.sun.xalan.org.apache.xml.serializer.ToHTMLStream;
+import com.sun.xalan.org.apache.xml.serializer.ToTextStream;
+import com.sun.xalan.org.apache.xml.serializer.ToUnknownStream;
+import com.sun.xalan.org.apache.xml.serializer.ToXMLSAXHandler;
+import com.sun.xalan.org.apache.xml.serializer.ToXMLStream;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 import org.w3c.dom.Node;
 
 import org.xml.sax.ContentHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: WriterOutputBuffer.java 468652 2006-10-28 07:05:17Z minchau $
  */
 
-package org.apache.xalan.xsltc.runtime.output;
+package com.sun.xalan.org.apache.xalan.xsltc.runtime.output;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2SAX.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2SAX.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2SAX.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2SAX.java	Thu Aug 11 18:14:33 2011
@@ -20,7 +20,7 @@
  */
 
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.xalan.xsltc.dom.SAXImpl;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.SAXImpl;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.xml.sax.ContentHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2TO.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2TO.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2TO.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/DOM2TO.java	Thu Aug 11 18:14:33 2011
@@ -19,13 +19,13 @@
  * $Id: DOM2TO.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.IOException;
 
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DTDHandler;
 import org.xml.sax.EntityResolver;
@@ -36,7 +36,7 @@
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.XMLReader;
-import org.apache.xml.serializer.NamespaceMappings;
+import com.sun.xalan.org.apache.xml.serializer.NamespaceMappings;
 
 /**
  * @author Santiago Pericas-Geertsen
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/ObjectFactory.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/ObjectFactory.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/OutputSettings.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/OutputSettings.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/OutputSettings.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/OutputSettings.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: OutputSettings.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.util.Properties;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SAX2DOM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SAX2DOM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SAX2DOM.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SAX2DOM.java	Thu Aug 11 18:14:33 2011
@@ -20,7 +20,7 @@
  */
 
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.util.Stack;
 import java.util.Vector;
@@ -29,7 +29,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.xalan.xsltc.runtime.Constants;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Constants;
 
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport12.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SecuritySupport12.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java	Thu Aug 11 18:14:33 2011
@@ -20,7 +20,7 @@
  */
 
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.ErrorListener;
@@ -40,7 +40,7 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 import org.xml.sax.XMLFilter;
 
 /**
@@ -70,9 +70,9 @@
 
     /**
      * implementation of the SmartTransformerFactory. This factory
-     * uses org.apache.xalan.xsltc.trax.TransformerFactory
+     * uses com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactory
      * to return Templates objects; and uses 
-     * org.apache.xalan.processor.TransformerFactory
+     * com.sun.xalan.org.apache.xalan.processor.TransformerFactory
      * to return Transformer objects.  
      */
     public SmartTransformerFactoryImpl() { }
@@ -84,13 +84,13 @@
 
     private void createXalanTransformerFactory() {
  	final String xalanMessage =
-	    "org.apache.xalan.xsltc.trax.SmartTransformerFactoryImpl "+
+	    "com.sun.xalan.org.apache.xalan.xsltc.trax.SmartTransformerFactoryImpl "+
 	    "could not create an "+
-	    "org.apache.xalan.processor.TransformerFactoryImpl.";
+	    "com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl.";
 	// try to create instance of Xalan factory...	
 	try {
             Class xalanFactClass = ObjectFactory.findProviderClass(
-                "org.apache.xalan.processor.TransformerFactoryImpl",
+                "com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl",
                 ObjectFactory.findClassLoader(), true);
 	    _xalanFactory = (SAXTransformerFactory)
 		xalanFactClass.newInstance();
@@ -256,7 +256,7 @@
 
     /**
      * Create a Transformer object that copies the input document to the
-     * result. Uses the org.apache.xalan.processor.TransformerFactory.
+     * result. Uses the com.sun.xalan.org.apache.xalan.processor.TransformerFactory.
      * @return A Transformer object.
      */
     public Transformer newTransformer()
@@ -277,7 +277,7 @@
 
     /**
      * Create a Transformer object that from the input stylesheet 
-     * Uses the org.apache.xalan.processor.TransformerFactory.
+     * Uses the com.sun.xalan.org.apache.xalan.processor.TransformerFactory.
      * @param source the stylesheet.
      * @return A Transformer object.
      */
@@ -299,7 +299,7 @@
 
     /**
      * Create a Templates object that from the input stylesheet 
-     * Uses the org.apache.xalan.xsltc.trax.TransformerFactory.
+     * Uses the com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactory.
      * @param source the stylesheet.
      * @return A Templates object.
      */
@@ -322,7 +322,7 @@
     /**
      * Get a TemplatesHandler object that can process SAX ContentHandler
      * events into a Templates object. Uses the
-     * org.apache.xalan.xsltc.trax.TransformerFactory.
+     * com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactory.
      */
     public TemplatesHandler newTemplatesHandler() 
 	throws TransformerConfigurationException 
@@ -342,7 +342,7 @@
     /**
      * Get a TransformerHandler object that can process SAX ContentHandler
      * events based on a copy transformer. 
-     * Uses org.apache.xalan.processor.TransformerFactory. 
+     * Uses com.sun.xalan.org.apache.xalan.processor.TransformerFactory. 
      */
     public TransformerHandler newTransformerHandler() 
 	throws TransformerConfigurationException 
@@ -362,7 +362,7 @@
     /**
      * Get a TransformerHandler object that can process SAX ContentHandler
      * events based on a transformer specified by the stylesheet Source. 
-     * Uses org.apache.xalan.processor.TransformerFactory. 
+     * Uses com.sun.xalan.org.apache.xalan.processor.TransformerFactory. 
      */
     public TransformerHandler newTransformerHandler(Source src) 
 	throws TransformerConfigurationException 
@@ -383,7 +383,7 @@
     /**
      * Get a TransformerHandler object that can process SAX ContentHandler
      * events based on a transformer specified by the stylesheet Source. 
-     * Uses org.apache.xalan.xsltc.trax.TransformerFactory. 
+     * Uses com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactory. 
      */
     public TransformerHandler newTransformerHandler(Templates templates) 
 	throws TransformerConfigurationException  
@@ -404,7 +404,7 @@
     /**
      * Create an XMLFilter that uses the given source as the
      * transformation instructions. Uses
-     * org.apache.xalan.xsltc.trax.TransformerFactory.
+     * com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactory.
      */
     public XMLFilter newXMLFilter(Source src) 
 	throws TransformerConfigurationException {
@@ -425,12 +425,12 @@
     /*
      * Create an XMLFilter that uses the given source as the
      * transformation instructions. Uses
-     * org.apache.xalan.xsltc.trax.TransformerFactory.
+     * com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactory.
      */
     public XMLFilter newXMLFilter(Templates templates) 
 	throws TransformerConfigurationException {
 	try {
-            return new org.apache.xalan.xsltc.trax.TrAXFilter(templates);
+            return new com.sun.xalan.org.apache.xalan.xsltc.trax.TrAXFilter(templates);
         }
         catch(TransformerConfigurationException e1) {
             if (_xsltcFactory == null) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: TemplatesHandlerImpl.java 577935 2007-09-20 21:35:20Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
@@ -28,13 +28,13 @@
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.sax.TemplatesHandler;
 
-import org.apache.xalan.xsltc.compiler.CompilerException;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.SourceLoader;
-import org.apache.xalan.xsltc.compiler.Stylesheet;
-import org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
-import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.CompilerException;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Parser;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.SourceLoader;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.Stylesheet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.XSLTC;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesImpl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TemplatesImpl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: TemplatesImpl.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -35,11 +35,11 @@
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.URIResolver;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
 
 /**
  * @author Morten Jorgensen
@@ -55,7 +55,7 @@
      * is the main one.
      */
     private static String ABSTRACT_TRANSLET 
-	= "org.apache.xalan.xsltc.runtime.AbstractTranslet";
+	= "com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet";
 
     /**
      * Name of the main class or default name if unknown.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TrAXFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TrAXFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TrAXFilter.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TrAXFilter.java	Thu Aug 11 18:14:33 2011
@@ -20,7 +20,7 @@
  */
 
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.IOException;
 
@@ -35,7 +35,7 @@
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.sax.SAXResult;
 
-import org.apache.xml.utils.XMLReaderManager;
+import com.sun.xalan.org.apache.xml.utils.XMLReaderManager;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: TransformerFactoryImpl.java 577935 2007-09-20 21:35:20Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -58,12 +58,12 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.xsltc.compiler.SourceLoader;
-import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xml.utils.StopParseException;
-import org.apache.xml.utils.StylesheetPIHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.SourceLoader;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.XSLTC;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import com.sun.xalan.org.apache.xml.utils.StopParseException;
+import com.sun.xalan.org.apache.xml.utils.StylesheetPIHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLFilter;
 import org.xml.sax.XMLReader;
@@ -959,7 +959,7 @@
 	throws TransformerConfigurationException 
     {
 	try {
-      	    return new org.apache.xalan.xsltc.trax.TrAXFilter(templates);
+      	    return new com.sun.xalan.org.apache.xalan.xsltc.trax.TrAXFilter(templates);
     	}
 	catch (TransformerConfigurationException e1) {
       	    if (_errorListener != null) {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: TransformerHandlerImpl.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import javax.xml.transform.Result;
 import javax.xml.transform.Transformer;
@@ -27,14 +27,14 @@
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.dom.DOMResult;
 
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.dom.DOMWSFilter;
-import org.apache.xalan.xsltc.dom.SAXImpl;
-import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.DOMWSFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.SAXImpl;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerImpl.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/TransformerImpl.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: TransformerImpl.java 486494 2006-12-13 04:58:06Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -53,26 +53,26 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.DOMCache;
-import org.apache.xalan.xsltc.DOMEnhancedForDTM;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xml.serializer.OutputPropertiesFactory;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.dom.DOMWSFilter;
-import org.apache.xalan.xsltc.dom.SAXImpl;
-import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMCache;
+import com.sun.xalan.org.apache.xalan.xsltc.DOMEnhancedForDTM;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.Translet;
+import com.sun.xalan.org.apache.xalan.xsltc.TransletException;
+import com.sun.xalan.org.apache.xml.serializer.OutputPropertiesFactory;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.DOMWSFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.SAXImpl;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.Hashtable;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
 
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.utils.XMLReaderManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.utils.XMLReaderManager;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -198,7 +198,7 @@
      * capture messages reported via xsl:message.
      */
     static class MessageHandler 
-           extends org.apache.xalan.xsltc.runtime.MessageHandler 
+           extends com.sun.xalan.org.apache.xalan.xsltc.runtime.MessageHandler 
     {
 	private ErrorListener _errorListener;
      
@@ -488,7 +488,7 @@
     }
  
     /**
-     * Returns the {@link org.apache.xalan.xsltc.trax.TransformerFactoryImpl}
+     * Returns the {@link com.sun.xalan.org.apache.xalan.xsltc.trax.TransformerFactoryImpl}
      * object that create this <code>Transformer</code>.
      */
     protected TransformerFactoryImpl getTransformerFactory() {
@@ -496,7 +496,7 @@
     }
     
     /**
-     * Returns the {@link org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory}
+     * Returns the {@link com.sun.xalan.org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory}
      * object that create the <code>TransletOutputHandler</code>.
      */
     protected TransletOutputHandlerFactory getTransletOutputHandlerFactory() {
@@ -1159,7 +1159,7 @@
              *  Incase the _uriResolver.resolve(href,base) is null
              *  try to still  retrieve the document before returning null 
              *  and throwing the FileNotFoundException in
-             *  org.apache.xalan.xsltc.dom.LoadDocument
+             *  com.sun.xalan.org.apache.xalan.xsltc.dom.LoadDocument
              *
              */
             Source resolvedSource = _uriResolver.resolve(href, baseURI);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/Util.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/Util.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/Util.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/Util.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: Util.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -35,8 +35,8 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.XSLTC;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 
 import org.w3c.dom.Document;
 
@@ -53,15 +53,15 @@
 public final class Util {
 
     public static String baseName(String name) {
-	return org.apache.xalan.xsltc.compiler.util.Util.baseName(name);
+	return com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util.baseName(name);
     }
     
     public static String noExtName(String name) {
-	return org.apache.xalan.xsltc.compiler.util.Util.noExtName(name);
+	return com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util.noExtName(name);
     }
 
     public static String toJavaName(String name) {
-	return org.apache.xalan.xsltc.compiler.util.Util.toJavaName(name);
+	return com.sun.xalan.org.apache.xalan.xsltc.compiler.util.Util.toJavaName(name);
     }
 
      
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/XSLTCSource.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/XSLTCSource.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/XSLTCSource.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/trax/XSLTCSource.java	Thu Aug 11 18:14:33 2011
@@ -20,18 +20,18 @@
  * $Id: XSLTCSource.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.trax;
+package com.sun.xalan.org.apache.xalan.xsltc.trax;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.dom.DOMWSFilter;
-import org.apache.xalan.xsltc.dom.SAXImpl;
-import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import com.sun.xalan.org.apache.xalan.xsltc.DOM;
+import com.sun.xalan.org.apache.xalan.xsltc.StripFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.DOMWSFilter;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.SAXImpl;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import com.sun.xalan.org.apache.xalan.xsltc.runtime.AbstractTranslet;
 
 import org.xml.sax.SAXException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/IntegerArray.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/IntegerArray.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/IntegerArray.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/IntegerArray.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: IntegerArray.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.util;
+package com.sun.xalan.org.apache.xalan.xsltc.util;
 
 /**
  * @author Jacek Ambroziak
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/JavaCupRedirect.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/JavaCupRedirect.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/JavaCupRedirect.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xalan/xsltc/util/JavaCupRedirect.java	Thu Aug 11 18:14:33 2011
@@ -19,7 +19,7 @@
  * $Id: JavaCupRedirect.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xalan.xsltc.util;
+package com.sun.xalan.org.apache.xalan.xsltc.util;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -29,7 +29,7 @@
  * Utility class to redirect input to JavaCup program.
  *
  * Usage-command line: 
- * <code>java org.apache.xalan.xsltc.utils.JavaCupRedirect [args] -stdin filename.ext</code>
+ * <code>java com.sun.xalan.org.apache.xalan.xsltc.utils.JavaCupRedirect [args] -stdin filename.ext</code>
  *
  * @author Morten Jorgensen
  * @version $Id: JavaCupRedirect.java 468653 2006-10-28 07:07:05Z minchau $
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/Axis.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/Axis.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/Axis.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/Axis.java	Thu Aug 11 18:14:33 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Axis.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
  * Specifies values related to XPath Axes.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTM.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTM.java	Thu Aug 11 18:14:33 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: DTM.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
 
 /**
  * <code>DTM</code> is an XML document model expressed as a table
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisIterator.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisIterator.java	Thu Aug 11 18:14:33 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMAxisIterator.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
  * This class iterates over a single XPath Axis, and returns node handles.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisTraverser.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisTraverser.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisTraverser.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMAxisTraverser.java	Thu Aug 11 18:14:33 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMAxisTraverser.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
  * A class that implements traverses DTMAxisTraverser interface can traverse
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMConfigurationException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMConfigurationException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMConfigurationException.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMConfigurationException.java	Thu Aug 11 18:14:33 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMConfigurationException.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 import javax.xml.transform.SourceLocator;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMDOMException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMDOMException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMDOMException.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMDOMException.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMDOMException.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
  * Simple implementation of DOMException.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMException.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMException.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMException.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 
 import java.lang.reflect.InvocationTargetException;
@@ -26,8 +26,8 @@
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMFilter.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMFilter.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMFilter.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
  * Simple filter for doing node tests.  Note the semantics of this are
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMIterator.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMIterator.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMIterator.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMManager.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMManager.java	Thu Aug 11 18:14:34 2011
@@ -18,19 +18,19 @@
 /*
  * $Id: DTMManager.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
 /**
  * A DTMManager instance can be used to create DTM and
  * DTMIterator objects, and manage the DTM objects in the system.
  *
  * <p>The system property that determines which Factory implementation
- * to create is named "org.apache.xml.utils.DTMFactory". This
+ * to create is named "com.sun.xalan.org.apache.xml.utils.DTMFactory". This
  * property names a concrete subclass of the DTMFactory abstract
  *  class. If the property is not defined, a platform default is be used.</p>
  *
@@ -50,11 +50,11 @@
 
   /** The default property name to load the manager. */
   private static final String defaultPropName =
-    "org.apache.xml.dtm.DTMManager";
+    "com.sun.xalan.org.apache.xml.dtm.DTMManager";
   
   /** The default class name to use as the manager. */
   private static String defaultClassName =
-    "org.apache.xml.dtm.ref.DTMManagerDefault";
+    "com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault";
 
   /**
    * Factory for creating XMLString objects.
@@ -97,7 +97,7 @@
    * load:
    * <ul>
    * <li>
-   * Use the <code>org.apache.xml.dtm.DTMManager</code> system
+   * Use the <code>com.sun.xalan.org.apache.xml.dtm.DTMManager</code> system
    * property.
    * </li>
    * <li>
@@ -110,12 +110,12 @@
    * Use the Services API (as detailed in the JAR specification), if
    * available, to determine the classname. The Services API will look
    * for a classname in the file
-   * <code>META-INF/services/org.apache.xml.dtm.DTMManager</code>
+   * <code>META-INF/services/com.sun.xalan.org.apache.xml.dtm.DTMManager</code>
    * in jars available to the runtime.
    * </li>
    * <li>
    * Use the default <code>DTMManager</code> classname, which is
-   * <code>org.apache.xml.dtm.ref.DTMManagerDefault</code>.
+   * <code>com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault</code>.
    * </li>
    * </ul>
    *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMWSFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMWSFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMWSFilter.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/DTMWSFilter.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMWSFilter.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 /**
  * This interface is meant to be implemented by a client of the DTM, and allows
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ObjectFactory.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ObjectFactory.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport12.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/SecuritySupport12.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.dtm;
+package com.sun.xalan.org.apache.xml.dtm;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ChunkedIntArray.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ChunkedIntArray.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ChunkedIntArray.java	Mon Nov 14 16:41:00 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ChunkedIntArray.java	Thu Aug 11 18:14:34 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: ChunkedIntArray.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
  
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 /**
  * <code>ChunkedIntArray</code> is an extensible array of blocks of integers.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineManager.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineManager.java	Thu Aug 11 18:14:34 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: CoroutineManager.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.util.BitSet;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineParser.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineParser.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineParser.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CoroutineParser.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: CoroutineParser.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CustomStringPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CustomStringPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CustomStringPool.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/CustomStringPool.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: CustomStringPool.java 475904 2006-11-16 20:09:39Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 import java.util.Hashtable;
 
 /** <p>CustomStringPool is an example of appliction provided data structure
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java	Thu Aug 11 18:14:34 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: DTMAxisIterNodeList.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.utils.IntVector;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.utils.IntVector;
 
 import org.w3c.dom.Node;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java	Thu Aug 11 18:14:34 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: DTMAxisIteratorBase.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
 
 /**
  * This class serves as a default base for implementations of mutable
@@ -186,7 +186,7 @@
     }
     catch (CloneNotSupportedException e)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(e);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
     }
   }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMChildIterNodeList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMChildIterNodeList.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMChildIterNodeList.java	Thu Aug 11 18:14:34 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: DTMChildIterNodeList.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 import org.w3c.dom.Node;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBase.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBase.java	Thu Aug 11 18:14:34 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: DTMDefaultBase.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.*;
-import org.apache.xml.utils.SuballocatedIntVector;
-import org.apache.xml.utils.BoolStack;
+import com.sun.xalan.org.apache.xml.dtm.*;
+import com.sun.xalan.org.apache.xml.utils.SuballocatedIntVector;
+import com.sun.xalan.org.apache.xml.utils.BoolStack;
 
 import java.util.Vector;
 
 import javax.xml.transform.Source;
 
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
 
 import java.io.*; // for dumpDTM
 
@@ -1768,7 +1768,7 @@
   public String getNodeNameX(int nodeHandle)
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMDefaultBase abstract method */
     error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
 
     return null;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java	Thu Aug 11 18:14:34 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: DTMDefaultBaseIterators.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.*;
+import com.sun.xalan.org.apache.xml.dtm.*;
 
 import javax.xml.transform.Source;
 
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xalan.xsltc.dom.NodeCounter;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.NodeCounter;
 
 /**
  * This class implements the traversers for DTMDefaultBase.
@@ -1587,8 +1587,8 @@
    */
   public class AncestorIterator extends InternalAxisIteratorBase
   {
-    org.apache.xml.utils.NodeVector m_ancestors = 
-         new org.apache.xml.utils.NodeVector();
+    com.sun.xalan.org.apache.xml.utils.NodeVector m_ancestors = 
+         new com.sun.xalan.org.apache.xml.utils.NodeVector();
          
     int m_ancestorsPos;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java	Thu Aug 11 18:14:34 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: DTMDefaultBaseTraversers.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.*;
+import com.sun.xalan.org.apache.xml.dtm.*;
 
 import javax.xml.transform.Source;
 
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xalan.xsltc.dom.NodeCounter;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xalan.xsltc.dom.NodeCounter;
 
 /**
  * This class implements the traversers for DTMDefaultBase.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java	Thu Aug 11 18:14:34 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: DTMDocumentImpl.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -839,7 +839,7 @@
 // 			String prefix = qname.substring(0, colonpos);
 // 			if (prefix.equals("xml")) {
 // 				//w0 = ATTRIBUTE_NODE |
-// 				//	(org.apache.xalan.templates.Constants.S_XMLNAMESPACEURI << 16);
+// 				//	(com.sun.xalan.org.apache.xalan.templates.Constants.S_XMLNAMESPACEURI << 16);
 // 			} else {
 // 				//w0 = ATTRIBUTE_NODE |
 // 			}
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMManagerDefault.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMManagerDefault.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMManagerDefault.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMManagerDefault.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMManagerDefault.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -27,21 +27,21 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMException;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.ref.dom2dtm.DOM2DTM;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.XMLReaderManager;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMException;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.dtm.ref.dom2dtm.DOM2DTM;
+import com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
+import com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.XMLReaderManager;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -346,7 +346,7 @@
               // IncrementalSAXSource_Xerces to avoid threading.
               try {
                 coParser =(IncrementalSAXSource)
-                  Class.forName("org.apache.xml.dtm.ref.IncrementalSAXSource_Xerces").newInstance();  
+                  Class.forName("com.sun.xalan.org.apache.xml.dtm.ref.IncrementalSAXSource_Xerces").newInstance();  
               }  catch( Exception ex ) {
                 ex.printStackTrace();
                 coParser=null;
@@ -412,7 +412,7 @@
 
               dtm.clearCoRoutine();
 
-              throw new org.apache.xml.utils.WrappedRuntimeException(e);
+              throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
             }
           } else {
             if (null == reader) {
@@ -444,7 +444,7 @@
             } catch (Exception e) {
               dtm.clearCoRoutine();
 
-              throw new org.apache.xml.utils.WrappedRuntimeException(e);
+              throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
             }
           }
 
@@ -493,8 +493,8 @@
     if(null == node)
       throw new IllegalArgumentException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NODE_NON_NULL, null)); //"node must be non-null for getDTMHandleFromNode!");
 
-    if (node instanceof org.apache.xml.dtm.ref.DTMNodeProxy)
-      return ((org.apache.xml.dtm.ref.DTMNodeProxy) node).getDTMNodeNumber();
+    if (node instanceof com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy)
+      return ((com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy) node).getDTMNodeNumber();
 		
     else
     {
@@ -561,7 +561,7 @@
 
       int handle;
       
-      if(node instanceof org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode)
+      if(node instanceof com.sun.xalan.org.apache.xml.dtm.ref.dom2dtm.DOM2DTMdefaultNamespaceDeclarationNode)
       {
 				// Can't return the same node since it's unique to a specific DTM, 
 				// but can return the equivalent node -- find the corresponding 
@@ -735,7 +735,7 @@
 		// %REVIEW% Should the lookup move up into the basic DTM API?
 		if(dtm instanceof DTMDefaultBase)
 		{
-			org.apache.xml.utils.SuballocatedIntVector ids=((DTMDefaultBase)dtm).getDTMIDs();
+			com.sun.xalan.org.apache.xml.utils.SuballocatedIntVector ids=((DTMDefaultBase)dtm).getDTMIDs();
 			for(int i=ids.size()-1;i>=0;--i)
 				m_dtms[ids.elementAt(i)>>>DTMManager.IDENT_DTM_NODE_BITS]=null;
 		}
@@ -793,7 +793,7 @@
                                        boolean entityReferenceExpansion)
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMManager abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMManager abstract method */
     return null;
   }
 
@@ -810,7 +810,7 @@
                                        PrefixResolver presolver)
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMManager abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMManager abstract method */
     return null;
   }
 
@@ -825,7 +825,7 @@
   synchronized public DTMIterator createDTMIterator(int node)
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMManager abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMManager abstract method */
     return null;
   }
 
@@ -841,7 +841,7 @@
   synchronized public DTMIterator createDTMIterator(Object xpathCompiler, int pos)
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMManager abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMManager abstract method */
     return null;
   }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNamedNodeMap.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNamedNodeMap.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNamedNodeMap.java	Thu Aug 11 18:14:34 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: DTMNamedNodeMap.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.NamedNodeMap;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeIterator.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeIterator.java	Thu Aug 11 18:14:34 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: DTMNodeIterator.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMDOMException;
-import org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMDOMException;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
@@ -75,7 +75,7 @@
       }
       catch(CloneNotSupportedException cnse)
       {
-        throw new org.apache.xml.utils.WrappedRuntimeException(cnse);
+        throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(cnse);
       }
     }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeList.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeList.java	Thu Aug 11 18:14:34 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: DTMNodeList.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
 import org.w3c.dom.Node;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeListBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeListBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeListBase.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeListBase.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DTMNodeListBase.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 import org.w3c.dom.Node;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeProxy.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeProxy.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeProxy.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMNodeProxy.java	Thu Aug 11 18:14:34 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: DTMNodeProxy.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.util.Vector;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMDOMException;
-import org.apache.xpath.NodeSet;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMDOMException;
+import com.sun.xalan.org.apache.xpath.NodeSet;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMSafeStringPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMSafeStringPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMSafeStringPool.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMSafeStringPool.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: DTMSafeStringPool.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 
 /** <p>Like DTMStringPool, but threadsafe. It's been proposed that DTMs
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMStringPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMStringPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMStringPool.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMStringPool.java	Thu Aug 11 18:14:34 2011
@@ -19,11 +19,11 @@
  * $Id: DTMStringPool.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.util.Vector;
 
-import org.apache.xml.utils.IntVector;
+import com.sun.xalan.org.apache.xml.utils.IntVector;
 
 /** <p>DTMStringPool is an "interning" mechanism for strings. It will
  * create a stable 1:1 mapping between a set of string values and a set of
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMTreeWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMTreeWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMTreeWalker.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/DTMTreeWalker.java	Thu Aug 11 18:14:34 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: DTMTreeWalker.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.NodeConsumer;
-import org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.NodeConsumer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.ext.LexicalHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/EmptyIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/EmptyIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/EmptyIterator.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/EmptyIterator.java	Thu Aug 11 18:14:34 2011
@@ -19,10 +19,10 @@
 /*
  * $Id: EmptyIterator.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExpandedNameTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExpandedNameTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExpandedNameTable.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExpandedNameTable.java	Thu Aug 11 18:14:34 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ExpandedNameTable.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * This is a default implementation of a table that manages mappings from
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExtendedType.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExtendedType.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExtendedType.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ExtendedType.java	Thu Aug 11 18:14:34 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtendedType.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 /**
  * The class ExtendedType represents an extended type object used by
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: IncrementalSAXSource.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java	Thu Aug 11 18:14:34 2011
@@ -19,13 +19,13 @@
  * $Id: IncrementalSAXSource_Filter.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.io.IOException;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.ThreadControllerWrapper;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.utils.ThreadControllerWrapper;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -610,7 +610,7 @@
     fXMLReaderInputSource=source;
     
     // Xalan thread pooling...
-    // org.apache.xalan.transformer.TransformerImpl.runTransformThread(this);
+    // com.sun.xalan.org.apache.xalan.transformer.TransformerImpl.runTransformThread(this);
     ThreadControllerWrapper.runThread(this, -1);
   }
   
@@ -752,8 +752,8 @@
       IncrementalSAXSource_Filter filter=
         new IncrementalSAXSource_Filter();
       // Use a serializer as our sample output
-      org.apache.xml.serialize.XMLSerializer trace;
-      trace=new org.apache.xml.serialize.XMLSerializer(System.out,null);
+      com.sun.xalan.org.apache.xml.serialize.XMLSerializer trace;
+      trace=new com.sun.xalan.org.apache.xml.serialize.XMLSerializer(System.out,null);
       filter.setContentHandler(trace);
       filter.setLexicalHandler(trace);
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java	Thu Aug 11 18:17:19 2011
@@ -19,15 +19,15 @@
  * $Id: IncrementalSAXSource_Xerces.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
 import org.apache.xerces.parsers.SAXParser;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -435,7 +435,7 @@
           System.out.println("\nUNEXPECTED: Parser says shut down prematurely.\n");
         }
         else if (result instanceof Exception) {
-          throw new org.apache.xml.utils.WrappedRuntimeException((Exception)result);
+          throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException((Exception)result);
           //          System.out.println("\nParser threw exception:");
           //          ((Exception)result).printStackTrace();
         }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/NodeLocator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/NodeLocator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/NodeLocator.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/NodeLocator.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: NodeLocator.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import javax.xml.transform.SourceLocator;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ObjectFactory.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/ObjectFactory.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport12.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/SecuritySupport12.java	Thu Aug 11 18:14:34 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref;
+package com.sun.xalan.org.apache.xml.dtm.ref;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java	Thu Aug 11 18:14:35 2011
@@ -18,29 +18,29 @@
 /*
  * $Id: DOM2DTM.java 478671 2006-11-23 21:00:31Z minchau $
  */
-package org.apache.xml.dtm.ref.dom2dtm;
+package com.sun.xalan.org.apache.xml.dtm.ref.dom2dtm;
 
 import java.util.Vector;
 
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
-import org.apache.xml.dtm.ref.DTMManagerDefault;
-import org.apache.xml.dtm.ref.ExpandedNameTable;
-import org.apache.xml.dtm.ref.IncrementalSAXSource;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMManagerDefault;
+import com.sun.xalan.org.apache.xml.dtm.ref.ExpandedNameTable;
+import com.sun.xalan.org.apache.xml.dtm.ref.IncrementalSAXSource;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.StringBufferPool;
+import com.sun.xalan.org.apache.xml.utils.TreeWalker;
+import com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java	Thu Aug 11 18:14:35 2011
@@ -19,9 +19,9 @@
  * $Id: DOM2DTMdefaultNamespaceDeclarationNode.java 468653 2006-10-28 07:07:05Z minchau $
  */
 
-package org.apache.xml.dtm.ref.dom2dtm;
+package com.sun.xalan.org.apache.xml.dtm.ref.dom2dtm;
 
-import org.apache.xml.dtm.DTMException;
+import com.sun.xalan.org.apache.xml.dtm.DTMException;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java	Thu Aug 11 18:14:35 2011
@@ -18,26 +18,26 @@
 /*
  * $Id: SAX2DTM.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref.sax2dtm;
+package com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm;
 
 import java.util.Hashtable;
 import java.util.Vector;
 import javax.xml.transform.Source;
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.IntVector;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.SuballocatedIntVector;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.dtm.*;
+import com.sun.xalan.org.apache.xml.dtm.ref.*;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xml.utils.IntVector;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xml.utils.SuballocatedIntVector;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 import org.xml.sax.*;
 import org.xml.sax.ext.*;
 
@@ -283,7 +283,7 @@
 
     //m_dataOrQName = new SuballocatedIntVector(blocksize);
     
-    // m_useSourceLocationProperty=org.apache.xalan.processor.TransformerFactoryImpl.m_source_location;
+    // m_useSourceLocationProperty=com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl.m_source_location;
     m_useSourceLocationProperty = mgr.getSource_location();
     m_sourceSystemId = (m_useSourceLocationProperty) ? new StringVector() : null;
  	m_sourceLine = (m_useSourceLocationProperty) ?  new IntVector() : null;
@@ -693,7 +693,7 @@
   public String getDocumentTypeDeclarationSystemIdentifier()
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMDefaultBase abstract method */
     error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
 
     return null;
@@ -1213,7 +1213,7 @@
   public String getDocumentTypeDeclarationPublicIdentifier()
   {
 
-    /** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract method */
+    /** @todo: implement this com.sun.xalan.org.apache.xml.dtm.DTMDefaultBase abstract method */
     error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
 
     return null;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java	Thu Aug 11 18:14:35 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: SAX2DTM2.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref.sax2dtm;
+package com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm;
 
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringDefault;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.dtm.*;
+import com.sun.xalan.org.apache.xml.dtm.ref.*;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringDefault;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
 
 import javax.xml.transform.Source;
 import java.util.Vector;
-import org.apache.xml.utils.SuballocatedIntVector;
+import com.sun.xalan.org.apache.xml.utils.SuballocatedIntVector;
 import org.xml.sax.*;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java	Thu Aug 11 18:14:35 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: SAX2RTFDTM.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.dtm.ref.sax2dtm;
+package com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm;
 
 import javax.xml.transform.Source;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.IntVector;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xml.utils.IntVector;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
 import org.xml.sax.SAXException;
 
@@ -128,7 +128,7 @@
           
     // NEVER track source locators for RTFs; they aren't meaningful. I think.
     // (If we did track them, we'd need to tail-prune these too.)
-    //org.apache.xalan.processor.TransformerFactoryImpl.m_source_location;
+    //com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl.m_source_location;
     m_useSourceLocationProperty=false;
     m_sourceSystemId = (m_useSourceLocationProperty) ? new StringVector()
                                                      : null;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ca.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ca.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ca.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ca.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_ca.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_cs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_cs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_cs.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_cs.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_cs.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_de.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_de.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_de.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_en.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_en.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_en.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_en.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_en.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_es.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_es.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_es.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_fr.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_fr.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_fr.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_hu.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_hu.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_hu.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_hu.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_hu.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_it.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_it.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_it.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ja.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ja.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ja.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ja.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_ja.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ko.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ko.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_ko.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pl.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pl.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_pl.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pt_BR.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pt_BR.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pt_BR.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_pt_BR.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_pt_BR.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ru.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ru.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ru.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_ru.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_ru.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sk.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sk.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sk.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sk.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_sk.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sl.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sl.java	Thu Aug 11 18:14:35 2011
@@ -19,7 +19,7 @@
  * $Id: XMLErrorResources_sl.java,v 1.9 2004/12/16 19:29:01 minchau Exp $
  */
 
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sv.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sv.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sv.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_sv.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_sv.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_tr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_tr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_tr.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_tr.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_tr.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_zh.java 338081 2004-12-15 17:35:58Z jycli $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh_TW.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLErrorResources_zh_TW.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLErrorResources_zh_TW.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 
 import java.util.ListResourceBundle;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLMessages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLMessages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/res/XMLMessages.java	Mon Nov 14 16:41:01 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/res/XMLMessages.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLMessages.java 468653 2006-10-28 07:07:05Z minchau $
  */
-package org.apache.xml.res;
+package com.sun.xalan.org.apache.xml.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -40,7 +40,7 @@
 
   /** The class name of the XML error message string table.    */
   private static final String XML_ERROR_RESOURCES =
-    "org.apache.xml.res.XMLErrorResources";
+    "com.sun.xalan.org.apache.xml.res.XMLErrorResources";
 
   /** String to use if a bad message code is used. */
   protected static final String BAD_CODE = "BAD_CODE";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/AttributesImplSerializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/AttributesImplSerializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/AttributesImplSerializer.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/AttributesImplSerializer.java	Thu Aug 11 18:14:35 2011
@@ -19,7 +19,7 @@
  * $Id: AttributesImplSerializer.java 468654 2006-10-28 07:09:23Z minchau $
  */
 
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.util.Hashtable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/CharInfo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/CharInfo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/CharInfo.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/CharInfo.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: CharInfo.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -35,10 +35,10 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.SystemIDResolver;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException;
 
 /**
  * This class provides services that tell if a character should have
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOM3Serializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOM3Serializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOM3Serializer.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOM3Serializer.java	Thu Aug 11 18:14:35 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 
@@ -106,8 +106,8 @@
  * 
  * @see <a href="http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#DOMConfiguration">DOMConfiguration</a>
  * @see <a href="http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/load-save.html#LS-LSSerializer-config">LSSerializer</a>
- * @see org.apache.xml.serializer.Serializer
- * @see org.apache.xml.serializer.DOMSerializer
+ * @see com.sun.xalan.org.apache.xml.serializer.Serializer
+ * @see com.sun.xalan.org.apache.xml.serializer.DOMSerializer
  * 
  * @xsl.usage advanced
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOMSerializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOMSerializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOMSerializer.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/DOMSerializer.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOMSerializer.java 475350 2006-11-15 18:39:15Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 
@@ -39,7 +39,7 @@
  * 
  * // Create a Serializer that will be used
  * // to serialize the document  
- * org.apache.xml.serializer.Serializer ser = ...;
+ * com.sun.xalan.org.apache.xml.serializer.Serializer ser = ...;
  *
  * // Set the Writer to write output to, and 
  * // serialize the DOM using that Serializer
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemContext.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemContext.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemContext.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemContext.java	Thu Aug 11 18:14:35 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemContext.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 /**
  * This class is a stack frame that consists of 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemDesc.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemDesc.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemDesc.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ElemDesc.java	Thu Aug 11 18:14:36 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: ElemDesc.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
-import org.apache.xml.serializer.utils.StringToIntTable;
+import com.sun.xalan.org.apache.xml.serializer.utils.StringToIntTable;
 
 /**
  * This class has a series of flags (bit values) that describe an HTML element
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/EmptySerializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/EmptySerializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/EmptySerializer.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/EmptySerializer.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: EmptySerializer.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -777,7 +777,7 @@
     }
 
     /**
-     * @see org.apache.xml.serializer.Serializer#asDOM3Serializer()
+     * @see com.sun.xalan.org.apache.xml.serializer.Serializer#asDOM3Serializer()
      */
     public Object asDOM3Serializer() throws IOException
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/EncodingInfo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/EncodingInfo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/EncodingInfo.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/EncodingInfo.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: EncodingInfo.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Encodings.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Encodings.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Encodings.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Encodings.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Encodings.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -385,11 +385,11 @@
         }
         catch (java.net.MalformedURLException mue)
         {
-            throw new org.apache.xml.serializer.utils.WrappedRuntimeException(mue);
+            throw new com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException(mue);
         }
         catch (java.io.IOException ioe)
         {
-            throw new org.apache.xml.serializer.utils.WrappedRuntimeException(ioe);
+            throw new com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException(ioe);
         }
     }
     
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedContentHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedContentHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedContentHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedContentHandler.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtendedContentHandler.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import javax.xml.transform.SourceLocator;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedLexicalHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedLexicalHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedLexicalHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ExtendedLexicalHandler.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExtendedLexicalHandler.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import org.xml.sax.SAXException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Method.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Method.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Method.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Method.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Method.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 /**
  * This class defines the constants which are the names of the four default
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/NamespaceMappings.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/NamespaceMappings.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/NamespaceMappings.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/NamespaceMappings.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NamespaceMappings.java 469648 2006-10-31 20:52:27Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ObjectFactory.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ObjectFactory.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468654 2006-10-28 07:09:23Z minchau $
  */
 
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.BufferedReader;
 import java.io.File;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertiesFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertiesFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertiesFactory.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertiesFactory.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: OutputPropertiesFactory.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -30,9 +30,9 @@
 
 import javax.xml.transform.OutputKeys;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException;
 
 /**
  * This class is a factory to generate a set of default properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertyUtils.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertyUtils.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertyUtils.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/OutputPropertyUtils.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: OutputPropertyUtils.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.util.Properties;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468654 2006-10-28 07:09:23Z minchau $
  */
 
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport12.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SecuritySupport12.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468654 2006-10-28 07:09:23Z minchau $
  */
 
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializationHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializationHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializationHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializationHandler.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializationHandler.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Serializer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Serializer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Serializer.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Serializer.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Serializer.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
@@ -61,7 +61,7 @@
  * For example:
  * <pre>
  * org.w3c.dom.Document     inputDoc;
- * org.apache.xml.serializer.Serializer   ser;
+ * com.sun.xalan.org.apache.xml.serializer.Serializer   ser;
  * java.io.Writer owriter;
  * 
  * java.util.Properties props = 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerBase.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerBase.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerBase.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -28,8 +28,8 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.Transformer;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
@@ -1577,11 +1577,11 @@
      * @return A {@link DOM3Serializer} interface into this serializer,  or null
      * if the serializer is not DOM capable
      * @throws IOException An I/O exception occured
-     * @see org.apache.xml.serializer.Serializer#asDOM3Serializer()
+     * @see com.sun.xalan.org.apache.xml.serializer.Serializer#asDOM3Serializer()
      */
     public Object asDOM3Serializer() throws IOException
     {
-        return new org.apache.xml.serializer.dom3.DOM3SerializerImpl(this);
+        return new com.sun.xalan.org.apache.xml.serializer.dom3.DOM3SerializerImpl(this);
     }
     /**
      * Get the default value of an xsl:output property,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerConstants.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerConstants.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerConstants.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerConstants.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerConstants.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 /**
  * Constants used in serialization, such as the string "xmlns"
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerFactory.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerFactory.java	Thu Aug 11 18:14:36 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: SerializerFactory.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.util.Hashtable;
 import java.util.Properties;
 
 import javax.xml.transform.OutputKeys;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
 import org.xml.sax.ContentHandler;
 
 /**
@@ -176,7 +176,7 @@
       }
       catch (Exception e)
       {
-        throw new org.apache.xml.serializer.utils.WrappedRuntimeException(e);
+        throw new com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException(e);
       }
 
       // If we make it to here ser is not null.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTrace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTrace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTrace.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTrace.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerTrace.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import org.xml.sax.Attributes;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTraceWriter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTraceWriter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTraceWriter.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/SerializerTraceWriter.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerTraceWriter.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLSAXHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLSAXHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLSAXHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLSAXHandler.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id: ToHTMLSAXHandler.java 475978 2006-11-16 23:31:20Z minchau $
  */
 
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLStream.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLStream.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLStream.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToHTMLStream.java	Thu Aug 11 18:14:36 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: ToHTMLStream.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.util.Properties;
 
 import javax.xml.transform.Result;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -2041,7 +2041,7 @@
          * choice of sensitivity or insensitivity is made when
          * the Trie is created, before any objects are put in it.
          * 
-         * This class is a copy of the one in org.apache.xml.utils. 
+         * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
          * It exists to cut the serializers dependancy on that package.
          *  
          * @xsl.usage internal
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToSAXHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToSAXHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToSAXHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToSAXHandler.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ToSAXHandler.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToStream.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToStream.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToStream.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToStream.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ToStream.java 475894 2006-11-16 19:43:59Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -38,9 +38,9 @@
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException;
 import org.w3c.dom.Node;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -3303,7 +3303,7 @@
     /**
      * Simple stack for boolean values.
      * 
-     * This class is a copy of the one in org.apache.xml.utils. 
+     * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
      * It exists to cut the serializers dependancy on that package.
      * A minor changes from that package are:
      * doesn't implement Clonable
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextSAXHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextSAXHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextSAXHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextSAXHandler.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ToTextSAXHandler.java 475978 2006-11-16 23:31:20Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextStream.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextStream.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextStream.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToTextStream.java	Thu Aug 11 18:14:36 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ToTextStream.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToUnknownStream.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToUnknownStream.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToUnknownStream.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToUnknownStream.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ToUnknownStream.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -1307,7 +1307,7 @@
     }
 
     /**
-     * @see org.apache.xml.serializer.Serializer#asDOM3Serializer()
+     * @see com.sun.xalan.org.apache.xml.serializer.Serializer#asDOM3Serializer()
      */
     public Object asDOM3Serializer() throws IOException
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLSAXHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLSAXHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLSAXHandler.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLSAXHandler.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ToXMLSAXHandler.java 468654 2006-10-28 07:09:23Z minchau $
  */
- package org.apache.xml.serializer;
+ package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLStream.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLStream.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLStream.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/ToXMLStream.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ToXMLStream.java 469359 2006-10-31 03:43:19Z minchau $
  */
- package org.apache.xml.serializer;
+ package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 
@@ -27,8 +27,8 @@
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
 import org.xml.sax.SAXException;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/TransformStateSetter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/TransformStateSetter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/TransformStateSetter.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/TransformStateSetter.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TransformStateSetter.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import javax.xml.transform.Transformer;
 
@@ -32,7 +32,7 @@
  * This interface is not a public API, it is only public because it is
  * used by Xalan.
  * 
- * @see org.apache.xalan.transformer.TransformState
+ * @see com.sun.xalan.org.apache.xalan.transformer.TransformState
  * @xsl.usage internal
  */
 public interface TransformStateSetter
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/TreeWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/TreeWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/TreeWalker.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/TreeWalker.java	Thu Aug 11 18:14:36 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: TreeWalker.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.File;
 
-import org.apache.xml.serializer.utils.AttList;
-import org.apache.xml.serializer.utils.DOM2Helper;
+import com.sun.xalan.org.apache.xml.serializer.utils.AttList;
+import com.sun.xalan.org.apache.xml.serializer.utils.DOM2Helper;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Element;
 import org.w3c.dom.EntityReference;
@@ -41,7 +41,7 @@
  * This class does a pre-order walk of the DOM tree, calling a ContentHandler
  * interface as it goes.
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  *  
  * @xsl.usage internal
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Version.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Version.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/Version.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/Version.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Version.src 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 /**
  * Administrative class to keep track of the version number of
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterChain.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterChain.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterChain.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterChain.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WriterChain.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToASCI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToASCI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToASCI.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToASCI.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WriterToASCI.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToUTF8Buffered.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToUTF8Buffered.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToUTF8Buffered.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/WriterToUTF8Buffered.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WriterToUTF8Buffered.java 469356 2006-10-31 03:20:34Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/XSLOutputAttributes.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/XSLOutputAttributes.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/XSLOutputAttributes.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/XSLOutputAttributes.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XSLOutputAttributes.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer;
+package com.sun.xalan.org.apache.xml.serializer;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java	Thu Aug 11 18:14:36 2011
@@ -19,13 +19,13 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import java.io.IOException;
 
-import org.apache.xml.serializer.DOM3Serializer;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.serializer.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.serializer.DOM3Serializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.utils.WrappedRuntimeException;
 import org.w3c.dom.DOMErrorHandler;
 import org.w3c.dom.Node;
 import org.w3c.dom.ls.LSSerializerFilter;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3TreeWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3TreeWalker.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOM3TreeWalker.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,13 +28,13 @@
 import java.util.Hashtable;
 import java.util.Properties;
 
-import org.apache.xml.serializer.dom3.NamespaceSupport;
-import org.apache.xml.serializer.OutputPropertiesFactory;
-import org.apache.xml.serializer.SerializationHandler;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.Utils;
-import org.apache.xml.serializer.utils.XML11Char;
-import org.apache.xml.serializer.utils.XMLChar;
+import com.sun.xalan.org.apache.xml.serializer.dom3.NamespaceSupport;
+import com.sun.xalan.org.apache.xml.serializer.OutputPropertiesFactory;
+import com.sun.xalan.org.apache.xml.serializer.SerializationHandler;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.utils.XML11Char;
+import com.sun.xalan.org.apache.xml.serializer.utils.XMLChar;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Comment;
@@ -58,7 +58,7 @@
 import org.xml.sax.helpers.LocatorImpl;
 
 /**
- * Built on org.apache.xml.serializer.TreeWalker and adds functionality to
+ * Built on com.sun.xalan.org.apache.xml.serializer.TreeWalker and adds functionality to
  * traverse and serialize a DOM Node (Level 2 or Level 3) as specified in 
  * the DOM Level 3 LS Recommedation by evaluating and applying DOMConfiguration 
  * parameters and filters if any during serialization.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMConstants.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMConstants.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMConstants.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMConstants.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 /**
  * DOM Constants used by the DOM Level 3 LSSerializer implementation.
@@ -113,7 +113,7 @@
     public static final String S_XML_VERSION = "xml-version";
 
     //     
-    public static final String S_XSL_VALUE_ENTITIES = "org/apache/xml/serializer/XMLEntities";
+    public static final String S_XSL_VALUE_ENTITIES = "com.sun.xalan.org.apache.xml/serializer/XMLEntities";
     
     // Parameter values
     public static final String DOM3_EXPLICIT_TRUE = "explicit:yes";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMErrorImpl.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMLocator;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMLocatorImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMLocatorImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMLocatorImpl.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import org.w3c.dom.DOMLocator;
 import org.w3c.dom.Node;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMOutputImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMOutputImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMOutputImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMOutputImpl.java	Thu Aug 11 18:14:36 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import org.w3c.dom.ls.LSOutput;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMStringListImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMStringListImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMStringListImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/DOMStringListImpl.java	Thu Aug 11 18:14:36 2011
@@ -18,7 +18,7 @@
 /*
  * $Id:  $
  */
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import java.util.Vector;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/LSSerializerImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/LSSerializerImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/LSSerializerImpl.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/LSSerializerImpl.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import java.io.FileOutputStream;
 import java.io.OutputStream;
@@ -34,14 +34,14 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.apache.xml.serializer.DOM3Serializer;
-import org.apache.xml.serializer.Encodings;
-import org.apache.xml.serializer.OutputPropertiesFactory;
-import org.apache.xml.serializer.Serializer;
-import org.apache.xml.serializer.SerializerFactory;
-import org.apache.xml.serializer.utils.MsgKey;
-import org.apache.xml.serializer.utils.SystemIDResolver;
-import org.apache.xml.serializer.utils.Utils;
+import com.sun.xalan.org.apache.xml.serializer.DOM3Serializer;
+import com.sun.xalan.org.apache.xml.serializer.Encodings;
+import com.sun.xalan.org.apache.xml.serializer.OutputPropertiesFactory;
+import com.sun.xalan.org.apache.xml.serializer.Serializer;
+import com.sun.xalan.org.apache.xml.serializer.SerializerFactory;
+import com.sun.xalan.org.apache.xml.serializer.utils.MsgKey;
+import com.sun.xalan.org.apache.xml.serializer.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.serializer.utils.Utils;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
@@ -57,7 +57,7 @@
 /**
  * Implemenatation of DOM Level 3 org.w3c.ls.LSSerializer and 
  * org.w3c.dom.ls.DOMConfiguration.  Serialization is achieved by delegating 
- * serialization calls to <CODE>org.apache.xml.serializer.ToStream</CODE> or 
+ * serialization calls to <CODE>com.sun.xalan.org.apache.xml.serializer.ToStream</CODE> or 
  * one of its derived classes depending on the serialization method, while walking
  * the DOM in DOM3TreeWalker.  
  * @see <a href="http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/load-save.html#LS-LSSerializer">org.w3c.dom.ls.LSSerializer</a>
@@ -205,7 +205,7 @@
     
     /**
      * Constructor:  Creates a LSSerializerImpl object.  The underlying
-     * XML 1.0 or XML 1.1 org.apache.xml.serializer.Serializer object is
+     * XML 1.0 or XML 1.1 com.sun.xalan.org.apache.xml.serializer.Serializer object is
      * created and initialized the first time any of the write methods are  
      * invoked to serialize the Node.  Subsequent write methods on the same
      * LSSerializerImpl object will use the previously created Serializer object.
@@ -1043,7 +1043,7 @@
             }
             
             // The associated media type by default is set to text/xml on 
-            // org.apache.xml.serializer.SerializerBase.  
+            // com.sun.xalan.org.apache.xml.serializer.SerializerBase.  
             
             // Get a reference to the serializer then lets you serilize a DOM
             // Use this hack till Xalan support JAXP1.3
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/NamespaceSupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/NamespaceSupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/NamespaceSupport.java	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/dom3/NamespaceSupport.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id:  $
  */
 
-package org.apache.xml.serializer.dom3;
+package com.sun.xalan.org.apache.xml.serializer.dom3;
 
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_html.properties /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_html.properties
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_html.properties	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_html.properties	Tue Aug 16 16:47:49 2011
@@ -38,7 +38,7 @@
 #  ...
 # Note that the colon after the protocol needs to be escaped.
 {http\u003a//xml.apache.org/xalan}indent-amount=0
-{http\u003a//xml.apache.org/xalan}content-handler=org.apache.xml.serializer.ToHTMLStream
-{http\u003a//xml.apache.org/xalan}entities=org/apache/xml/serializer/HTMLEntities
+{http\u003a//xml.apache.org/xalan}content-handler=com.sun.xalan.org.apache.xml.serializer.ToHTMLStream
+{http\u003a//xml.apache.org/xalan}entities=com/sun/xalan/org/apache/xml/serializer/HTMLEntities
 {http\u003a//xml.apache.org/xalan}use-url-escaping=yes
 {http\u003a//xml.apache.org/xalan}omit-meta-tag=no
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_text.properties /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_text.properties
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_text.properties	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_text.properties	Tue Aug 16 16:48:11 2011
@@ -34,4 +34,4 @@
 #              xalan:content-handler="MyContentHandler"/>
 #  ...
 # Note that the colon after the protocol needs to be escaped.
-{http\u003a//xml.apache.org/xalan}content-handler=org.apache.xml.serializer.ToTextStream
+{http\u003a//xml.apache.org/xalan}content-handler=com.sun.xalan.org.apache.xml.serializer.ToTextStream
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_unknown.properties /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_unknown.properties
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_unknown.properties	Mon Nov 14 16:41:02 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_unknown.properties	Tue Aug 16 16:49:25 2011
@@ -42,5 +42,5 @@
 #  ...
 # Note that the colon after the protocol needs to be escaped.
 {http\u003a//xml.apache.org/xalan}indent-amount=0
-{http\u003a//xml.apache.org/xalan}content-handler=org.apache.xml.serializer.ToUnknownStream
+{http\u003a//xml.apache.org/xalan}content-handler=com.sun.xalan.org.apache.xml.serializer.ToUnknownStream
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_xml.properties /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_xml.properties
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_xml.properties	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/output_xml.properties	Tue Aug 16 16:50:02 2011
@@ -41,6 +41,6 @@
 #  ...
 # Note that the colon after the protocol needs to be escaped.
 {http\u003a//xml.apache.org/xalan}indent-amount=0
-{http\u003a//xml.apache.org/xalan}content-handler=org.apache.xml.serializer.ToXMLStream
-{http\u003a//xml.apache.org/xalan}entities=org/apache/xml/serializer/XMLEntities
+{http\u003a//xml.apache.org/xalan}content-handler=com.sun.xalan.org.apache.xml.serializer.ToXMLStream
+{http\u003a//xml.apache.org/xalan}entities=com/sun/xalan/org/apache/xml/serializer/XMLEntities
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/AttList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/AttList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/AttList.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/AttList.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: AttList.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
@@ -29,13 +29,13 @@
 /**
  * Wraps a DOM attribute list in a SAX Attributes.
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  * A minor changes from that package are:
  * DOMHelper reference changed to DOM2Helper, class is not "public"
  *  
  * This class is not a public API, it is only public because it is 
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  * 
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/BoolStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/BoolStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/BoolStack.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/BoolStack.java	Thu Aug 11 18:14:37 2011
@@ -18,19 +18,19 @@
 /*
  * $Id: BoolStack.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 
 /**
  * Simple stack for boolean values.
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  * A minor changes from that package are:
  * doesn't implement Clonable
  *  
  * This class is not a public API, it is only public because it is 
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  * 
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/DOM2Helper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/DOM2Helper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/DOM2Helper.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/DOM2Helper.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOM2Helper.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import org.w3c.dom.Node;
 
@@ -26,7 +26,7 @@
  * This class provides a DOM level 2 "helper", which provides services currently 
  * not provided be the DOM standard.
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  * 
  * The differences from the original class are:
@@ -43,7 +43,7 @@
  * made class non-public
  *   
  * This class is not a public API, it is only public because it is 
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  * 
  * @xsl.usage internal
  */
@@ -79,7 +79,7 @@
    * with a namespace prefix, this is the part after the colon; otherwise
    * it's the full node name.
    * 
-   * This method is copied from org.apache.xml.utils.DOMHelper
+   * This method is copied from com.sun.xalan.org.apache.xml.utils.DOMHelper
    *
    * @param n the node to be examined.
    *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Messages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Messages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Messages.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Messages.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Messages.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -90,7 +90,7 @@
  * before creating any messages.
  * 
  * This class is not a public API, it is only public because it is 
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  *  @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/MsgKey.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/MsgKey.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/MsgKey.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/MsgKey.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: MsgKey.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 /**
  * This class is not a public API,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerMessages.java 471981 2006-11-07 04:28:00Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ca.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ca.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ca.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ca.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_ca.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_cs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_cs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_cs.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_cs.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_cs.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_de.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_de.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_de.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_en.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_en.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_en.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_en.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializerMessages_en.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_es.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_es.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_es.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_fr.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_fr.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_fr.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_hu.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_hu.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_hu.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_hu.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_hu.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_it.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_it.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_it.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ja.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ja.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ja.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ja.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_ja.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ko.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ko.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_ko.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pl.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pl.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_pl.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_pt_BR.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ru.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ru.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ru.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_ru.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_ru.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sk.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sk.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sk.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sk.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_sk.java,v 1.7 2005/03/07 20:34:36 minchau Exp $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sl.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sl.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_sl.java,v 1.7 2005/03/07 20:34:36 minchau Exp $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sv.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sv.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sv.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_sv.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_sv.java 468654 2006-10-28 07:09:23Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_tr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_tr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_tr.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_tr.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_tr.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh.java	Thu Aug 11 18:14:37 2011
@@ -20,7 +20,7 @@
  */
 
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -39,7 +39,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_zh_CN.java 468654 2006-10-28 07:09:23Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java	Thu Aug 11 18:14:37 2011
@@ -19,7 +19,7 @@
  * $Id: SerializerMessages_zh_TW.java 471981 2006-11-07 04:28:00Z minchau $
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -38,7 +38,7 @@
  * translated.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer.
+ * used in com.sun.xalan.org.apache.xml.serializer.
  *
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/StringToIntTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/StringToIntTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/StringToIntTable.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/StringToIntTable.java	Thu Aug 11 18:14:37 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: StringToIntTable.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 /**
  * A very simple lookup table that stores a list of strings, the even
  * number strings being keys, and the odd number strings being values.
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  * 
  * This class is not a public API, it is only public so it can be used
- * in org.apache.xml.serializer.
+ * in com.sun.xalan.org.apache.xml.serializer.
  *  
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SystemIDResolver.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SystemIDResolver.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SystemIDResolver.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/SystemIDResolver.java	Thu Aug 11 18:14:37 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: SystemIDResolver.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.io.File;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.serializer.utils.URI.MalformedURIException;
+import com.sun.xalan.org.apache.xml.serializer.utils.URI.MalformedURIException;
 
 /**
  * This class is used to resolve relative URIs and SystemID 
@@ -34,11 +34,11 @@
  * fact that it's declared to throw TransformerException.  Please 
  * see code comments for details on how resolution is performed.</p>
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  *
  * This class is not a public API, it is only public because it is
- * used in org.apache.xml.serializer. 
+ * used in com.sun.xalan.org.apache.xml.serializer. 
  * 
  * @xsl.usage internal
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/URI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/URI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/URI.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/URI.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: URI.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -53,7 +53,7 @@
  * default port for a specific scheme). Rather, it only knows the
  * grammar and basic set of operations that can be applied to a URI.
  *
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  * 
  * A minor change from the original is that this class no longer implements
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Utils.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Utils.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Utils.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/Utils.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Utils.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 /**
  * This class contains utilities used by the serializer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/WrappedRuntimeException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/WrappedRuntimeException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/WrappedRuntimeException.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/WrappedRuntimeException.java	Thu Aug 11 18:14:37 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: WrappedRuntimeException.java 468654 2006-10-28 07:09:23Z minchau $
  */
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 /**
  * This class is for throwing important checked exceptions
  * over non-checked methods.  It should be used with care,
  * and in limited circumstances.
  * 
- * This class is a copy of the one in org.apache.xml.utils. 
+ * This class is a copy of the one in com.sun.xalan.org.apache.xml.utils. 
  * It exists to cut the serializers dependancy on that package.
  * 
  * This class is not a public API, it is only public because it is
- * used by org.apache.xml.serializer.
+ * used by com.sun.xalan.org.apache.xml.serializer.
  * @xsl.usage internal
  */
 public final class WrappedRuntimeException extends RuntimeException
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XML11Char.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XML11Char.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XML11Char.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XML11Char.java	Thu Aug 11 18:14:37 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.Arrays;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XMLChar.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XMLChar.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XMLChar.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/serializer/utils/XMLChar.java	Thu Aug 11 18:14:37 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.xml.serializer.utils;
+package com.sun.xalan.org.apache.xml.serializer.utils;
 
 import java.util.Arrays;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/AttList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/AttList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/AttList.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/AttList.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: AttList.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/BoolStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/BoolStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/BoolStack.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/BoolStack.java	Thu Aug 11 18:14:37 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: BoolStack.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/Constants.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/Constants.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/Constants.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/Constants.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Constants.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * Primary constants used by the XSLT Processor
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOM2Helper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOM2Helper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOM2Helper.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOM2Helper.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOM2Helper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.IOException;
 
@@ -163,7 +163,7 @@
       */
 
       parser.setErrorHandler(
-        new org.apache.xml.utils.DefaultErrorHandler());
+        new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler());
 
       // if(null != m_entityResolver)
       // {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMBuilder.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMBuilder.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMBuilder.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMBuilder.java	Thu Aug 11 18:14:38 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: DOMBuilder.java 472634 2006-11-08 20:43:55Z jycli $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Stack;
 import java.util.Vector;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
@@ -467,7 +467,7 @@
   public void characters(char ch[], int start, int length) throws org.xml.sax.SAXException
   {
     if(isOutsideDocElem()
-       && org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(ch, start, length))
+       && com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(ch, start, length))
       return;  // avoid DOM006 Hierarchy request error
 
     if (m_inCData)
@@ -503,7 +503,7 @@
           throws org.xml.sax.SAXException
   {
     if(isOutsideDocElem()
-       && org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(ch, start, length))
+       && com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(ch, start, length))
       return;  // avoid DOM006 Hierarchy request error
 
 
@@ -683,7 +683,7 @@
   public void cdata(char ch[], int start, int length) throws org.xml.sax.SAXException
   {
     if(isOutsideDocElem()
-       && org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(ch, start, length))
+       && com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(ch, start, length))
       return;  // avoid DOM006 Hierarchy request error
 
     String s = new String(ch, start, length);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMHelper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMHelper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMHelper.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMHelper.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOMHelper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Hashtable;
 import java.util.Vector;
@@ -28,9 +28,9 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeProxy;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMImplementation;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMOrder.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMOrder.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMOrder.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DOMOrder.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DOMOrder.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * @deprecated Since the introduction of the DTM, this class will be removed.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DefaultErrorHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DefaultErrorHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/DefaultErrorHandler.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/DefaultErrorHandler.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: DefaultErrorHandler.java 524806 2007-04-02 15:51:39Z zongaro $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -27,8 +27,8 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ElemDesc.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ElemDesc.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ElemDesc.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ElemDesc.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ElemDesc.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Hashtable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/FastStringBuffer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/FastStringBuffer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/FastStringBuffer.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/FastStringBuffer.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: FastStringBuffer.java 469279 2006-10-30 21:18:02Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * Bare-bones, unsafe, fast string buffer. No thread-safety, no
@@ -836,7 +836,7 @@
       if (sourcechunk == 0 && m_innerFSB != null)
         chunkOK = m_innerFSB.isWhitespace(sourcecolumn, runlength);
       else
-        chunkOK = org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(
+        chunkOK = com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer.isWhiteSpace(
           m_array[sourcechunk], sourcecolumn, runlength);
 
       if (!chunkOK)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/Hashtree2Node.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/Hashtree2Node.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/Hashtree2Node.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/Hashtree2Node.java	Thu Aug 11 18:14:38 2011
@@ -19,7 +19,7 @@
  * $Id: Hashtree2Node.java 475902 2006-11-16 20:03:16Z minchau $
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -34,8 +34,8 @@
 /**
  * Simple static utility to convert Hashtable to a Node.  
  *
- * @see org.apache.xalan.xslt.EnvironmentCheck
- * @see org.apache.xalan.lib.Extensions
+ * @see com.sun.xalan.org.apache.xalan.xslt.EnvironmentCheck
+ * @see com.sun.xalan.org.apache.xalan.lib.Extensions
  * @author shane_curcuru@us.ibm.com
  * @version $Id: Hashtree2Node.java 475902 2006-11-16 20:03:16Z minchau $
  * @xsl.usage general
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/IntStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/IntStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/IntStack.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/IntStack.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: IntStack.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.EmptyStackException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/IntVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/IntVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/IntVector.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/IntVector.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: IntVector.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple table that stores a list of int.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ListingErrorHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ListingErrorHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ListingErrorHandler.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ListingErrorHandler.java	Thu Aug 11 18:14:38 2011
@@ -19,7 +19,7 @@
  * $Id: ListingErrorHandler.java 468655 2006-10-28 07:12:06Z minchau $
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -32,8 +32,8 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/LocaleUtility.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/LocaleUtility.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/LocaleUtility.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/LocaleUtility.java	Thu Aug 11 18:14:38 2011
@@ -21,7 +21,7 @@
  * $Id: LocaleUtility.java 468655 2006-10-28 07:12:06Z minchau $
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Locale;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/MutableAttrListImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/MutableAttrListImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/MutableAttrListImpl.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/MutableAttrListImpl.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: MutableAttrListImpl.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.Serializable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NSInfo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NSInfo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NSInfo.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NSInfo.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NSInfo.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * This class holds information about the namespace info
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NameSpace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NameSpace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NameSpace.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NameSpace.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NameSpace.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.Serializable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NamespaceSupport2.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NamespaceSupport2.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NamespaceSupport2.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NamespaceSupport2.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NamespaceSupport2.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.EmptyStackException;
 import java.util.Enumeration;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeConsumer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeConsumer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeConsumer.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeConsumer.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NodeConsumer.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import org.w3c.dom.Node;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeVector.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/NodeVector.java	Thu Aug 11 18:14:38 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: NodeVector.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.Serializable;
 
-import org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
 
 /**
  * A very simple table that stores a list of Nodes.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectFactory.java	Mon Nov 14 16:41:03 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectFactory.java	Thu Aug 11 18:14:38 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectPool.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectPool.java	Thu Aug 11 18:14:38 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: ObjectPool.java 475981 2006-11-16 23:35:53Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.ArrayList;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectStack.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectStack.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.EmptyStackException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectVector.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ObjectVector.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple table that stores a list of objects.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolver.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolver.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolver.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolver.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: PrefixResolver.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * The class that implements this interface can resolve prefixes to
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolverDefault.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolverDefault.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolverDefault.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/PrefixResolverDefault.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: PrefixResolverDefault.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/QName.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/QName.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/QName.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/QName.java	Thu Aug 11 18:14:38 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: QName.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.w3c.dom.Element;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/RawCharacterHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/RawCharacterHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/RawCharacterHandler.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/RawCharacterHandler.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: RawCharacterHandler.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * An interface that a Serializer/ContentHandler/ContentHandler must
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SAXSourceLocator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SAXSourceLocator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SAXSourceLocator.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SAXSourceLocator.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SAXSourceLocator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.Serializable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport.java	Thu Aug 11 18:14:38 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport12.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SecuritySupport12.java	Thu Aug 11 18:14:38 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SerializableLocatorImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SerializableLocatorImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SerializableLocatorImpl.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SerializableLocatorImpl.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SerializableLocatorImpl.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StopParseException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StopParseException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StopParseException.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StopParseException.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StopParseException.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * This is a special exception that is used to stop parsing when 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringBufferPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringBufferPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringBufferPool.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringBufferPool.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StringBufferPool.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * This class pools string buffers, since they are reused so often.
@@ -31,7 +31,7 @@
 
   /** The global pool of string buffers.   */
   private static ObjectPool m_stringBufPool =
-    new ObjectPool(org.apache.xml.utils.FastStringBuffer.class);
+    new ObjectPool(com.sun.xalan.org.apache.xml.utils.FastStringBuffer.class);
 
   /**
    * Get the first free instance of a string buffer, or create one 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringComparable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringComparable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringComparable.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringComparable.java	Thu Aug 11 18:14:38 2011
@@ -19,7 +19,7 @@
  * $Id: StringComparable.java 468655 2006-10-28 07:12:06Z minchau $
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Vector;
 import java.text.Collator;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToIntTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToIntTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToIntTable.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToIntTable.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StringToIntTable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple lookup table that stores a list of strings, the even
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTable.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTable.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StringToStringTable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple lookup table that stores a list of strings, the even
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTableVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTableVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTableVector.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringToStringTableVector.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StringToStringTableVector.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple table that stores a list of StringToStringTables, optimized
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StringVector.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StringVector.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StringVector.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple table that stores a list of strings, optimized
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StylesheetPIHandler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StylesheetPIHandler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/StylesheetPIHandler.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/StylesheetPIHandler.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StylesheetPIHandler.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -28,7 +28,7 @@
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.sax.SAXSource;
 
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedByteVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedByteVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedByteVector.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedByteVector.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SuballocatedByteVector.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple table that stores a list of byte. Very similar API to our
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedIntVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedIntVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedIntVector.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SuballocatedIntVector.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SuballocatedIntVector.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A very simple table that stores a list of int. Very similar API to our
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SystemIDResolver.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SystemIDResolver.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/SystemIDResolver.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/SystemIDResolver.java	Thu Aug 11 18:14:38 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: SystemIDResolver.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.File;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.utils.URI.MalformedURIException;
+import com.sun.xalan.org.apache.xml.utils.URI.MalformedURIException;
 
 /**
  * This class is used to resolve relative URIs and SystemID 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ThreadControllerWrapper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ThreadControllerWrapper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/ThreadControllerWrapper.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/ThreadControllerWrapper.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ThreadControllerWrapper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A utility class that wraps the ThreadController, which is used
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/TreeWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/TreeWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/TreeWalker.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/TreeWalker.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: TreeWalker.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.File;
 
@@ -267,9 +267,9 @@
   private final void dispatachChars(Node node)
      throws org.xml.sax.SAXException
   {
-    if(m_contentHandler instanceof org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler)
+    if(m_contentHandler instanceof com.sun.xalan.org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler)
     {
-      ((org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler)m_contentHandler).characters(node);
+      ((com.sun.xalan.org.apache.xml.dtm.ref.dom2dtm.DOM2DTM.CharacterNodeHandler)m_contentHandler).characters(node);
     }
     else
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/URI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/URI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/URI.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/URI.java	Thu Aug 11 18:14:38 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: URI.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 /**
  * A class to represent a Uniform Resource Identifier (URI). This class
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/UnImplNode.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/UnImplNode.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/UnImplNode.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/UnImplNode.java	Thu Aug 11 18:14:38 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: UnImplNode.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLErrorResources;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/WrappedRuntimeException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/WrappedRuntimeException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/WrappedRuntimeException.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/WrappedRuntimeException.java	Thu Aug 11 18:14:38 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WrappedRuntimeException.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * This class is for throwing important checked exceptions
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/WrongParserException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/WrongParserException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/WrongParserException.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/WrongParserException.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WrongParserException.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * Certain functions may throw this error if they are paired with
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XML11Char.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XML11Char.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XML11Char.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XML11Char.java	Thu Aug 11 18:14:39 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Arrays;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLChar.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLChar.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLChar.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLChar.java	Thu Aug 11 18:14:39 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * This class defines the basic XML character properties. The data
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLCharacterRecognizer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLCharacterRecognizer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLCharacterRecognizer.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLCharacterRecognizer.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLCharacterRecognizer.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * Class used to verify whether the specified <var>ch</var> 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLReaderManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLReaderManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLReaderManager.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLReaderManager.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLReaderManager.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Hashtable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLString.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLString.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLString.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLString.java	Thu Aug 11 18:14:39 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: XMLString.java 570109 2007-08-27 13:31:35Z zongaro $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Locale;
 
 /**
  * This class is meant to be an interface to character strings, whether they
- * be java Strings or <code>org.apache.xml.utils.FastStringBuffer</code>s, or
+ * be java Strings or <code>com.sun.xalan.org.apache.xml.utils.FastStringBuffer</code>s, or
  * other character data.  By using XMLString, character copies can be reduced
  * in the XML pipeline.
  */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringDefault.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringDefault.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringDefault.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringDefault.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLStringDefault.java 570109 2007-08-27 13:31:35Z zongaro $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 import java.util.Locale;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactory.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactory.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLStringFactory.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * A concrete class that implements this interface creates XMLString objects.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactoryDefault.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactoryDefault.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactoryDefault.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/XMLStringFactoryDefault.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XMLStringFactoryDefault.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils;
+package com.sun.xalan.org.apache.xml.utils;
 
 /**
  * The default implementation of XMLStringFactory.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/CharArrayWrapper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/CharArrayWrapper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/CharArrayWrapper.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/CharArrayWrapper.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: CharArrayWrapper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 /**
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/IntArrayWrapper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/IntArrayWrapper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/IntArrayWrapper.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/IntArrayWrapper.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: IntArrayWrapper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 /**
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/LongArrayWrapper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/LongArrayWrapper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/LongArrayWrapper.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/LongArrayWrapper.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: LongArrayWrapper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 /**
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/StringArrayWrapper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/StringArrayWrapper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/StringArrayWrapper.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/StringArrayWrapper.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: StringArrayWrapper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 /**
  *
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundle.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundle.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundle.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundle.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResourceBundle.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -34,9 +34,9 @@
 
   /** Error resource constants */
   public static final String ERROR_RESOURCES =
-    "org.apache.xalan.res.XSLTErrorResources", XSLT_RESOURCE =
-    "org.apache.xml.utils.res.XResourceBundle", LANG_BUNDLE_NAME =
-    "org.apache.xml.utils.res.XResources", MULT_ORDER =
+    "com.sun.xalan.org.apache.xalan.res.XSLTErrorResources", XSLT_RESOURCE =
+    "com.sun.xalan.org.apache.xml.utils.res.XResourceBundle", LANG_BUNDLE_NAME =
+    "com.sun.xalan.org.apache.xml.utils.res.XResources", MULT_ORDER =
     "multiplierOrder", MULT_PRECEDES = "precedes", MULT_FOLLOWS =
     "follows", LANG_ORIENTATION = "orientation", LANG_RIGHTTOLEFT =
     "rightToLeft", LANG_LEFTTORIGHT = "leftToRight", LANG_NUMBERING =
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundleBase.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundleBase.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundleBase.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResourceBundleBase.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResourceBundleBase.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 import java.util.ListResourceBundle;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_cy.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_cy.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_cy.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_cy.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_cy.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_de.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_de.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_de.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_de.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_el.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_el.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_el.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_el.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_el.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_en.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_en.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_en.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_en.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_en.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_es.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_es.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_es.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_es.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_fr.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_fr.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_fr.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_fr.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_he.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_he.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_he.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_he.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_he.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_hy.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_hy.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_hy.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_hy.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_hy.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_it.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_it.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_it.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_it.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_A.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_A.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_A.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_A.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_ja_JP_A.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HA.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HA.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HA.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HA.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_ja_JP_HA.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HI.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_HI.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_ja_JP_HI.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_I.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_I.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_I.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ja_JP_I.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_ja_JP_I.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ka.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ka.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ka.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ka.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_ka.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ko.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_ko.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_ko.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_ko.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_sv.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_sv.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_sv.java	Mon Nov 14 16:41:04 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_sv.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_sv.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_sv.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_CN.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_CN.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_CN.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_CN.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_zh_CN.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_TW.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xml/utils/res/XResources_zh_TW.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XResources_zh_TW.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xml.utils.res;
+package com.sun.xalan.org.apache.xml.utils.res;
 
 //
 //  LangResources_en.properties
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/Arg.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/Arg.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/Arg.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/Arg.java	Thu Aug 11 18:14:39 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: Arg.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
-import org.apache.xml.utils.QName;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class holds an instance of an argument on
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/CachedXPathAPI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/CachedXPathAPI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/CachedXPathAPI.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/CachedXPathAPI.java	Thu Aug 11 18:14:39 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: CachedXPathAPI.java 524811 2007-04-02 15:51:59Z zongaro $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolverDefault;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -63,12 +63,12 @@
 
   /**
    * <p>Default constructor. Establishes its own {@link XPathContext}, and hence
-   * its own {@link org.apache.xml.dtm.DTMManager}.
+   * its own {@link com.sun.xalan.org.apache.xml.dtm.DTMManager}.
    * Good choice for simple uses.</p>
    * <p>Note that any particular instance of {@link CachedXPathAPI} must not be
    * operated upon by multiple threads without synchronization; we do
    * not currently support multithreaded access to a single
-   * {@link org.apache.xml.dtm.DTM}.</p>
+   * {@link com.sun.xalan.org.apache.xml.dtm.DTM}.</p>
    */
   public CachedXPathAPI()
   {
@@ -80,11 +80,11 @@
   /**
    * <p>This constructor shares its {@link XPathContext} with a pre-existing
    * {@link CachedXPathAPI}.  That allows sharing document models
-   * ({@link org.apache.xml.dtm.DTM}) and previously established location
+   * ({@link com.sun.xalan.org.apache.xml.dtm.DTM}) and previously established location
    * state.</p>
    * <p>Note that the original {@link CachedXPathAPI} and the new one should
    * not be operated upon concurrently; we do not support multithreaded access
-   * to a single {@link org.apache.xml.dtm.DTM} at this time.  Similarly,
+   * to a single {@link com.sun.xalan.org.apache.xml.dtm.DTM} at this time.  Similarly,
    * any particular instance of {@link CachedXPathAPI} must not be operated
    * upon by multiple threads without synchronization.</p>
    * <p>%REVIEW% Should this instead do a clone-and-reset on the XPathSupport object?</p>
@@ -231,12 +231,12 @@
    *  @param contextNode The node to start searching from.
    *  @param str A valid XPath string.
    *  @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never be null.
-   *  @see org.apache.xpath.objects.XObject
-   *  @see org.apache.xpath.objects.XNull
-   *  @see org.apache.xpath.objects.XBoolean
-   *  @see org.apache.xpath.objects.XNumber
-   *  @see org.apache.xpath.objects.XString
-   *  @see org.apache.xpath.objects.XRTreeFrag
+   *  @see com.sun.xalan.org.apache.xpath.objects.XObject
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNull
+   *  @see com.sun.xalan.org.apache.xpath.objects.XBoolean
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNumber
+   *  @see com.sun.xalan.org.apache.xpath.objects.XString
+   *  @see com.sun.xalan.org.apache.xpath.objects.XRTreeFrag
    *
    * @throws TransformerException
    */
@@ -257,12 +257,12 @@
    *  @param str A valid XPath string.
    *  @param namespaceNode The node from which prefixes in the XPath will be resolved to namespaces.
    *  @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never be null.
-   *  @see org.apache.xpath.objects.XObject
-   *  @see org.apache.xpath.objects.XNull
-   *  @see org.apache.xpath.objects.XBoolean
-   *  @see org.apache.xpath.objects.XNumber
-   *  @see org.apache.xpath.objects.XString
-   *  @see org.apache.xpath.objects.XRTreeFrag
+   *  @see com.sun.xalan.org.apache.xpath.objects.XObject
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNull
+   *  @see com.sun.xalan.org.apache.xpath.objects.XBoolean
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNumber
+   *  @see com.sun.xalan.org.apache.xpath.objects.XString
+   *  @see com.sun.xalan.org.apache.xpath.objects.XRTreeFrag
    *
    * @throws TransformerException
    */
@@ -306,12 +306,12 @@
    *   @param prefixResolver Will be called if the parser encounters namespace
    *                         prefixes, to resolve the prefixes to URLs.
    *   @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never be null.
-   *   @see org.apache.xpath.objects.XObject
-   *   @see org.apache.xpath.objects.XNull
-   *   @see org.apache.xpath.objects.XBoolean
-   *   @see org.apache.xpath.objects.XNumber
-   *   @see org.apache.xpath.objects.XString
-   *   @see org.apache.xpath.objects.XRTreeFrag
+   *   @see com.sun.xalan.org.apache.xpath.objects.XObject
+   *   @see com.sun.xalan.org.apache.xpath.objects.XNull
+   *   @see com.sun.xalan.org.apache.xpath.objects.XBoolean
+   *   @see com.sun.xalan.org.apache.xpath.objects.XNumber
+   *   @see com.sun.xalan.org.apache.xpath.objects.XString
+   *   @see com.sun.xalan.org.apache.xpath.objects.XRTreeFrag
    *
    * @throws TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/Expression.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/Expression.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/Expression.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/Expression.java	Thu Aug 11 18:14:39 2011
@@ -18,24 +18,24 @@
 /*
  * $Id: Expression.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 import org.xml.sax.ContentHandler;
 
 /**
  * This abstract class serves as the base for all expression objects.  An
- * Expression can be executed to return a {@link org.apache.xpath.objects.XObject},
+ * Expression can be executed to return a {@link com.sun.xalan.org.apache.xpath.objects.XObject},
  * normally has a location within a document or DOM, can send error and warning
  * events, and normally do not hold state and are meant to be immutable once
  * construction has completed.  An exception to the immutibility rule is iterators
@@ -375,7 +375,7 @@
    *
    * @param xctxt The XPath runtime context.
    * @param msg An error msgkey that corresponds to one of the conststants found
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which
    *             may be null.
@@ -430,7 +430,7 @@
    *
    * @param xctxt The XPath runtime context.
    * @param msg An error msgkey that corresponds to one of the constants found
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which
    *             may be null.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionNode.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionNode.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionNode.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionNode.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExpressionNode.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.SourceLocator;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionOwner.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionOwner.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionOwner.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/ExpressionOwner.java	Thu Aug 11 18:14:39 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ExpressionOwner.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 /**
  * Classes that implement this interface own an expression, which 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/ExtensionsProvider.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/ExtensionsProvider.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/ExtensionsProvider.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/ExtensionsProvider.java	Thu Aug 11 18:14:39 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: ExtensionsProvider.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import java.util.Vector;
 
-import org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
 
 /**
  * Interface that XPath objects can call to obtain access to an 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/FoundIndex.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/FoundIndex.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/FoundIndex.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/FoundIndex.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: FoundIndex.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 /**
  * Class to let us know when it's time to do
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/NodeSet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/NodeSet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/NodeSet.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/NodeSet.java	Thu Aug 11 18:14:40 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: NodeSet.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.DOM2Helper;
-import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.DOM2Helper;
+import com.sun.xalan.org.apache.xpath.axes.ContextNodeList;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/NodeSetDTM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/NodeSetDTM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/NodeSetDTM.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/NodeSetDTM.java	Thu Aug 11 18:14:40 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: NodeSetDTM.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.utils.NodeVector;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/SourceTree.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/SourceTree.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/SourceTree.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/SourceTree.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SourceTree.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/SourceTreeManager.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/SourceTreeManager.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/SourceTreeManager.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/SourceTreeManager.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: SourceTreeManager.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import java.io.IOException;
 import java.util.Vector;
@@ -30,8 +30,8 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.SystemIDResolver;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.SystemIDResolver;
 
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
@@ -305,10 +305,10 @@
     {      
       Object xowner = xctxt.getOwnerObject();
       DTM dtm;
-      if(null != xowner && xowner instanceof org.apache.xml.dtm.DTMWSFilter)
+      if(null != xowner && xowner instanceof com.sun.xalan.org.apache.xml.dtm.DTMWSFilter)
       {
         dtm = xctxt.getDTM(source, false, 
-                          (org.apache.xml.dtm.DTMWSFilter)xowner, false, true);
+                          (com.sun.xalan.org.apache.xml.dtm.DTMWSFilter)xowner, false, true);
       }
       else
       {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/VariableStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/VariableStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/VariableStack.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/VariableStack.java	Thu Aug 11 18:14:40 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: VariableStack.java 524812 2007-04-02 15:52:03Z zongaro $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Defines a class to keep track of a stack for
@@ -495,11 +495,11 @@
    * @throws javax.xml.transform.TransformerException
    */
   public XObject getVariableOrParam(
-          XPathContext xctxt, org.apache.xml.utils.QName qname)
+          XPathContext xctxt, com.sun.xalan.org.apache.xml.utils.QName qname)
             throws javax.xml.transform.TransformerException
   {
 
-    org.apache.xml.utils.PrefixResolver prefixResolver =
+    com.sun.xalan.org.apache.xml.utils.PrefixResolver prefixResolver =
       xctxt.getNamespaceContext();
 
     // Get the current ElemTemplateElement, which must be pushed in as the 
@@ -508,25 +508,25 @@
     // qname.  If we reach the top level, use the StylesheetRoot's composed
     // list of top level variables and parameters.
 
-    if (prefixResolver instanceof org.apache.xalan.templates.ElemTemplateElement)
+    if (prefixResolver instanceof com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement)
     {
       
-      org.apache.xalan.templates.ElemVariable vvar;
+      com.sun.xalan.org.apache.xalan.templates.ElemVariable vvar;
 
-      org.apache.xalan.templates.ElemTemplateElement prev =
-        (org.apache.xalan.templates.ElemTemplateElement) prefixResolver;
+      com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement prev =
+        (com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement) prefixResolver;
 
-      if (!(prev instanceof org.apache.xalan.templates.Stylesheet))
+      if (!(prev instanceof com.sun.xalan.org.apache.xalan.templates.Stylesheet))
       {
-        while ( !(prev.getParentNode() instanceof org.apache.xalan.templates.Stylesheet) )
+        while ( !(prev.getParentNode() instanceof com.sun.xalan.org.apache.xalan.templates.Stylesheet) )
         {
-          org.apache.xalan.templates.ElemTemplateElement savedprev = prev;
+          com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement savedprev = prev;
 
           while (null != (prev = prev.getPreviousSiblingElem()))
           {
-            if (prev instanceof org.apache.xalan.templates.ElemVariable)
+            if (prev instanceof com.sun.xalan.org.apache.xalan.templates.ElemVariable)
             {
-              vvar = (org.apache.xalan.templates.ElemVariable) prev;
+              vvar = (com.sun.xalan.org.apache.xalan.templates.ElemVariable) prev;
 
               if (vvar.getName().equals(qname))
                 return getLocalVariable(xctxt, vvar.getIndex());
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/WhitespaceStrippingElementMatcher.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/WhitespaceStrippingElementMatcher.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/WhitespaceStrippingElementMatcher.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/WhitespaceStrippingElementMatcher.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WhitespaceStrippingElementMatcher.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.TransformerException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPath.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPath.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPath.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPath.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPath.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import java.io.Serializable;
 
@@ -26,16 +26,16 @@
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.compiler.XPathParser;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.FunctionTable;
+import com.sun.xalan.org.apache.xpath.compiler.XPathParser;
+import com.sun.xalan.org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * The XPath class wraps an expression object and provides general services 
@@ -167,7 +167,7 @@
   { 
     initFunctionTable();     
     if(null == errorListener)
-      errorListener = new org.apache.xml.utils.DefaultErrorHandler();
+      errorListener = new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler();
     
     m_patternString = exprString;
 
@@ -216,7 +216,7 @@
   { 
     m_funcTable = aTable;     
     if(null == errorListener)
-      errorListener = new org.apache.xml.utils.DefaultErrorHandler();
+      errorListener = new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler();
     
     m_patternString = exprString;
 
@@ -349,9 +349,9 @@
     }
     catch (Exception e)
     {
-      while (e instanceof org.apache.xml.utils.WrappedRuntimeException)
+      while (e instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
       {
-        e = ((org.apache.xml.utils.WrappedRuntimeException) e).getException();
+        e = ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) e).getException();
       }
       // e.printStackTrace();
 
@@ -424,9 +424,9 @@
     }
     catch (Exception e)
     {
-      while (e instanceof org.apache.xml.utils.WrappedRuntimeException)
+      while (e instanceof com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException)
       {
-        e = ((org.apache.xml.utils.WrappedRuntimeException) e).getException();
+        e = ((com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException) e).getException();
       }
       // e.printStackTrace();
 
@@ -512,7 +512,7 @@
    * @param xctxt The XPath runtime context.
    * @param sourceNode Not used.
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
@@ -565,7 +565,7 @@
    * @param xctxt The XPath runtime context.
    * @param sourceNode Not used.
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathAPI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathAPI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathAPI.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathAPI.java	Thu Aug 11 18:14:40 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: XPathAPI.java 524807 2007-04-02 15:51:43Z zongaro $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolverDefault;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -176,12 +176,12 @@
    *  @param contextNode The node to start searching from.
    *  @param str A valid XPath string.
    *  @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never be null.
-   *  @see org.apache.xpath.objects.XObject
-   *  @see org.apache.xpath.objects.XNull
-   *  @see org.apache.xpath.objects.XBoolean
-   *  @see org.apache.xpath.objects.XNumber
-   *  @see org.apache.xpath.objects.XString
-   *  @see org.apache.xpath.objects.XRTreeFrag
+   *  @see com.sun.xalan.org.apache.xpath.objects.XObject
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNull
+   *  @see com.sun.xalan.org.apache.xpath.objects.XBoolean
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNumber
+   *  @see com.sun.xalan.org.apache.xpath.objects.XString
+   *  @see com.sun.xalan.org.apache.xpath.objects.XRTreeFrag
    *
    * @throws TransformerException
    */
@@ -202,12 +202,12 @@
    *  @param str A valid XPath string.
    *  @param namespaceNode The node from which prefixes in the XPath will be resolved to namespaces.
    *  @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never be null.
-   *  @see org.apache.xpath.objects.XObject
-   *  @see org.apache.xpath.objects.XNull
-   *  @see org.apache.xpath.objects.XBoolean
-   *  @see org.apache.xpath.objects.XNumber
-   *  @see org.apache.xpath.objects.XString
-   *  @see org.apache.xpath.objects.XRTreeFrag
+   *  @see com.sun.xalan.org.apache.xpath.objects.XObject
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNull
+   *  @see com.sun.xalan.org.apache.xpath.objects.XBoolean
+   *  @see com.sun.xalan.org.apache.xpath.objects.XNumber
+   *  @see com.sun.xalan.org.apache.xpath.objects.XString
+   *  @see com.sun.xalan.org.apache.xpath.objects.XRTreeFrag
    *
    * @throws TransformerException
    */
@@ -254,12 +254,12 @@
    *   @param prefixResolver Will be called if the parser encounters namespace
    *                         prefixes, to resolve the prefixes to URLs.
    *   @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never be null.
-   *   @see org.apache.xpath.objects.XObject
-   *   @see org.apache.xpath.objects.XNull
-   *   @see org.apache.xpath.objects.XBoolean
-   *   @see org.apache.xpath.objects.XNumber
-   *   @see org.apache.xpath.objects.XString
-   *   @see org.apache.xpath.objects.XRTreeFrag
+   *   @see com.sun.xalan.org.apache.xpath.objects.XObject
+   *   @see com.sun.xalan.org.apache.xpath.objects.XNull
+   *   @see com.sun.xalan.org.apache.xpath.objects.XBoolean
+   *   @see com.sun.xalan.org.apache.xpath.objects.XNumber
+   *   @see com.sun.xalan.org.apache.xpath.objects.XString
+   *   @see com.sun.xalan.org.apache.xpath.objects.XRTreeFrag
    *
    * @throws TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathContext.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathContext.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathContext.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathContext.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPathContext.java 524809 2007-04-02 15:51:51Z zongaro $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import java.lang.reflect.Method;
 import java.util.Stack;
@@ -31,26 +31,26 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xml.utils.ObjectStack;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.DTMXRTreeFrag;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.extensions.ExpressionContext;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.dtm.DTMWSFilter;
+import com.sun.xalan.org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
+import com.sun.xalan.org.apache.xml.utils.IntStack;
+import com.sun.xalan.org.apache.xml.utils.NodeVector;
+import com.sun.xalan.org.apache.xml.utils.ObjectStack;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.axes.SubContextList;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.DTMXRTreeFrag;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 import org.xml.sax.XMLReader;
 
@@ -100,7 +100,7 @@
    * is the real DTMManager.
    */
   protected DTMManager m_dtmManager = DTMManager.newInstance(
-                   org.apache.xpath.objects.XMLStringFactoryImpl.getFactory());
+                   com.sun.xalan.org.apache.xpath.objects.XMLStringFactoryImpl.getFactory());
   
   /**
    * Return the DTMManager object.  Though XPathContext context extends 
@@ -295,7 +295,7 @@
   public DTMIterator createDTMIterator(int node)
   {
     // DescendantIterator iter = new DescendantIterator();
-    DTMIterator iter = new org.apache.xpath.axes.OneStepIteratorForward(Axis.SELF);
+    DTMIterator iter = new com.sun.xalan.org.apache.xpath.axes.OneStepIteratorForward(Axis.SELF);
     iter.setRoot(node, this);
     return iter;
     // return m_dtmManager.createDTMIterator(node);
@@ -374,7 +374,7 @@
     
   	
     m_dtmManager = DTMManager.newInstance(
-                   org.apache.xpath.objects.XMLStringFactoryImpl.getFactory());
+                   com.sun.xalan.org.apache.xpath.objects.XMLStringFactoryImpl.getFactory());
                    
     m_saxLocations.removeAllElements();   
 	m_axesIteratorStack.removeAllElements();
@@ -554,7 +554,7 @@
     if (null == retval)
     {
       if (null == m_defaultErrorListener) 
-        m_defaultErrorListener = new org.apache.xml.utils.DefaultErrorHandler();
+        m_defaultErrorListener = new com.sun.xalan.org.apache.xml.utils.DefaultErrorHandler();
       retval = m_defaultErrorListener;
     }
 
@@ -1013,7 +1013,7 @@
    * @xsl.usage internal
    */
 
-  public org.apache.xpath.axes.SubContextList getCurrentNodeList()
+  public com.sun.xalan.org.apache.xpath.axes.SubContextList getCurrentNodeList()
   {
     return m_axesIteratorStack.isEmpty()
            ? null : (SubContextList) m_axesIteratorStack.elementAt(0);
@@ -1109,7 +1109,7 @@
      */
     public org.w3c.dom.traversal.NodeIterator getContextNodes()
     {
-      return new org.apache.xml.dtm.ref.DTMNodeIterator(getContextNodeList());
+      return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator(getContextNodeList());
     }
 
     /**
@@ -1156,7 +1156,7 @@
      * @throws javax.xml.transform.TransformerException
      */
 
-    public final XObject getVariableOrParam(org.apache.xml.utils.QName qname)
+    public final XObject getVariableOrParam(com.sun.xalan.org.apache.xml.utils.QName qname)
               throws javax.xml.transform.TransformerException
     {
       return m_variableStacks.getVariableOrParam(XPathContext.this, qname);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathException.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathException.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPathException.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.TransformerException;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathFactory.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathFactory.java	Thu Aug 11 18:14:40 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XPathFactory.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
 
 /**
  * Factory class for creating an XPath.  Implementors of XPath derivatives
@@ -40,8 +40,8 @@
    *                purposes.
    * @param prefixResolver This will be called in order to resolve prefixes 
    *        to namespace URIs.
-   * @param type One of {@link org.apache.xpath.XPath#SELECT} or 
-   *             {@link org.apache.xpath.XPath#MATCH}.
+   * @param type One of {@link com.sun.xalan.org.apache.xpath.XPath#SELECT} or 
+   *             {@link com.sun.xalan.org.apache.xpath.XPath#MATCH}.
    *
    * @return an XPath ready for execution.
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathProcessorException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathProcessorException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathProcessorException.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathProcessorException.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPathProcessorException.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 /**
  * Derived from XPathException in order that XPath processor
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitable.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitable.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPathVisitable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
 /**
  * A class that implements this interface will call a XPathVisitor 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitor.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitor.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitor.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/XPathVisitor.java	Thu Aug 11 18:14:40 2011
@@ -18,19 +18,19 @@
 /*
  * $Id: XPathVisitor.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath;
+package com.sun.xalan.org.apache.xpath;
 
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.axes.UnionPathIterator;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.operations.Operation;
-import org.apache.xpath.operations.UnaryOperation;
-import org.apache.xpath.operations.Variable;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.patterns.StepPattern;
-import org.apache.xpath.patterns.UnionPattern;
+import com.sun.xalan.org.apache.xpath.axes.LocPathIterator;
+import com.sun.xalan.org.apache.xpath.axes.UnionPathIterator;
+import com.sun.xalan.org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.operations.Operation;
+import com.sun.xalan.org.apache.xpath.operations.UnaryOperation;
+import com.sun.xalan.org.apache.xpath.operations.Variable;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xpath.patterns.UnionPattern;
 
 /**
  * A derivation from this class can be passed to a class that implements 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/AttributeIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/AttributeIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/AttributeIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/AttributeIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: AttributeIterator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
 
 /**
  * This class implements an optimized iterator for
  * attribute axes patterns.
- * @see org.apache.xpath.axes#ChildTestIterator
+ * @see com.sun.xalan.org.apache.xpath.axes#ChildTestIterator
  * @xsl.usage advanced
  */
 public class AttributeIterator extends ChildTestIterator
@@ -67,7 +67,7 @@
    */
   public int getAxis()
   {
-    return org.apache.xml.dtm.Axis.ATTRIBUTE;
+    return com.sun.xalan.org.apache.xml.dtm.Axis.ATTRIBUTE;
   }
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/AxesWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/AxesWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/AxesWalker.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/AxesWalker.java	Thu Aug 11 18:14:40 2011
@@ -18,20 +18,20 @@
 /*
  * $Id: AxesWalker.java 513117 2007-03-01 03:28:52Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
 import java.util.Vector;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Serves as common interface for axes Walkers, and stores common
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/BasicTestIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/BasicTestIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/BasicTestIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/BasicTestIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: BasicTestIterator.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
 
 /**
  * Base for iterators that handle predicates.  Does the basic next 
@@ -145,7 +145,7 @@
 
     int next;
     
-    org.apache.xpath.VariableStack vars;
+    com.sun.xalan.org.apache.xpath.VariableStack vars;
     int savedStart;
     if (-1 != m_stackFrame)
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: ChildIterator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
 
 /**
  * This class implements an optimized iterator for
  * "node()" patterns, that is, any children of the
  * context node.
- * @see org.apache.xpath.axes.LocPathIterator
+ * @see com.sun.xalan.org.apache.xpath.axes.LocPathIterator
  * @xsl.usage advanced
  */
 public class ChildIterator extends LocPathIterator
@@ -114,7 +114,7 @@
    */
   public int getAxis()
   {
-    return org.apache.xml.dtm.Axis.CHILD;
+    return com.sun.xalan.org.apache.xml.dtm.Axis.CHILD;
   }
 
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildTestIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildTestIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildTestIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ChildTestIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: ChildTestIterator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
 
 /**
  * This class implements an optimized iterator for
  * children patterns that have a node test, and possibly a predicate.
- * @see org.apache.xpath.axes.BasicTestIterator
+ * @see com.sun.xalan.org.apache.xpath.axes.BasicTestIterator
  * @xsl.usage advanced
  */
 public class ChildTestIterator extends BasicTestIterator
@@ -154,7 +154,7 @@
    */
   public int getAxis()
   {
-    return org.apache.xml.dtm.Axis.CHILD;
+    return com.sun.xalan.org.apache.xml.dtm.Axis.CHILD;
   }
 
   /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ContextNodeList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ContextNodeList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ContextNodeList.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ContextNodeList.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: ContextNodeList.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeIterator;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/DescendantIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/DescendantIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/DescendantIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/DescendantIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,24 +18,24 @@
 /*
  * $Id: DescendantIterator.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpCodes;
-import org.apache.xpath.compiler.OpMap;
-import org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpCodes;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
 
 /**
  * This class implements an optimized iterator for
  * descendant, descendant-or-self, or "//foo" patterns.
- * @see org.apache.xpath.axes.LocPathIterator
+ * @see com.sun.xalan.org.apache.xpath.axes.LocPathIterator
  * @xsl.usage advanced
  */
 public class DescendantIterator extends LocPathIterator
@@ -181,7 +181,7 @@
 
     int next;
     
-    org.apache.xpath.VariableStack vars;
+    com.sun.xalan.org.apache.xpath.VariableStack vars;
     int savedStart;
     if (-1 != m_stackFrame)
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: FilterExprIterator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
 
 public class FilterExprIterator extends BasicTestIterator
 {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIteratorSimple.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIteratorSimple.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIteratorSimple.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprIteratorSimple.java	Thu Aug 11 18:14:40 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: FilterExprIteratorSimple.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
 
 /**
  * Class to use for one-step iteration that doesn't have a predicate, and 
@@ -89,7 +89,7 @@
   												boolean isTopLevel,
   												int stackFrame,
   												Expression expr )
-    throws org.apache.xml.utils.WrappedRuntimeException
+    throws com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException
   {
     PrefixResolver savedResolver = xctxt.getNamespaceContext();
     XNodeSet result = null;
@@ -113,21 +113,21 @@
         int savedStart = vars.getStackFrame();
         vars.setStackFrame(stackFrame);
 
-        result = (org.apache.xpath.objects.XNodeSet) expr.execute(xctxt);
+        result = (com.sun.xalan.org.apache.xpath.objects.XNodeSet) expr.execute(xctxt);
         result.setShouldCacheNodes(true);
 
         // These two statements need to be combined into one operation.
         vars.setStackFrame(savedStart);
       }
       else
-          result = (org.apache.xpath.objects.XNodeSet) expr.execute(xctxt);
+          result = (com.sun.xalan.org.apache.xpath.objects.XNodeSet) expr.execute(xctxt);
 
     }
     catch (javax.xml.transform.TransformerException se)
     {
 
       // TODO: Fix...
-      throw new org.apache.xml.utils.WrappedRuntimeException(se);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(se);
     }
     finally
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprWalker.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/FilterExprWalker.java	Thu Aug 11 18:14:40 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: FilterExprWalker.java 469367 2006-10-31 04:41:08Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpCodes;
-import org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpCodes;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
 
 /**
  * Walker for the OP_VARIABLE, or OP_EXTFUNCTION, or OP_FUNCTION, or OP_GROUP,
@@ -75,8 +75,8 @@
     case OpCodes.OP_VARIABLE :
       m_expr = compiler.compile(opPos);
       m_expr.exprSetParent(this);
-      //if((OpCodes.OP_FUNCTION == stepType) && (m_expr instanceof org.apache.xalan.templates.FuncKey))
-      if(m_expr instanceof org.apache.xpath.operations.Variable)
+      //if((OpCodes.OP_FUNCTION == stepType) && (m_expr instanceof com.sun.xalan.org.apache.xalan.templates.FuncKey))
+      if(m_expr instanceof com.sun.xalan.org.apache.xpath.operations.Variable)
       {
       	// hack/temp workaround
       	m_canDetachNodeset = false;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/HasPositionalPredChecker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/HasPositionalPredChecker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/HasPositionalPredChecker.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/HasPositionalPredChecker.java	Thu Aug 11 18:14:40 2011
@@ -18,22 +18,22 @@
 /*
  * $Id: HasPositionalPredChecker.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.functions.FuncLast;
-import org.apache.xpath.functions.FuncPosition;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.operations.Div;
-import org.apache.xpath.operations.Minus;
-import org.apache.xpath.operations.Mod;
-import org.apache.xpath.operations.Mult;
-import org.apache.xpath.operations.Plus;
-import org.apache.xpath.operations.Quo;
-import org.apache.xpath.operations.Variable;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.functions.FuncLast;
+import com.sun.xalan.org.apache.xpath.functions.FuncPosition;
+import com.sun.xalan.org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.operations.Div;
+import com.sun.xalan.org.apache.xpath.operations.Minus;
+import com.sun.xalan.org.apache.xpath.operations.Mod;
+import com.sun.xalan.org.apache.xpath.operations.Mult;
+import com.sun.xalan.org.apache.xpath.operations.Plus;
+import com.sun.xalan.org.apache.xpath.operations.Quo;
+import com.sun.xalan.org.apache.xpath.operations.Variable;
 
 public class HasPositionalPredChecker extends XPathVisitor
 {
@@ -106,7 +106,7 @@
          (pred instanceof Mod) ||
          (pred instanceof Quo) ||
          (pred instanceof Mult) ||
-         (pred instanceof org.apache.xpath.operations.Number) ||
+         (pred instanceof com.sun.xalan.org.apache.xpath.operations.Number) ||
          (pred instanceof Function))
           m_hasPositionalPred = true;
       else
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/IteratorPool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/IteratorPool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/IteratorPool.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/IteratorPool.java	Thu Aug 11 18:14:40 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: IteratorPool.java 475981 2006-11-16 23:35:53Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
 import java.util.ArrayList;
 
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.WrappedRuntimeException;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException;
 
 /**
  * Pool of object of a given type to pick from to help memory usage
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/LocPathIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/LocPathIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/LocPathIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/LocPathIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: LocPathIterator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * This class extends NodeSetDTM, which implements NodeIterator,
@@ -915,7 +915,7 @@
 //  }
 
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
@@ -1018,7 +1018,7 @@
 //  /**
 //   * The analysis pattern built by the WalkerFactory.
 //   * TODO: Move to LocPathIterator.
-//   * @see org.apache.xpath.axes.WalkerFactory
+//   * @see com.sun.xalan.org.apache.xpath.axes.WalkerFactory
 //   * @serial
 //   */
 //  protected int m_analysis = 0x00000000;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/MatchPatternIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/MatchPatternIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/MatchPatternIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/MatchPatternIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: MatchPatternIterator.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpMap;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
 
 /**
  * This class treats a 
@@ -207,7 +207,7 @@
 
     int next;
     
-    org.apache.xpath.VariableStack vars;
+    com.sun.xalan.org.apache.xpath.VariableStack vars;
     int savedStart;
     if (-1 != m_stackFrame)
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/NodeSequence.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/NodeSequence.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/NodeSequence.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/NodeSequence.java	Thu Aug 11 18:14:40 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: NodeSequence.java 469367 2006-10-31 04:41:08Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
 import java.util.Vector;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.utils.NodeVector;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class is the dynamic wrapper for a Xalan DTMIterator instance, and 
@@ -703,7 +703,7 @@
   }
 
   /**
-   * @see org.apache.xpath.Expression#fixupVariables(Vector, int)
+   * @see com.sun.xalan.org.apache.xpath.Expression#fixupVariables(Vector, int)
    */
   public void fixupVariables(Vector vars, int globalsSize)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: OneStepIterator.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
 
 /**
  * This class implements a general iterator for
  * those LocationSteps with only one step, and perhaps a predicate.
- * @see org.apache.xpath.axes#LocPathIterator
+ * @see com.sun.xalan.org.apache.xpath.axes#LocPathIterator
  * @xsl.usage advanced
  */
 public class OneStepIterator extends ChildTestIterator
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIteratorForward.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIteratorForward.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIteratorForward.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/OneStepIteratorForward.java	Thu Aug 11 18:14:40 2011
@@ -18,20 +18,20 @@
 /*
  * $Id: OneStepIteratorForward.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xpath.Expression;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
 
 /**
  * This class implements a general iterator for
  * those LocationSteps with only one step, and perhaps a predicate, 
  * that only go forward (i.e. it can not be used with ancestors, 
  * preceding, etc.)
- * @see org.apache.xpath.axes#ChildTestIterator
+ * @see com.sun.xalan.org.apache.xpath.axes#ChildTestIterator
  * @xsl.usage advanced
  */
 public class OneStepIteratorForward extends ChildTestIterator
@@ -62,7 +62,7 @@
   /**
    * Create a OneStepIterator object that will just traverse the self axes.
    * 
-   * @param axis One of the org.apache.xml.dtm.Axis integers.
+   * @param axis One of the com.sun.xalan.org.apache.xml.dtm.Axis integers.
    *
    * @throws javax.xml.transform.TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/PathComponent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/PathComponent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/PathComponent.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/PathComponent.java	Thu Aug 11 18:14:40 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: PathComponent.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
 /**
  * Classes who implement this information provide information needed for 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/PredicatedNodeTest.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/PredicatedNodeTest.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/PredicatedNodeTest.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/PredicatedNodeTest.java	Thu Aug 11 18:14:40 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: PredicatedNodeTest.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
 
 public abstract class PredicatedNodeTest extends NodeTest implements SubContextList
 {
@@ -255,7 +255,7 @@
         catch(Exception e)
         {
           // TODO: Fix this...
-          throw new org.apache.xml.utils.WrappedRuntimeException(e);
+          throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
         }
       }
     }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/RTFIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/RTFIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/RTFIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/RTFIterator.java	Thu Aug 11 18:14:40 2011
@@ -25,10 +25,10 @@
  * 
   * @xsl.usage advanced
   */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
 
 public class RTFIterator extends NodeSetDTM {
     static final long serialVersionUID = 7658117366258528996L;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ReverseAxesWalker.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ReverseAxesWalker.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/ReverseAxesWalker.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/ReverseAxesWalker.java	Thu Aug 11 18:14:40 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: ReverseAxesWalker.java 513117 2007-03-01 03:28:52Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * Walker for a reverse axes.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/SelfIteratorNoPredicate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/SelfIteratorNoPredicate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/SelfIteratorNoPredicate.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/SelfIteratorNoPredicate.java	Thu Aug 11 18:14:40 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: SelfIteratorNoPredicate.java 469263 2006-10-30 20:45:40Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
 
 /**
  * This class implements an optimized iterator for
  * "." patterns, that is, the self axes without any predicates.  
- * @see org.apache.xpath.axes.LocPathIterator
+ * @see com.sun.xalan.org.apache.xpath.axes.LocPathIterator
  * @xsl.usage advanced
  */
 public class SelfIteratorNoPredicate extends LocPathIterator
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/SubContextList.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/SubContextList.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/SubContextList.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/SubContextList.java	Thu Aug 11 18:14:40 2011
@@ -18,9 +18,9 @@
 /*
  * $Id: SubContextList.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathContext;
  
 /**
  * A class that implements this interface is a sub context node list, meaning it
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionChildIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionChildIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionChildIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionChildIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: UnionChildIterator.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
 
 /**
  * This class defines a simplified type of union iterator that only 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionPathIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionPathIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionPathIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/UnionPathIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: UnionPathIterator.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpCodes;
-import org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpCodes;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
 
 /**
  * This class extends NodeSetDTM, which implements DTMIterator,
@@ -86,7 +86,7 @@
     }
     catch(Exception e)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(e);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(e);
     }
   }
   
@@ -360,7 +360,7 @@
         if(compiler.getLocationPathDepth() <= 0)
           iter.setIsTopLevel(true);
 
-        iter.m_firstWalker = new org.apache.xpath.axes.FilterExprWalker(iter);
+        iter.m_firstWalker = new com.sun.xalan.org.apache.xpath.axes.FilterExprWalker(iter);
 
         iter.m_firstWalker.init(compiler, opPos, steptype);
 
@@ -532,7 +532,7 @@
   }
 
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkerFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkerFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkerFactory.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkerFactory.java	Thu Aug 11 18:14:40 2011
@@ -18,23 +18,23 @@
 /*
  * $Id: WalkerFactory.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.compiler.OpCodes;
-import org.apache.xpath.compiler.OpMap;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.patterns.ContextMatchStepPattern;
-import org.apache.xpath.patterns.FunctionPattern;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.patterns.StepPattern;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.FunctionTable;
+import com.sun.xalan.org.apache.xpath.compiler.OpCodes;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.patterns.ContextMatchStepPattern;
+import com.sun.xalan.org.apache.xpath.patterns.FunctionPattern;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * This class is both a factory for XPath location path expressions,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIterator.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIterator.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIterator.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIterator.java	Thu Aug 11 18:14:40 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: WalkingIterator.java 469314 2006-10-30 23:31:59Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.compiler.OpMap;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.compiler.OpMap;
 
 /**
  * Location path iterator that uses Walkers.
@@ -297,7 +297,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIteratorSorted.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIteratorSorted.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIteratorSorted.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/axes/WalkingIteratorSorted.java	Thu Aug 11 18:14:41 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: WalkingIteratorSorted.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.axes;
+package com.sun.xalan.org.apache.xpath.axes;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
 
 /**
  * This class iterates over set of nodes that needs to be sorted.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Compiler.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Compiler.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Compiler.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Compiler.java	Thu Aug 11 18:14:41 2011
@@ -18,50 +18,50 @@
 /*
  * $Id: Compiler.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.axes.UnionPathIterator;
-import org.apache.xpath.axes.WalkerFactory;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.functions.FuncExtFunctionAvailable;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.functions.WrongNumberArgsException;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.operations.And;
-import org.apache.xpath.operations.Div;
-import org.apache.xpath.operations.Equals;
-import org.apache.xpath.operations.Gt;
-import org.apache.xpath.operations.Gte;
-import org.apache.xpath.operations.Lt;
-import org.apache.xpath.operations.Lte;
-import org.apache.xpath.operations.Minus;
-import org.apache.xpath.operations.Mod;
-import org.apache.xpath.operations.Mult;
-import org.apache.xpath.operations.Neg;
-import org.apache.xpath.operations.NotEquals;
-import org.apache.xpath.operations.Operation;
-import org.apache.xpath.operations.Or;
-import org.apache.xpath.operations.Plus;
-import org.apache.xpath.operations.UnaryOperation;
-import org.apache.xpath.operations.Variable;
-import org.apache.xpath.patterns.FunctionPattern;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.patterns.StepPattern;
-import org.apache.xpath.patterns.UnionPattern;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xml.utils.SAXSourceLocator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.axes.UnionPathIterator;
+import com.sun.xalan.org.apache.xpath.axes.WalkerFactory;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunctionAvailable;
+import com.sun.xalan.org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xpath.functions.WrongNumberArgsException;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.operations.And;
+import com.sun.xalan.org.apache.xpath.operations.Div;
+import com.sun.xalan.org.apache.xpath.operations.Equals;
+import com.sun.xalan.org.apache.xpath.operations.Gt;
+import com.sun.xalan.org.apache.xpath.operations.Gte;
+import com.sun.xalan.org.apache.xpath.operations.Lt;
+import com.sun.xalan.org.apache.xpath.operations.Lte;
+import com.sun.xalan.org.apache.xpath.operations.Minus;
+import com.sun.xalan.org.apache.xpath.operations.Mod;
+import com.sun.xalan.org.apache.xpath.operations.Mult;
+import com.sun.xalan.org.apache.xpath.operations.Neg;
+import com.sun.xalan.org.apache.xpath.operations.NotEquals;
+import com.sun.xalan.org.apache.xpath.operations.Operation;
+import com.sun.xalan.org.apache.xpath.operations.Or;
+import com.sun.xalan.org.apache.xpath.operations.Plus;
+import com.sun.xalan.org.apache.xpath.operations.UnaryOperation;
+import com.sun.xalan.org.apache.xpath.operations.Variable;
+import com.sun.xalan.org.apache.xpath.patterns.FunctionPattern;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xpath.patterns.UnionPattern;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * An instance of this class compiles an XPath string expression into 
@@ -202,7 +202,7 @@
    * @param operation non-null reference to parent operation.
    * @param opPos The op map position of the parent operation.
    *
-   * @return reference to {@link org.apache.xpath.operations.Operation} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Operation} instance.
    *
    * @throws TransformerException if there is a syntax or other error.
    */
@@ -244,7 +244,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Or} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Or} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -258,7 +258,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.And} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.And} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -272,7 +272,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.NotEquals} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.NotEquals} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -286,7 +286,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Equals} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Equals} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -300,7 +300,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Lte} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Lte} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -314,7 +314,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Lt} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Lt} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -328,7 +328,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Gte} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Gte} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -342,7 +342,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Gt} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Gt} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -356,7 +356,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Plus} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Plus} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -370,7 +370,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Minus} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Minus} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -384,7 +384,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Mult} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Mult} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -398,7 +398,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Div} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Div} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -412,7 +412,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Mod} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Mod} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -426,7 +426,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Quo} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Quo} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -440,7 +440,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Neg} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Neg} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -454,13 +454,13 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.String} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.String} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
   protected Expression string(int opPos) throws TransformerException
   {
-    return compileUnary(new org.apache.xpath.operations.String(), opPos);
+    return compileUnary(new com.sun.xalan.org.apache.xpath.operations.String(), opPos);
   }
 
   /**
@@ -468,13 +468,13 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Bool} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Bool} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
   protected Expression bool(int opPos) throws TransformerException
   {
-    return compileUnary(new org.apache.xpath.operations.Bool(), opPos);
+    return compileUnary(new com.sun.xalan.org.apache.xpath.operations.Bool(), opPos);
   }
 
   /**
@@ -482,13 +482,13 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Number} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Number} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
   protected Expression number(int opPos) throws TransformerException
   {
-    return compileUnary(new org.apache.xpath.operations.Number(), opPos);
+    return compileUnary(new com.sun.xalan.org.apache.xpath.operations.Number(), opPos);
   }
 
   /**
@@ -496,7 +496,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.objects.XString} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.objects.XString} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -513,7 +513,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.objects.XNumber} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.objects.XNumber} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -530,7 +530,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.operations.Variable} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.operations.Variable} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -588,11 +588,11 @@
 
   /**
    * Compile a location path union. The UnionPathIterator itself may create
-   * {@link org.apache.xpath.axes.LocPathIterator} children.
+   * {@link com.sun.xalan.org.apache.xpath.axes.LocPathIterator} children.
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.axes.LocPathIterator} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.axes.LocPathIterator} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -630,11 +630,11 @@
 
   /**
    * Compile a location path.  The LocPathIterator itself may create
-   * {@link org.apache.xpath.axes.AxesWalker} children.
+   * {@link com.sun.xalan.org.apache.xpath.axes.AxesWalker} children.
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.axes.LocPathIterator} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.axes.LocPathIterator} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -671,7 +671,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.patterns.UnionPattern} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.patterns.UnionPattern} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -717,7 +717,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.patterns.StepPattern} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.patterns.StepPattern} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -814,7 +814,7 @@
    * @param stepCount The number of steps to expect.
    * @param ancestorPattern The owning StepPattern, which may be null.
    *
-   * @return reference to {@link org.apache.xpath.patterns.StepPattern} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.patterns.StepPattern} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -940,7 +940,7 @@
    * 
    * @param opPos The position of the first predicate the m_opMap array.
    *
-   * @return reference to array of {@link org.apache.xpath.Expression} instances.
+   * @return reference to array of {@link com.sun.xalan.org.apache.xpath.Expression} instances.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -991,7 +991,7 @@
    *
    * @param opPos The position of the first predicate the m_opMap array.
    * @param predicates An empty pre-determined array of 
-   *            {@link org.apache.xpath.Expression}s, that will be filled in.
+   *            {@link com.sun.xalan.org.apache.xpath.Expression}s, that will be filled in.
    *
    * @throws TransformerException
    */
@@ -1011,7 +1011,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.functions.Function} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.functions.Function} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -1093,7 +1093,7 @@
    * 
    * @param opPos The current position in the m_opMap array.
    *
-   * @return reference to {@link org.apache.xpath.functions.FuncExtFunction} instance.
+   * @return reference to {@link com.sun.xalan.org.apache.xpath.functions.FuncExtFunction} instance.
    *
    * @throws TransformerException if a error occurs creating the Expression.
    */
@@ -1147,7 +1147,7 @@
    * Warn the user of an problem.
    *
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
@@ -1200,7 +1200,7 @@
    * exception.
    *
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/FunctionTable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/FunctionTable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/FunctionTable.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/FunctionTable.java	Thu Aug 11 18:14:41 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: FunctionTable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
-import org.apache.xpath.Expression;
-import org.apache.xpath.functions.Function;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.functions.Function;
 import java.util.HashMap;
 import javax.xml.transform.TransformerException;
 
@@ -175,57 +175,57 @@
   static
   {
     m_functions = new Class[NUM_BUILT_IN_FUNCS];
-    m_functions[FUNC_CURRENT] = org.apache.xpath.functions.FuncCurrent.class;
-    m_functions[FUNC_LAST] = org.apache.xpath.functions.FuncLast.class;
-    m_functions[FUNC_POSITION] = org.apache.xpath.functions.FuncPosition.class;
-    m_functions[FUNC_COUNT] = org.apache.xpath.functions.FuncCount.class;
-    m_functions[FUNC_ID] = org.apache.xpath.functions.FuncId.class;
+    m_functions[FUNC_CURRENT] = com.sun.xalan.org.apache.xpath.functions.FuncCurrent.class;
+    m_functions[FUNC_LAST] = com.sun.xalan.org.apache.xpath.functions.FuncLast.class;
+    m_functions[FUNC_POSITION] = com.sun.xalan.org.apache.xpath.functions.FuncPosition.class;
+    m_functions[FUNC_COUNT] = com.sun.xalan.org.apache.xpath.functions.FuncCount.class;
+    m_functions[FUNC_ID] = com.sun.xalan.org.apache.xpath.functions.FuncId.class;
     m_functions[FUNC_KEY] =
-      org.apache.xalan.templates.FuncKey.class;
+      com.sun.xalan.org.apache.xalan.templates.FuncKey.class;
     m_functions[FUNC_LOCAL_PART] = 
-      org.apache.xpath.functions.FuncLocalPart.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncLocalPart.class;
     m_functions[FUNC_NAMESPACE] = 
-      org.apache.xpath.functions.FuncNamespace.class;
-    m_functions[FUNC_QNAME] = org.apache.xpath.functions.FuncQname.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncNamespace.class;
+    m_functions[FUNC_QNAME] = com.sun.xalan.org.apache.xpath.functions.FuncQname.class;
     m_functions[FUNC_GENERATE_ID] = 
-      org.apache.xpath.functions.FuncGenerateId.class;
-    m_functions[FUNC_NOT] = org.apache.xpath.functions.FuncNot.class;
-    m_functions[FUNC_TRUE] = org.apache.xpath.functions.FuncTrue.class;
-    m_functions[FUNC_FALSE] = org.apache.xpath.functions.FuncFalse.class;
-    m_functions[FUNC_BOOLEAN] = org.apache.xpath.functions.FuncBoolean.class;
-    m_functions[FUNC_LANG] = org.apache.xpath.functions.FuncLang.class;
-    m_functions[FUNC_NUMBER] = org.apache.xpath.functions.FuncNumber.class;
-    m_functions[FUNC_FLOOR] = org.apache.xpath.functions.FuncFloor.class;
-    m_functions[FUNC_CEILING] = org.apache.xpath.functions.FuncCeiling.class;
-    m_functions[FUNC_ROUND] = org.apache.xpath.functions.FuncRound.class;
-    m_functions[FUNC_SUM] = org.apache.xpath.functions.FuncSum.class;
-    m_functions[FUNC_STRING] = org.apache.xpath.functions.FuncString.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncGenerateId.class;
+    m_functions[FUNC_NOT] = com.sun.xalan.org.apache.xpath.functions.FuncNot.class;
+    m_functions[FUNC_TRUE] = com.sun.xalan.org.apache.xpath.functions.FuncTrue.class;
+    m_functions[FUNC_FALSE] = com.sun.xalan.org.apache.xpath.functions.FuncFalse.class;
+    m_functions[FUNC_BOOLEAN] = com.sun.xalan.org.apache.xpath.functions.FuncBoolean.class;
+    m_functions[FUNC_LANG] = com.sun.xalan.org.apache.xpath.functions.FuncLang.class;
+    m_functions[FUNC_NUMBER] = com.sun.xalan.org.apache.xpath.functions.FuncNumber.class;
+    m_functions[FUNC_FLOOR] = com.sun.xalan.org.apache.xpath.functions.FuncFloor.class;
+    m_functions[FUNC_CEILING] = com.sun.xalan.org.apache.xpath.functions.FuncCeiling.class;
+    m_functions[FUNC_ROUND] = com.sun.xalan.org.apache.xpath.functions.FuncRound.class;
+    m_functions[FUNC_SUM] = com.sun.xalan.org.apache.xpath.functions.FuncSum.class;
+    m_functions[FUNC_STRING] = com.sun.xalan.org.apache.xpath.functions.FuncString.class;
     m_functions[FUNC_STARTS_WITH] = 
-      org.apache.xpath.functions.FuncStartsWith.class;
-    m_functions[FUNC_CONTAINS] = org.apache.xpath.functions.FuncContains.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncStartsWith.class;
+    m_functions[FUNC_CONTAINS] = com.sun.xalan.org.apache.xpath.functions.FuncContains.class;
     m_functions[FUNC_SUBSTRING_BEFORE] = 
-      org.apache.xpath.functions.FuncSubstringBefore.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncSubstringBefore.class;
     m_functions[FUNC_SUBSTRING_AFTER] = 
-      org.apache.xpath.functions.FuncSubstringAfter.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncSubstringAfter.class;
     m_functions[FUNC_NORMALIZE_SPACE] = 
-      org.apache.xpath.functions.FuncNormalizeSpace.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncNormalizeSpace.class;
     m_functions[FUNC_TRANSLATE] = 
-      org.apache.xpath.functions.FuncTranslate.class;
-    m_functions[FUNC_CONCAT] = org.apache.xpath.functions.FuncConcat.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncTranslate.class;
+    m_functions[FUNC_CONCAT] = com.sun.xalan.org.apache.xpath.functions.FuncConcat.class;
     m_functions[FUNC_SYSTEM_PROPERTY] = 
-      org.apache.xpath.functions.FuncSystemProperty.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncSystemProperty.class;
     m_functions[FUNC_EXT_FUNCTION_AVAILABLE] =
-      org.apache.xpath.functions.FuncExtFunctionAvailable.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncExtFunctionAvailable.class;
     m_functions[FUNC_EXT_ELEM_AVAILABLE] =
-      org.apache.xpath.functions.FuncExtElementAvailable.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncExtElementAvailable.class;
     m_functions[FUNC_SUBSTRING] = 
-      org.apache.xpath.functions.FuncSubstring.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncSubstring.class;
     m_functions[FUNC_STRING_LENGTH] = 
-      org.apache.xpath.functions.FuncStringLength.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncStringLength.class;
     m_functions[FUNC_DOCLOCATION] = 
-      org.apache.xpath.functions.FuncDoclocation.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncDoclocation.class;
     m_functions[FUNC_UNPARSED_ENTITY_URI] =
-      org.apache.xpath.functions.FuncUnparsedEntityURI.class;
+      com.sun.xalan.org.apache.xpath.functions.FuncUnparsedEntityURI.class;
   }
 
   static{
@@ -317,7 +317,7 @@
    * Obtain a new Function object from a function ID.
    *
    * @param which  The function ID, which may correspond to one of the FUNC_XXX 
-   *    values found in {@link org.apache.xpath.compiler.FunctionTable}, but may 
+   *    values found in {@link com.sun.xalan.org.apache.xpath.compiler.FunctionTable}, but may 
    *    be a value installed by an external module. 
    *
    * @return a a new Function instance.
@@ -345,7 +345,7 @@
    * Obtain a function ID from a given function name
    * @param key the function name in a java.lang.String format.
    * @return a function ID, which may correspond to one of the FUNC_XXX values
-   * found in {@link org.apache.xpath.compiler.FunctionTable}, but may be a 
+   * found in {@link com.sun.xalan.org.apache.xpath.compiler.FunctionTable}, but may be a 
    * value installed by an external module.
    */
   Object getFunctionID(String key){
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Keywords.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Keywords.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Keywords.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Keywords.java	Thu Aug 11 18:14:41 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: Keywords.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 import java.util.Hashtable;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Lexer.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Lexer.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Lexer.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/Lexer.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: Lexer.java 524810 2007-04-02 15:51:55Z zongaro $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 import java.util.Vector;
 
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * This class is in charge of lexical processing of the XPath
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpCodes.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpCodes.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpCodes.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpCodes.java	Thu Aug 11 18:14:41 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: OpCodes.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 /**
  * Operations codes for XPath.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMap.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMap.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMap.java	Mon Nov 14 16:41:05 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMap.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: OpMap.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.ObjectVector;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.ObjectVector;
+import com.sun.xalan.org.apache.xpath.patterns.NodeTest;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * This class represents the data structure basics of the XPath
@@ -292,7 +292,7 @@
     }
     else
     {
-      error(org.apache.xpath.res.XPATHErrorResources.ER_UNKNOWN_OPCODE,
+      error(com.sun.xalan.org.apache.xpath.res.XPATHErrorResources.ER_UNKNOWN_OPCODE,
             new Object[]{ String.valueOf(stepType) });  //"ERROR! Unknown op code: "+m_opMap[opPos]);
       return -1;
     }
@@ -303,7 +303,7 @@
    * exception.
    *
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
@@ -314,7 +314,7 @@
   public void error(String msg, Object[] args) throws javax.xml.transform.TransformerException
   {
 
-    java.lang.String fmsg = org.apache.xalan.res.XSLMessages.createXPATHMessage(msg, args);
+    java.lang.String fmsg = com.sun.xalan.org.apache.xalan.res.XSLMessages.createXPATHMessage(msg, args);
     
 
     throw new javax.xml.transform.TransformerException(fmsg);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMapVector.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMapVector.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMapVector.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/OpMapVector.java	Thu Aug 11 18:14:41 2011
@@ -19,7 +19,7 @@
  * $Id$
  */
 
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 /**
  * 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/PsuedoNames.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/PsuedoNames.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/PsuedoNames.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/PsuedoNames.java	Thu Aug 11 18:14:41 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: PsuedoNames.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 /**
  * This is used to represent names of nodes that may not be named, like a 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathDumper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathDumper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathDumper.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathDumper.java	Thu Aug 11 18:14:41 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPathDumper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathParser.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathParser.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathParser.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/compiler/XPathParser.java	Thu Aug 11 18:14:41 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: XPathParser.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.compiler;
+package com.sun.xalan.org.apache.xpath.compiler;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.XPathProcessorException;
-import org.apache.xpath.domapi.XPathStylesheetDOM3Exception;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.XPathProcessorException;
+import com.sun.xalan.org.apache.xpath.domapi.XPathStylesheetDOM3Exception;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Tokenizes and parses XPath expressions. This should really be named
@@ -147,7 +147,7 @@
       }
 
     } 
-    catch (org.apache.xpath.XPathProcessorException e)
+    catch (com.sun.xalan.org.apache.xpath.XPathProcessorException e)
     {
 	  if(CONTINUE_AFTER_FATAL_ERROR.equals(e.getMessage()))
 	  {
@@ -540,7 +540,7 @@
    * Warn the user of a problem.
    *
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
@@ -593,7 +593,7 @@
    * exception.
    *
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
@@ -638,7 +638,7 @@
    * and take appropriate action.
    * 
    * @param msg An error msgkey that corresponds to one of the constants found 
-   *            in {@link org.apache.xpath.res.XPATHErrorResources}, which is 
+   *            in {@link com.sun.xalan.org.apache.xpath.res.XPATHErrorResources}, which is 
    *            a key for a format string.
    * @param args An array of arguments represented in the format string, which 
    *             may be null.
@@ -704,7 +704,7 @@
    * @param key A local name of a function.
    *
    * @return   The function ID, which may correspond to one of the FUNC_XXX 
-   *    values found in {@link org.apache.xpath.compiler.FunctionTable}, but may 
+   *    values found in {@link com.sun.xalan.org.apache.xpath.compiler.FunctionTable}, but may 
    *    be a value installed by an external module.
    */
   final int getFunctionToken(String key)
@@ -1795,7 +1795,7 @@
    * Basis    ::=    AxisName '::' NodeTest
    * | AbbreviatedBasis
    *
-   * @return FROM_XXX axes type, found in {@link org.apache.xpath.compiler.Keywords}.
+   * @return FROM_XXX axes type, found in {@link com.sun.xalan.org.apache.xpath.compiler.Keywords}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -1823,7 +1823,7 @@
    * | NodeType '(' ')'
    * | 'processing-instruction' '(' Literal ')'
    *
-   * @param axesType FROM_XXX axes type, found in {@link org.apache.xpath.compiler.Keywords}.
+   * @param axesType FROM_XXX axes type, found in {@link com.sun.xalan.org.apache.xpath.compiler.Keywords}.
    *
    * @throws javax.xml.transform.TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathEvaluatorImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathEvaluatorImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathEvaluatorImpl.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathEvaluatorImpl.java	Thu Aug 11 18:14:41 2011
@@ -19,14 +19,14 @@
  * $Id$
  */
 
-package org.apache.xpath.domapi;
+package com.sun.xalan.org.apache.xpath.domapi;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.XPath;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.res.XPATHMessages;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xpath.res.XPATHMessages;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -75,7 +75,7 @@
 		 * @exception DOMException
     	 *   NAMESPACE_ERR: Always throws this exceptionn
 		 *
-		 * @see org.apache.xml.utils.PrefixResolver#getNamespaceForPrefix(String, Node)
+		 * @see com.sun.xalan.org.apache.xml.utils.PrefixResolver#getNamespaceForPrefix(String, Node)
 		 */
 		public String getNamespaceForPrefix(String prefix, Node context) {
             String fmsg = XPATHMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_RESOLVER, null);       
@@ -86,21 +86,21 @@
 		 * @exception DOMException
     	 *   NAMESPACE_ERR: Always throws this exceptionn
     	 * 
-		 * @see org.apache.xml.utils.PrefixResolver#getNamespaceForPrefix(String)
+		 * @see com.sun.xalan.org.apache.xml.utils.PrefixResolver#getNamespaceForPrefix(String)
 		 */
 		public String getNamespaceForPrefix(String prefix) {
 			return getNamespaceForPrefix(prefix,null);
 		}
 
 		/**
-		 * @see org.apache.xml.utils.PrefixResolver#handlesNullPrefixes()
+		 * @see com.sun.xalan.org.apache.xml.utils.PrefixResolver#handlesNullPrefixes()
 		 */
 		public boolean handlesNullPrefixes() {
 			return false;
 		}
 
 		/**
-		 * @see org.apache.xml.utils.PrefixResolver#getBaseIdentifier()
+		 * @see com.sun.xalan.org.apache.xml.utils.PrefixResolver#getBaseIdentifier()
 		 */
 		public String getBaseIdentifier() {
 			return null;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathExpressionImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathExpressionImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathExpressionImpl.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathExpressionImpl.java	Thu Aug 11 18:14:41 2011
@@ -20,15 +20,15 @@
  */
 
 
-package org.apache.xpath.domapi;
+package com.sun.xalan.org.apache.xpath.domapi;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.res.XPATHMessages;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xpath.res.XPATHMessages;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNSResolverImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNSResolverImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNSResolverImpl.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNSResolverImpl.java	Thu Aug 11 18:14:41 2011
@@ -19,9 +19,9 @@
  * $Id$
  */
 
-package org.apache.xpath.domapi;
+package com.sun.xalan.org.apache.xpath.domapi;
 
-import org.apache.xml.utils.PrefixResolverDefault;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolverDefault;
 import org.w3c.dom.Node;
 import org.w3c.dom.xpath.XPathNSResolver;
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNamespaceImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNamespaceImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNamespaceImpl.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathNamespaceImpl.java	Thu Aug 11 18:14:41 2011
@@ -20,7 +20,7 @@
  */
 
 
-package org.apache.xpath.domapi;
+package com.sun.xalan.org.apache.xpath.domapi;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
@@ -84,7 +84,7 @@
     }
 
     /**
-     * @see org.apache.xalan.dom3.xpath.XPathNamespace#getOwnerElement()
+     * @see com.sun.xalan.org.apache.xalan.dom3.xpath.XPathNamespace#getOwnerElement()
      */
     public Element getOwnerElement() {
         return ((Attr)m_attributeNode).getOwnerElement(); 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathResultImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathResultImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathResultImpl.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathResultImpl.java	Thu Aug 11 18:14:41 2011
@@ -20,14 +20,14 @@
  */
 
 
-package org.apache.xpath.domapi;
+package com.sun.xalan.org.apache.xpath.domapi;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.res.XPATHMessages;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xpath.res.XPATHMessages;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -53,7 +53,7 @@
  * 
  * <p>This implementation wraps an <code>XObject</code>.
  * 
- * @see org.apache.xpath.objects.XObject
+ * @see com.sun.xalan.org.apache.xpath.objects.XObject
  * @see org.w3c.dom.xpath.XPathResult
  * 
  * @xsl.usage internal
@@ -72,7 +72,7 @@
 		
 	/**
      *  This the type specified by the user during construction.  Typically
-	 *  the constructor will be called by org.apache.xpath.XPath.evaluate().
+	 *  the constructor will be called by com.sun.xalan.org.apache.xpath.XPath.evaluate().
      */
 	final private short m_resultType; 
 	
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java	Thu Aug 11 18:14:41 2011
@@ -10,7 +10,7 @@
  * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
  */
 
-package org.apache.xpath.domapi;
+package com.sun.xalan.org.apache.xpath.domapi;
 
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncBoolean.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncBoolean.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncBoolean.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncBoolean.java	Thu Aug 11 18:14:41 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncBoolean.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Boolean() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCeiling.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCeiling.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCeiling.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCeiling.java	Thu Aug 11 18:14:41 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncCeiling.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Ceiling() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncConcat.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncConcat.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncConcat.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncConcat.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncConcat.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the Concat() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncContains.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncContains.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncContains.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncContains.java	Thu Aug 11 18:14:41 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncContains.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Contains() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCount.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCount.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCount.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCount.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncCount.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Count() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCurrent.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCurrent.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCurrent.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncCurrent.java	Thu Aug 11 18:14:41 2011
@@ -18,19 +18,19 @@
 /*
  * $Id: FuncCurrent.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.axes.PredicatedNodeTest;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.patterns.StepPattern;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.LocPathIterator;
+import com.sun.xalan.org.apache.xpath.axes.PredicatedNodeTest;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.axes.SubContextList;
+import com.sun.xalan.org.apache.xpath.patterns.StepPattern;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLTErrorResources;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncDoclocation.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncDoclocation.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncDoclocation.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncDoclocation.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncDoclocation.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the proprietary document-location() function, which returns
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtElementAvailable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtElementAvailable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtElementAvailable.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtElementAvailable.java	Thu Aug 11 18:14:41 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: FuncExtElementAvailable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xalan.transformer.TransformerImpl;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.ExtensionsProvider;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the ExtElementAvailable() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunction.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunction.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunction.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunction.java	Thu Aug 11 18:14:41 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: FuncExtFunction.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 import java.util.Vector;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionNode;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XNull;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.res.XPATHMessages;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionNode;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.ExtensionsProvider;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XNull;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xpath.res.XPATHMessages;
 
 /**
  * An object of this class represents an extension call expression.  When
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunctionAvailable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunctionAvailable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunctionAvailable.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncExtFunctionAvailable.java	Thu Aug 11 18:14:41 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: FuncExtFunctionAvailable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.templates.Constants;
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.templates.Constants;
+import com.sun.xalan.org.apache.xpath.ExtensionsProvider;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.compiler.FunctionTable;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the ExtFunctionAvailable() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFalse.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFalse.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFalse.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFalse.java	Thu Aug 11 18:14:41 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncFalse.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the False() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFloor.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFloor.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFloor.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncFloor.java	Thu Aug 11 18:14:41 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncFloor.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Floor() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncGenerateId.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncGenerateId.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncGenerateId.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncGenerateId.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncGenerateId.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the GenerateId() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncId.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncId.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncId.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncId.java	Thu Aug 11 18:14:41 2011
@@ -18,18 +18,18 @@
 /*
  * $Id: FuncId.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 import java.util.StringTokenizer;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.StringVector;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.StringVector;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Execute the Id() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLang.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLang.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLang.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLang.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncLang.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Lang() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLast.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLast.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLast.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLast.java	Thu Aug 11 18:14:41 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: FuncLast.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.SubContextList;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLocalPart.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLocalPart.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLocalPart.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncLocalPart.java	Thu Aug 11 18:14:41 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncLocalPart.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the LocalPart() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNamespace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNamespace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNamespace.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNamespace.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncNamespace.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the Namespace() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNormalizeSpace.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNormalizeSpace.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNormalizeSpace.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNormalizeSpace.java	Thu Aug 11 18:14:42 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: FuncNormalizeSpace.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 import org.xml.sax.ContentHandler;
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNot.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNot.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNot.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNot.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncNot.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Not() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNumber.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNumber.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNumber.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncNumber.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncNumber.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Number() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncPosition.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncPosition.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncPosition.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncPosition.java	Thu Aug 11 18:14:42 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: FuncPosition.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.SubContextList;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Position() function.
@@ -90,7 +90,7 @@
         }
         catch(CloneNotSupportedException cnse)
         {
-          throw new org.apache.xml.utils.WrappedRuntimeException(cnse);
+          throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(cnse);
         }
         int currentNode = xctxt.getContextNode();
         // System.out.println("currentNode: "+currentNode);
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncQname.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncQname.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncQname.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncQname.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncQname.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the Qname() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncRound.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncRound.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncRound.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncRound.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncRound.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the round() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStartsWith.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStartsWith.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStartsWith.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStartsWith.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncStartsWith.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the StartsWith() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncString.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncString.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncString.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncString.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncString.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the String() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStringLength.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStringLength.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStringLength.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncStringLength.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncStringLength.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the StringLength() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstring.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstring.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstring.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstring.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: FuncSubstring.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Execute the Substring() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringAfter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringAfter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringAfter.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringAfter.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncSubstringAfter.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the SubstringAfter() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringBefore.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringBefore.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringBefore.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSubstringBefore.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncSubstringBefore.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the SubstringBefore() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSum.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSum.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSum.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSum.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: FuncSum.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the Sum() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSystemProperty.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSystemProperty.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSystemProperty.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncSystemProperty.java	Thu Aug 11 18:14:42 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: FuncSystemProperty.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Execute the SystemProperty() function.
@@ -40,10 +40,10 @@
   /**
    * The path/filename of the property file: XSLTInfo.properties
    * Maintenance note: see also
-   * org.apache.xalan.processor.TransformerFactoryImpl.XSLT_PROPERTIES
+   * com.sun.xalan.org.apache.xalan.processor.TransformerFactoryImpl.XSLT_PROPERTIES
    */
   static final String XSLT_PROPERTIES = 
-            "org/apache/xalan/res/XSLTInfo.properties";
+            "com.sun.xalan.org.apache.xalan/res/XSLTInfo.properties";
 
   /**
    * Execute the function.  The function must return
@@ -180,7 +180,7 @@
     catch (Exception ex)
     {
       // ex.printStackTrace();
-      throw new org.apache.xml.utils.WrappedRuntimeException(ex);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(ex);
     }
   }
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTranslate.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTranslate.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTranslate.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTranslate.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncTranslate.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * Execute the Translate() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTrue.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTrue.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTrue.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncTrue.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: FuncTrue.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Execute the True() function.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncUnparsedEntityURI.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncUnparsedEntityURI.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncUnparsedEntityURI.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FuncUnparsedEntityURI.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FuncUnparsedEntityURI.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * @xsl.usage advanced
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function.java	Thu Aug 11 18:14:42 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: Function.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.compiler.Compiler;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This is a superclass of all XPath functions.  This allows two
@@ -112,7 +112,7 @@
 
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function2Args.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function2Args.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function2Args.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function2Args.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: Function2Args.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
 
 /**
  * Base class for functions that accept two arguments.
@@ -150,7 +150,7 @@
 
    
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callArgVisitors(XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function3Args.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function3Args.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function3Args.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/Function3Args.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: Function3Args.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
 
 /**
  * Base class for functions that accept three arguments.
@@ -148,7 +148,7 @@
 
    
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callArgVisitors(XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionDef1Arg.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionDef1Arg.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionDef1Arg.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionDef1Arg.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: FunctionDef1Arg.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Base class for functions that accept one argument that can be defaulted if
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionMultiArgs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionMultiArgs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionMultiArgs.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionMultiArgs.java	Thu Aug 11 18:14:42 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: FunctionMultiArgs.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * Base class for functions that accept an undetermined number of multiple
@@ -189,7 +189,7 @@
 
    
     /**
-     * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+     * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
      */
     public void callArgVisitors(XPathVisitor visitor)
     {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionOneArg.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionOneArg.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionOneArg.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/FunctionOneArg.java	Thu Aug 11 18:14:42 2011
@@ -18,12 +18,12 @@
 /*
  * $Id: FunctionOneArg.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
 
 /**
  * Base class for functions that accept one argument.
@@ -122,7 +122,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callArgVisitors(XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/ObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/ObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/ObjectFactory.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/ObjectFactory.java	Thu Aug 11 18:14:42 2011
@@ -19,7 +19,7 @@
  * $Id: ObjectFactory.java 468655 2006-10-28 07:12:06Z minchau $
  */
 
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 import java.io.InputStream;
 import java.io.IOException;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport.java	Thu Aug 11 18:14:42 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport.java 468655 2006-10-28 07:12:06Z minchau $
  */
 
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport12.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport12.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport12.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/SecuritySupport12.java	Thu Aug 11 18:14:42 2011
@@ -19,7 +19,7 @@
  * $Id: SecuritySupport12.java 468655 2006-10-28 07:12:06Z minchau $
  */
 
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 import java.io.File;
 import java.io.FileInputStream;
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/WrongNumberArgsException.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/WrongNumberArgsException.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/functions/WrongNumberArgsException.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/functions/WrongNumberArgsException.java	Thu Aug 11 18:14:42 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: WrongNumberArgsException.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.functions;
+package com.sun.xalan.org.apache.xpath.functions;
 
 /**
  * An exception that is thrown if the wrong number of arguments to an exception 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPExtensionsProvider.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPExtensionsProvider.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPExtensionsProvider.java	Thu Aug 11 18:14:42 2011
@@ -18,21 +18,21 @@
 
 // $Id: JAXPExtensionsProvider.java 468655 2006-10-28 07:12:06Z minchau $
 
-package org.apache.xpath.jaxp;
+package com.sun.xalan.org.apache.xpath.jaxp;
 
 import javax.xml.transform.TransformerException;
 import javax.xml.xpath.XPathFunctionResolver;
 import javax.xml.xpath.XPathFunction;
 import javax.xml.xpath.XPathFunctionException;
 
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.ExtensionsProvider;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
 
-import org.apache.xpath.functions.FuncExtFunction;
+import com.sun.xalan.org.apache.xpath.functions.FuncExtFunction;
 import java.util.Vector;
 import java.util.ArrayList;
 import javax.xml.namespace.QName;
@@ -147,7 +147,7 @@
         } catch ( XPathFunctionException xfe ) {
             // If we get XPathFunctionException then we want to terminate
             // further execution by throwing WrappedRuntimeException 
-            throw new org.apache.xml.utils.WrappedRuntimeException ( xfe );
+            throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException ( xfe );
         } catch ( Exception e ) {
             throw new javax.xml.transform.TransformerException ( e );
         }
@@ -199,7 +199,7 @@
         } catch ( XPathFunctionException xfe ) {
             // If we get XPathFunctionException then we want to terminate 
             // further execution by throwing WrappedRuntimeException
-            throw new org.apache.xml.utils.WrappedRuntimeException ( xfe );
+            throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException ( xfe );
         } catch ( Exception e ) {
             throw new javax.xml.transform.TransformerException ( e );
         }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPPrefixResolver.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPPrefixResolver.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPPrefixResolver.java	Mon Nov 14 16:41:06 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPPrefixResolver.java	Thu Aug 11 18:14:42 2011
@@ -17,11 +17,11 @@
  */
 // $Id: JAXPPrefixResolver.java 468655 2006-10-28 07:12:06Z minchau $
 
-package org.apache.xpath.jaxp;
+package com.sun.xalan.org.apache.xpath.jaxp;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NamedNodeMap;
-import org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
 
 import javax.xml.namespace.NamespaceContext;
 
@@ -66,7 +66,7 @@
 
     /**
      * The URI for the XML namespace.
-     * (Duplicate of that found in org.apache.xpath.XPathContext). 
+     * (Duplicate of that found in com.sun.xalan.org.apache.xpath.XPathContext). 
      */
      
     public static final String S_XMLNAMESPACEURI =
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPVariableStack.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPVariableStack.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPVariableStack.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/JAXPVariableStack.java	Thu Aug 11 18:14:42 2011
@@ -17,18 +17,18 @@
  */
 // $Id: JAXPVariableStack.java 524815 2007-04-02 15:52:15Z zongaro $
 
-package org.apache.xpath.jaxp;
+package com.sun.xalan.org.apache.xpath.jaxp;
 
 import javax.xml.transform.TransformerException;
 import javax.xml.xpath.XPathVariableResolver;
 
-import org.apache.xml.utils.QName;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.VariableStack;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathExpressionImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathExpressionImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathExpressionImpl.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathExpressionImpl.java	Thu Aug 11 18:14:42 2011
@@ -17,15 +17,15 @@
  */
 // $Id: XPathExpressionImpl.java 524813 2007-04-02 15:52:07Z zongaro $
 
-package org.apache.xpath.jaxp;
+package com.sun.xalan.org.apache.xpath.jaxp;
 
-import org.apache.xpath.*;
+import com.sun.xalan.org.apache.xpath.*;
 import javax.xml.transform.TransformerException;
 
-import org.apache.xpath.objects.XObject;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.utils.PrefixResolver;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
 
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
@@ -55,7 +55,7 @@
     private XPathFunctionResolver functionResolver;
     private XPathVariableResolver variableResolver;
     private JAXPPrefixResolver prefixResolver;
-    private org.apache.xpath.XPath xpath;
+    private com.sun.xalan.org.apache.xpath.XPath xpath;
 
     // By default Extension Functions are allowed in XPath Expressions. If
     // Secure Processing Feature is set on XPathFactory then the invocation of
@@ -67,7 +67,7 @@
      */
     protected XPathExpressionImpl() { };
 
-    protected XPathExpressionImpl(org.apache.xpath.XPath xpath, 
+    protected XPathExpressionImpl(com.sun.xalan.org.apache.xpath.XPath xpath, 
             JAXPPrefixResolver prefixResolver, 
             XPathFunctionResolver functionResolver,
             XPathVariableResolver variableResolver ) { 
@@ -78,7 +78,7 @@
         this.featureSecureProcessing = false;
     };
 
-    protected XPathExpressionImpl(org.apache.xpath.XPath xpath,
+    protected XPathExpressionImpl(com.sun.xalan.org.apache.xpath.XPath xpath,
             JAXPPrefixResolver prefixResolver,
             XPathFunctionResolver functionResolver,
             XPathVariableResolver variableResolver,
@@ -90,7 +90,7 @@
         this.featureSecureProcessing = featureSecureProcessing;
     };
 
-    public void setXPath (org.apache.xpath.XPath xpath ) {
+    public void setXPath (com.sun.xalan.org.apache.xpath.XPath xpath ) {
         this.xpath = xpath;
     }  
 
@@ -102,7 +102,7 @@
     
     private XObject eval ( Object contextItem )
             throws javax.xml.transform.TransformerException {
-        org.apache.xpath.XPathContext xpathSupport = null;
+        com.sun.xalan.org.apache.xpath.XPathContext xpathSupport = null;
 
         // Create an XPathContext that doesn't support pushing and popping of
         // variable resolution scopes.  Sufficient for simple XPath 1.0
@@ -110,9 +110,9 @@
         if ( functionResolver != null ) {
             JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
                     functionResolver, featureSecureProcessing );
-            xpathSupport = new org.apache.xpath.XPathContext(jep, false);
+            xpathSupport = new com.sun.xalan.org.apache.xpath.XPathContext(jep, false);
         } else {
-            xpathSupport = new org.apache.xpath.XPathContext(false);
+            xpathSupport = new com.sun.xalan.org.apache.xpath.XPathContext(false);
         }
 
         xpathSupport.setVarStack(new JAXPVariableStack(variableResolver));
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathFactoryImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathFactoryImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathFactoryImpl.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathFactoryImpl.java	Thu Aug 11 18:14:42 2011
@@ -17,10 +17,10 @@
  */
 // $Id: XPathFactoryImpl.java 468655 2006-10-28 07:12:06Z minchau $
 
-package org.apache.xpath.jaxp;
+package com.sun.xalan.org.apache.xpath.jaxp;
 
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
 
 import javax.xml.XMLConstants;
 import javax.xml.xpath.XPathFactory;
@@ -102,7 +102,7 @@
 	 * @return New <code>XPath</code>
 	 */
 	public javax.xml.xpath.XPath newXPath() {
-	    return new org.apache.xpath.jaxp.XPathImpl(
+	    return new com.sun.xalan.org.apache.xpath.jaxp.XPathImpl(
                     xPathVariableResolver, xPathFunctionResolver,
                     featureSecureProcessing );
 	}
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathImpl.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/jaxp/XPathImpl.java	Thu Aug 11 18:14:42 2011
@@ -17,7 +17,7 @@
  */
 // $Id: XPathImpl.java 524814 2007-04-02 15:52:11Z zongaro $
 
-package org.apache.xpath.jaxp;
+package com.sun.xalan.org.apache.xpath.jaxp;
 
 import javax.xml.namespace.QName;
 import javax.xml.namespace.NamespaceContext;
@@ -27,11 +27,11 @@
 import javax.xml.xpath.XPathVariableResolver;
 import javax.xml.xpath.XPathExpression;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.*;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.DOMImplementation;
@@ -192,9 +192,9 @@
     
     private XObject eval(String expression, Object contextItem)
         throws javax.xml.transform.TransformerException {
-        org.apache.xpath.XPath xpath = new org.apache.xpath.XPath( expression,
-            null, prefixResolver, org.apache.xpath.XPath.SELECT ); 
-        org.apache.xpath.XPathContext xpathSupport = null;
+        com.sun.xalan.org.apache.xpath.XPath xpath = new com.sun.xalan.org.apache.xpath.XPath( expression,
+            null, prefixResolver, com.sun.xalan.org.apache.xpath.XPath.SELECT ); 
+        com.sun.xalan.org.apache.xpath.XPathContext xpathSupport = null;
 
         // Create an XPathContext that doesn't support pushing and popping of
         // variable resolution scopes.  Sufficient for simple XPath 1.0
@@ -202,9 +202,9 @@
         if ( functionResolver != null ) {
             JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
                     functionResolver, featureSecureProcessing );
-            xpathSupport = new org.apache.xpath.XPathContext(jep, false);
+            xpathSupport = new com.sun.xalan.org.apache.xpath.XPathContext(jep, false);
         } else { 
-            xpathSupport = new org.apache.xpath.XPathContext(false);
+            xpathSupport = new com.sun.xalan.org.apache.xpath.XPathContext(false);
         }
 
         XObject xobj = null;
@@ -397,8 +397,8 @@
             throw new NullPointerException ( fmsg );
         }
         try {
-            org.apache.xpath.XPath xpath = new XPath (expression, null,
-                    prefixResolver, org.apache.xpath.XPath.SELECT );
+            com.sun.xalan.org.apache.xpath.XPath xpath = new XPath (expression, null,
+                    prefixResolver, com.sun.xalan.org.apache.xpath.XPath.SELECT );
             // Can have errorListener
             XPathExpressionImpl ximpl = new XPathExpressionImpl (xpath,
                     prefixResolver, functionResolver, variableResolver,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/DTMXRTreeFrag.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/DTMXRTreeFrag.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/DTMXRTreeFrag.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/DTMXRTreeFrag.java	Thu Aug 11 18:14:42 2011
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 /*
  * 
  * @author igorh
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBoolean.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBoolean.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBoolean.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBoolean.java	Thu Aug 11 18:14:42 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XBoolean.java 469368 2006-10-31 04:41:36Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
 /**
  * This class represents an XPath boolean object, and is capable of
@@ -161,7 +161,7 @@
     }
     catch(javax.xml.transform.TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
   }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBooleanStatic.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBooleanStatic.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBooleanStatic.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XBooleanStatic.java	Thu Aug 11 18:14:42 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XBooleanStatic.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
 /**
  * This class doesn't have any XPathContext, so override
@@ -63,7 +63,7 @@
     }
     catch(javax.xml.transform.TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
   }
 }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XMLStringFactoryImpl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XMLStringFactoryImpl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XMLStringFactoryImpl.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XMLStringFactoryImpl.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XMLStringFactoryImpl.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
 
 /**
  * Class XMLStringFactoryImpl creates XString versions of XMLStrings.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSet.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSet.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSet.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSet.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: XNodeSet.java 469368 2006-10-31 04:41:36Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.axes.NodeSequence;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.axes.NodeSequence;
 
 import org.w3c.dom.NodeList;
 import org.w3c.dom.traversal.NodeIterator;
@@ -218,7 +218,7 @@
     }
     else
     {
-      return org.apache.xpath.objects.XString.EMPTYSTRING;
+      return com.sun.xalan.org.apache.xpath.objects.XString.EMPTYSTRING;
     }
   }
   
@@ -261,7 +261,7 @@
    *
    * @return The string this wraps or the empty string if null
    */
-  public void appendToFsb(org.apache.xml.utils.FastStringBuffer fsb)
+  public void appendToFsb(com.sun.xalan.org.apache.xml.utils.FastStringBuffer fsb)
   {
     XString xstring = (XString)xstr();
     xstring.appendToFsb(fsb);
@@ -331,7 +331,7 @@
    */
   public NodeIterator nodeset() throws javax.xml.transform.TransformerException
   {
-    return new org.apache.xml.dtm.ref.DTMNodeIterator(iter());
+    return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator(iter());
   }
   
   /**
@@ -343,7 +343,7 @@
    */
   public NodeList nodelist() throws javax.xml.transform.TransformerException
   {
-    org.apache.xml.dtm.ref.DTMNodeList nodelist = new org.apache.xml.dtm.ref.DTMNodeList(this);
+    com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeList nodelist = new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeList(this);
     // Creating a DTMNodeList has the side-effect that it will create a clone
     // XNodeSet with cache and run m_iter to the end. You cannot get any node
     // from m_iter after this call. As a fix, we call SetVector() on the clone's 
@@ -362,7 +362,7 @@
 //   */
 //  public Object object()
 //  {
-//    return new org.apache.xml.dtm.ref.DTMNodeList(iter());
+//    return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeList(iter());
 //  }
 
   /**
@@ -706,7 +706,7 @@
     }
     catch(javax.xml.transform.TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
   }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSetForDOM.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSetForDOM.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSetForDOM.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNodeSetForDOM.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XNodeSetForDOM.java 469368 2006-10-31 04:41:36Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -66,8 +66,8 @@
     // JKESS 20020514: Longer-term solution is to force
     // folks to request length through an accessor, so we can defer this
     // retrieval... but that requires an API change.
-    // m_obj=new org.apache.xpath.NodeSetDTM(nodeList, xctxt);
-    org.apache.xpath.NodeSetDTM nsdtm=new org.apache.xpath.NodeSetDTM(nodeList, xctxt);
+    // m_obj=new com.sun.xalan.org.apache.xpath.NodeSetDTM(nodeList, xctxt);
+    com.sun.xalan.org.apache.xpath.NodeSetDTM nsdtm=new com.sun.xalan.org.apache.xpath.NodeSetDTM(nodeList, xctxt);
     m_last=nsdtm.getLength();
     setObject(nsdtm);   
   }
@@ -80,8 +80,8 @@
     // JKESS 20020514: Longer-term solution is to force
     // folks to request length through an accessor, so we can defer this
     // retrieval... but that requires an API change.
-    // m_obj = new org.apache.xpath.NodeSetDTM(nodeIter, xctxt);
-    org.apache.xpath.NodeSetDTM nsdtm=new org.apache.xpath.NodeSetDTM(nodeIter, xctxt);
+    // m_obj = new com.sun.xalan.org.apache.xpath.NodeSetDTM(nodeIter, xctxt);
+    com.sun.xalan.org.apache.xpath.NodeSetDTM nsdtm=new com.sun.xalan.org.apache.xpath.NodeSetDTM(nodeIter, xctxt);
     m_last=nsdtm.getLength();
     setObject(nsdtm);   
   }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNull.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNull.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNull.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNull.java	Thu Aug 11 18:14:42 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: XNull.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
 
 /**
  * This class represents an XPath null object, and is capable of
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNumber.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNumber.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNumber.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XNumber.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XNumber.java 469368 2006-10-31 04:41:36Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
 
 /**
  * This class represents an XPath number, and is capable of
@@ -408,7 +408,7 @@
     }
     catch(javax.xml.transform.TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
   }
   
@@ -426,7 +426,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObject.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObject.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObject.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObject.java	Thu Aug 11 18:14:42 2011
@@ -18,21 +18,21 @@
 /*
  * $Id: XObject.java 469368 2006-10-31 04:41:36Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
 import java.io.Serializable;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathException;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.NodeSetDTM;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathException;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.NodeList;
@@ -727,13 +727,13 @@
    * NEEDSDOC @param fsb
    * @return The string this wraps or the empty string if null
    */
-  public void appendToFsb(org.apache.xml.utils.FastStringBuffer fsb)
+  public void appendToFsb(com.sun.xalan.org.apache.xml.utils.FastStringBuffer fsb)
   {
     fsb.append(str());
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObjectFactory.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObjectFactory.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObjectFactory.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XObjectFactory.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: XObjectFactory.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.OneStepIterator;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.OneStepIterator;
 
 
 public class XObjectFactory
@@ -114,7 +114,7 @@
       }
       catch(Exception ex)
       {
-        throw new org.apache.xml.utils.WrappedRuntimeException(ex);
+        throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(ex);
       }
     }
     else if (val instanceof DTMAxisIterator)
@@ -128,7 +128,7 @@
       }
       catch(Exception ex)
       {
-        throw new org.apache.xml.utils.WrappedRuntimeException(ex);
+        throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(ex);
       }
     }
     else if (val instanceof DTMIterator)
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFrag.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFrag.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFrag.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFrag.java	Thu Aug 11 18:14:42 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: XRTreeFrag.java 469368 2006-10-31 04:41:36Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionNode;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.RTFIterator;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionNode;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.RTFIterator;
 
 import org.w3c.dom.NodeList;
 
@@ -81,7 +81,7 @@
   public Object object()
   {
     if (m_DTMXRTreeFrag.getXPathContext() != null)
-      return new org.apache.xml.dtm.ref.DTMNodeIterator((DTMIterator)(new org.apache.xpath.NodeSetDTM(m_dtmRoot, m_DTMXRTreeFrag.getXPathContext().getDTMManager())));
+      return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeIterator((DTMIterator)(new com.sun.xalan.org.apache.xpath.NodeSetDTM(m_dtmRoot, m_DTMXRTreeFrag.getXPathContext().getDTMManager())));
     else
       return super.object();
   }
@@ -188,7 +188,7 @@
    *
    * @return The string this wraps or the empty string if null
    */
-  public void appendToFsb(org.apache.xml.utils.FastStringBuffer fsb)
+  public void appendToFsb(com.sun.xalan.org.apache.xml.utils.FastStringBuffer fsb)
   {
     XString xstring = (XString)xstr();
     xstring.appendToFsb(fsb);
@@ -221,7 +221,7 @@
    * Cast result object to a DTMIterator.
    * dml - modified to return an RTFIterator for
    * benefit of EXSLT object-type function in 
-   * {@link org.apache.xalan.lib.ExsltCommon}.
+   * {@link com.sun.xalan.org.apache.xalan.lib.ExsltCommon}.
    * @return The document fragment as a DTMIterator
    */
   public DTMIterator asNodeIterator()
@@ -240,7 +240,7 @@
     if (m_obj instanceof NodeList)
       return (NodeList) m_obj;
     else
-      return new org.apache.xml.dtm.ref.DTMNodeList(asNodeIterator());
+      return new com.sun.xalan.org.apache.xml.dtm.ref.DTMNodeList(asNodeIterator());
   }
 
   /**
@@ -294,7 +294,7 @@
     }
     catch(javax.xml.transform.TransformerException te)
     {
-      throw new org.apache.xml.utils.WrappedRuntimeException(te);
+      throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
   }
 
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFragSelectWrapper.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFragSelectWrapper.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XRTreeFragSelectWrapper.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: XRTreeFragSelectWrapper.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * This class makes an select statement act like an result tree fragment.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XString.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XString.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XString.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XString.java	Thu Aug 11 18:14:42 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: XString.java 570108 2007-08-27 13:30:57Z zongaro $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
 import java.util.Locale;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
 
 /**
  * This class represents an XPath string object, and is capable of
@@ -311,7 +311,7 @@
     }
     catch(javax.xml.transform.TransformerException te)
     {
-    	throw new org.apache.xml.utils.WrappedRuntimeException(te);
+    	throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     }
 
     // Otherwise, both objects to be compared are converted to strings as 
@@ -477,7 +477,7 @@
     // However, since nobody is actually _using_ this method yet:
     //    return str().compareToIgnoreCase(str.toString());
     
-    throw new org.apache.xml.utils.WrappedRuntimeException(
+    throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(
       new java.lang.NoSuchMethodException(
         "Java 1.2 method, not yet implemented"));
   }
@@ -1112,7 +1112,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForChars.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForChars.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForChars.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForChars.java	Thu Aug 11 18:14:42 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XStringForChars.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 
 /**
@@ -84,7 +84,7 @@
    *
    * @return The string this wraps or the empty string if null
    */
-  public void appendToFsb(org.apache.xml.utils.FastStringBuffer fsb)
+  public void appendToFsb(com.sun.xalan.org.apache.xml.utils.FastStringBuffer fsb)
   {
     fsb.append((char[])m_obj, m_start, m_length);
   }
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForFSB.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForFSB.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForFSB.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/objects/XStringForFSB.java	Thu Aug 11 18:14:42 2011
@@ -18,14 +18,14 @@
 /*
  * $Id: XStringForFSB.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.objects;
+package com.sun.xalan.org.apache.xpath.objects;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.FastStringBuffer;
+import com.sun.xalan.org.apache.xml.utils.XMLCharacterRecognizer;
+import com.sun.xalan.org.apache.xml.utils.XMLString;
+import com.sun.xalan.org.apache.xml.utils.XMLStringFactory;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 /**
  * This class will wrap a FastStringBuffer and allow for
@@ -95,7 +95,7 @@
    *
    * @return The string this wraps or the empty string if null
    */
-  public void appendToFsb(org.apache.xml.utils.FastStringBuffer fsb)
+  public void appendToFsb(com.sun.xalan.org.apache.xml.utils.FastStringBuffer fsb)
   {
     // %OPT% !!! FSB has to be updated to take partial fsb's for append.
     fsb.append(str());
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/And.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/And.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/And.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/And.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: And.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'and' operation expression executer.
@@ -37,8 +37,8 @@
    *
    * @param xctxt The runtime execution context.
    *
-   * @return {@link org.apache.xpath.objects.XBoolean#S_TRUE} or 
-   * {@link org.apache.xpath.objects.XBoolean#S_FALSE}.
+   * @return {@link com.sun.xalan.org.apache.xpath.objects.XBoolean#S_TRUE} or 
+   * {@link com.sun.xalan.org.apache.xpath.objects.XBoolean#S_FALSE}.
    *
    * @throws javax.xml.transform.TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Bool.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Bool.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Bool.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Bool.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Bool.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'boolean()' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Div.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Div.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Div.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Div.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Div.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'div' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Equals.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Equals.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Equals.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Equals.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Equals.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '=' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gt.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gt.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gt.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gt.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: Gt.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '>' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gte.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gte.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gte.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Gte.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: Gte.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '>=' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lt.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lt.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lt.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lt.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: Lt.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '<' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lte.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lte.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lte.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Lte.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: Lte.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '<=' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Minus.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Minus.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Minus.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Minus.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Minus.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The binary '-' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mod.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mod.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mod.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mod.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Mod.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'mod' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mult.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mult.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mult.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Mult.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Mult.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '*' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Neg.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Neg.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Neg.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Neg.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Neg.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The unary '-' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/NotEquals.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/NotEquals.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/NotEquals.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/NotEquals.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: NotEquals.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '!=' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Number.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Number.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Number.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Number.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Number.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'number()' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Operation.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Operation.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Operation.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Operation.java	Thu Aug 11 18:14:43 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: Operation.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The baseclass for a binary operation.
@@ -165,7 +165,7 @@
   }
 
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Or.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Or.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Or.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Or.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Or.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XBoolean;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'or' operation expression executer.
@@ -37,8 +37,8 @@
    *
    * @param xctxt The runtime execution context.
    *
-   * @return {@link org.apache.xpath.objects.XBoolean#S_TRUE} or 
-   * {@link org.apache.xpath.objects.XBoolean#S_FALSE}.
+   * @return {@link com.sun.xalan.org.apache.xpath.objects.XBoolean#S_TRUE} or 
+   * {@link com.sun.xalan.org.apache.xpath.objects.XBoolean#S_FALSE}.
    *
    * @throws javax.xml.transform.TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Plus.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Plus.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Plus.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Plus.java	Thu Aug 11 18:14:43 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: Plus.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The '+' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Quo.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Quo.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Quo.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Quo.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: Quo.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The 'quo' operation expression executer. (no longer supported by XPath).
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/String.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/String.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/String.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/String.java	Thu Aug 11 18:14:43 2011
@@ -18,10 +18,10 @@
 /*
  * $Id: String.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.objects.XString;
 
 /**
  * The 'string()' operation expression executer.
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/UnaryOperation.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/UnaryOperation.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/UnaryOperation.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/UnaryOperation.java	Thu Aug 11 18:14:43 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: UnaryOperation.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * The unary operation base class.
@@ -117,7 +117,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Variable.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Variable.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/Variable.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/Variable.java	Thu Aug 11 18:14:43 2011
@@ -18,22 +18,22 @@
 /*
  * $Id: Variable.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.axes.PathComponent;
-import org.apache.xpath.axes.WalkerFactory;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
+import com.sun.xalan.org.apache.xalan.res.XSLMessages;
+import com.sun.xalan.org.apache.xml.utils.QName;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.axes.PathComponent;
+import com.sun.xalan.org.apache.xpath.axes.WalkerFactory;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.res.XPATHErrorResources;
 
 
 /**
@@ -145,7 +145,7 @@
                                              
     TransformerException te = new TransformerException(msg, this);
                                              
-    throw new org.apache.xml.utils.WrappedRuntimeException(te);
+    throw new com.sun.xalan.org.apache.xml.utils.WrappedRuntimeException(te);
     
   }
 
@@ -203,7 +203,7 @@
    */
   public XObject execute(XPathContext xctxt, boolean destructiveOK) throws javax.xml.transform.TransformerException
   {
-    org.apache.xml.utils.PrefixResolver xprefixResolver = xctxt.getNamespaceContext();
+    com.sun.xalan.org.apache.xml.utils.PrefixResolver xprefixResolver = xctxt.getNamespaceContext();
 
     XObject result;
     // Is the variable fetched always the same?
@@ -239,7 +239,7 @@
 //      // pending some bright light going off in my head.  Some sort of callback?
 //      synchronized(this)
 //      {
-//      	org.apache.xalan.templates.ElemVariable vvar= getElemVariable();
+//      	com.sun.xalan.org.apache.xalan.templates.ElemVariable vvar= getElemVariable();
 //      	if(null != vvar)
 //      	{
 //          m_index = vvar.getIndex();
@@ -257,7 +257,7 @@
    * this to work, the SourceLocator must be the owning ElemTemplateElement.
    * @return The dereference to the ElemVariable, or null if not found.
    */
-  public org.apache.xalan.templates.ElemVariable getElemVariable()
+  public com.sun.xalan.org.apache.xalan.templates.ElemVariable getElemVariable()
   {
   	
     // Get the current ElemTemplateElement, and then walk backwards in 
@@ -266,26 +266,26 @@
     // qname.  If we reach the top level, use the StylesheetRoot's composed
     // list of top level variables and parameters.
     
-    org.apache.xalan.templates.ElemVariable vvar = null;	
-    org.apache.xpath.ExpressionNode owner = getExpressionOwner();
+    com.sun.xalan.org.apache.xalan.templates.ElemVariable vvar = null;	
+    com.sun.xalan.org.apache.xpath.ExpressionNode owner = getExpressionOwner();
 
-    if (null != owner && owner instanceof org.apache.xalan.templates.ElemTemplateElement)
+    if (null != owner && owner instanceof com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement)
     {
 
-      org.apache.xalan.templates.ElemTemplateElement prev = 
-        (org.apache.xalan.templates.ElemTemplateElement) owner;
+      com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement prev = 
+        (com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement) owner;
 
-      if (!(prev instanceof org.apache.xalan.templates.Stylesheet))
+      if (!(prev instanceof com.sun.xalan.org.apache.xalan.templates.Stylesheet))
       {            
-        while ( prev != null && !(prev.getParentNode() instanceof org.apache.xalan.templates.Stylesheet) )
+        while ( prev != null && !(prev.getParentNode() instanceof com.sun.xalan.org.apache.xalan.templates.Stylesheet) )
         {
-          org.apache.xalan.templates.ElemTemplateElement savedprev = prev;
+          com.sun.xalan.org.apache.xalan.templates.ElemTemplateElement savedprev = prev;
 
           while (null != (prev = prev.getPreviousSiblingElem()))
           {
-            if(prev instanceof org.apache.xalan.templates.ElemVariable)
+            if(prev instanceof com.sun.xalan.org.apache.xalan.templates.ElemVariable)
             {
-              vvar = (org.apache.xalan.templates.ElemVariable) prev;
+              vvar = (com.sun.xalan.org.apache.xalan.templates.ElemVariable) prev;
             
               if (vvar.getName().equals(m_qname))
               {
@@ -323,7 +323,7 @@
    */
   public int getAnalysisBits()
   {
-  	org.apache.xalan.templates.ElemVariable vvar = getElemVariable();
+  	com.sun.xalan.org.apache.xalan.templates.ElemVariable vvar = getElemVariable();
   	if(null != vvar)
   	{
   		XPath xpath = vvar.getSelect();
@@ -341,7 +341,7 @@
 
 
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/VariableSafeAbsRef.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/VariableSafeAbsRef.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/operations/VariableSafeAbsRef.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/operations/VariableSafeAbsRef.java	Thu Aug 11 18:14:43 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: VariableSafeAbsRef.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.operations;
+package com.sun.xalan.org.apache.xpath.operations;
 
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTMManager;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.objects.XNodeSet;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/ContextMatchStepPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/ContextMatchStepPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/ContextMatchStepPattern.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/ContextMatchStepPattern.java	Thu Aug 11 18:14:43 2011
@@ -18,15 +18,15 @@
 /*
  * $Id: ContextMatchStepPattern.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.patterns;
+package com.sun.xalan.org.apache.xpath.patterns;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.WalkerFactory;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.axes.WalkerFactory;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 /**
  * Special context node pattern matcher.
  */
@@ -49,11 +49,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -74,11 +74,11 @@
    * @param xctxt The XPath runtime context.
    * NEEDSDOC @param prevStep
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/FunctionPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/FunctionPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/FunctionPattern.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/FunctionPattern.java	Thu Aug 11 18:14:43 2011
@@ -18,16 +18,16 @@
 /*
  * $Id: FunctionPattern.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.patterns;
+package com.sun.xalan.org.apache.xpath.patterns;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMIterator;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * Match pattern step that contains a function.
@@ -39,7 +39,7 @@
 
   /**
    * Construct a FunctionPattern from a
-   * {@link org.apache.xpath.functions.Function expression}.
+   * {@link com.sun.xalan.org.apache.xpath.functions.Function expression}.
    *
    * NEEDSDOC @param expr
    */
@@ -64,7 +64,7 @@
   }
 
   /**
-   * Should be a {@link org.apache.xpath.functions.Function expression}.
+   * Should be a {@link com.sun.xalan.org.apache.xpath.functions.Function expression}.
    *  @serial   
    */
   Expression m_functionExpr;
@@ -91,11 +91,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -134,11 +134,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -177,11 +177,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTest.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTest.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTest.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTest.java	Thu Aug 11 18:14:43 2011
@@ -18,17 +18,17 @@
 /*
  * $Id: NodeTest.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.patterns;
+package com.sun.xalan.org.apache.xpath.patterns;
 
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPath;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XNumber;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This is the basic node test class for both match patterns and location path
@@ -349,7 +349,7 @@
    * Tell what node type to test, if not DTMFilter.SHOW_ALL.
    *
    * @param whatToShow Bit set defined mainly by 
-   *        {@link org.apache.xml.dtm.DTMFilter}.
+   *        {@link com.sun.xalan.org.apache.xml.dtm.DTMFilter}.
    * @return the node type for the whatToShow.  Since whatToShow can specify 
    *         multiple types, it will return the first bit tested that is on, 
    *         so the caller of this function should take care that this is 
@@ -408,7 +408,7 @@
    *
    *
    * @param whatToShow Bit set defined mainly by 
-   *        {@link org.apache.xml.dtm.DTMFilter}.
+   *        {@link com.sun.xalan.org.apache.xml.dtm.DTMFilter}.
    */
   public static void debugWhatToShow(int whatToShow)
   {
@@ -514,11 +514,11 @@
    * @param xctxt XPath runtime context.
    * @param context The node being tested.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -588,11 +588,11 @@
    * @param xctxt XPath runtime context.
    * @param context The node being tested.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -659,11 +659,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -682,7 +682,7 @@
   }
 
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTestFilter.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTestFilter.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTestFilter.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/NodeTestFilter.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: NodeTestFilter.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.patterns;
+package com.sun.xalan.org.apache.xpath.patterns;
 
 /**
  * This interface should be implemented by Nodes and/or iterators,
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/StepPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/StepPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/StepPattern.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/StepPattern.java	Thu Aug 11 18:14:43 2011
@@ -18,19 +18,19 @@
 /*
  * $Id: StepPattern.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.patterns;
+package com.sun.xalan.org.apache.xpath.patterns;
 
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.compiler.PsuedoNames;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xml.dtm.Axis;
+import com.sun.xalan.org.apache.xml.dtm.DTM;
+import com.sun.xalan.org.apache.xml.dtm.DTMAxisTraverser;
+import com.sun.xalan.org.apache.xml.dtm.DTMFilter;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.axes.SubContextList;
+import com.sun.xalan.org.apache.xpath.compiler.PsuedoNames;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class represents a single pattern match step.
@@ -88,7 +88,7 @@
    * Calculate the local name or psuedo name of the node that this pattern will test,
    * for hash table lookup optimization.
    *
-   * @see org.apache.xpath.compiler.PsuedoNames
+   * @see com.sun.xalan.org.apache.xpath.compiler.PsuedoNames
    */
   public void calcTargetString()
   {
@@ -130,7 +130,7 @@
    *
    *
    * @return local name or psuedo name of the node.
-   * @see org.apache.xpath.compiler.PsuedoNames
+   * @see com.sun.xalan.org.apache.xpath.compiler.PsuedoNames
    */
   public String getTargetString()
   {
@@ -319,11 +319,11 @@
    * @param xctxt XPath runtime context.
    * @param currentNode The current node context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -349,11 +349,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -653,11 +653,11 @@
    * @param dtm The DTM of the current node.
    * @param currentNode The current node context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -881,11 +881,11 @@
    * @param xctxt The XPath runtime context.
    * @param context The node to be tested.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -962,7 +962,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/UnionPattern.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/UnionPattern.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/patterns/UnionPattern.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/patterns/UnionPattern.java	Thu Aug 11 18:14:43 2011
@@ -18,13 +18,13 @@
 /*
  * $Id: UnionPattern.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.patterns;
+package com.sun.xalan.org.apache.xpath.patterns;
 
-import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XObject;
+import com.sun.xalan.org.apache.xpath.Expression;
+import com.sun.xalan.org.apache.xpath.ExpressionOwner;
+import com.sun.xalan.org.apache.xpath.XPathContext;
+import com.sun.xalan.org.apache.xpath.XPathVisitor;
+import com.sun.xalan.org.apache.xpath.objects.XObject;
 
 /**
  * This class represents a union pattern, which can have multiple individual 
@@ -106,11 +106,11 @@
    *
    * @param xctxt XPath runtime context.
    *
-   * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
-   *         {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
+   * @return {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+   *         {@link com.sun.xalan.org.apache.xpath.patterns.NodeTest#SCORE_OTHER}.
    *
    * @throws javax.xml.transform.TransformerException
    */
@@ -170,7 +170,7 @@
   }
   
   /**
-   * @see org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
+   * @see com.sun.xalan.org.apache.xpath.XPathVisitable#callVisitors(ExpressionOwner, XPathVisitor)
    */
   public void callVisitors(ExpressionOwner owner, XPathVisitor visitor)
   {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "The current() function does not accept arguments!" },
 
   { ER_DOCUMENT_REPLACED,
-      "document() function implementation has been replaced by org.apache.xalan.xslt.FuncDocument!"},
+      "document() function implementation has been replaced by com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "context does not have an owner document!"},
@@ -912,7 +912,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ca.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ca.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ca.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ca.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_ca.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "La funci\u00f3 current() no accepta arguments." },
 
   { ER_DOCUMENT_REPLACED,
-      "La implementaci\u00f3 de la funci\u00f3 document() s'ha substitu\u00eft per org.apache.xalan.xslt.FuncDocument."},
+      "La implementaci\u00f3 de la funci\u00f3 document() s'ha substitu\u00eft per com.sun.xalan.org.apache.xalan.xslt.FuncDocument."},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "El context no t\u00e9 un document de propietari."},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_cs.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_cs.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_cs.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_cs.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_cs.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "Funkce current() neakceptuje argumenty!" },
 
   { ER_DOCUMENT_REPLACED,
-      "implementace funkce document() byla nahrazena funkc\u00ed org.apache.xalan.xslt.FuncDocument!"},
+      "implementace funkce document() byla nahrazena funkc\u00ed com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "Parametr context nem\u00e1 dokument vlastn\u00edka!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#chyba";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_de.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_de.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_de.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_de.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_de.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "In der Funktion current() d\u00fcrfen keine Argumente angegeben werden!" },
 
   { ER_DOCUMENT_REPLACED,
-      "Die Implementierung der Funktion document() wurde durch org.apache.xalan.xslt.FuncDocument ersetzt!"},
+      "Die Implementierung der Funktion document() wurde durch com.sun.xalan.org.apache.xalan.xslt.FuncDocument ersetzt!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "Der Kontextknoten verf\u00fcgt nicht \u00fcber ein Eignerdokument!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#Fehler";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_en.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_en.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_en.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_en.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_en.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 
 /**
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_es.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_es.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_es.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_es.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_es.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "La funci\u00f3n current() no acepta argumentos." },
 
   { ER_DOCUMENT_REPLACED,
-      "La implementaci\u00f3n de la funci\u00f3n document() ha sido sustituida por org.apache.xalan.xslt.FuncDocument."},
+      "La implementaci\u00f3n de la funci\u00f3n document() ha sido sustituida por com.sun.xalan.org.apache.xalan.xslt.FuncDocument."},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "El contexto no tiene un documento propietario."},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_fr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_fr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_fr.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_fr.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_fr.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "La fonction current() n'accepte pas d'arguments !" },
 
   { ER_DOCUMENT_REPLACED,
-      "L'impl\u00e9mentation de la fonction document() a \u00e9t\u00e9 remplac\u00e9e par org.apache.xalan.xslt.FuncDocument !"},
+      "L'impl\u00e9mentation de la fonction document() a \u00e9t\u00e9 remplac\u00e9e par com.sun.xalan.org.apache.xalan.xslt.FuncDocument !"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "Le contexte ne poss\u00e8de pas de document propri\u00e9taire !"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_hu.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_hu.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_hu.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_hu.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_hu.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "A current() f\u00fcggv\u00e9ny nem fogad el argumentumokat!" },
 
   { ER_DOCUMENT_REPLACED,
-      "A document() f\u00fcggv\u00e9ny megval\u00f3s\u00edt\u00e1s\u00e1t lecser\u00e9lte az org.apache.xalan.xslt.FuncDocument!"},
+      "A document() f\u00fcggv\u00e9ny megval\u00f3s\u00edt\u00e1s\u00e1t lecser\u00e9lte az com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "A k\u00f6rnyezetnek nincs tulajdonos dokumentuma!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_it.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_it.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_it.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_it.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_it.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "La funzione corrente () non accetta argomenti." },
 
   { ER_DOCUMENT_REPLACED,
-      "L'implementazione della funzione documento () \u00e8 stata sostituita da org.apache.xalan.xslt.FuncDocument."},
+      "L'implementazione della funzione documento () \u00e8 stata sostituita da com.sun.xalan.org.apache.xalan.xslt.FuncDocument."},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "il contesto non ha un documento proprietario."},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#errore";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ja.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ja.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ja.java	Mon Nov 14 16:41:07 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ja.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_ja.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "current() \u95a2\u6570\u306f\u5f15\u6570\u3092\u53d7\u3051\u5165\u308c\u307e\u305b\u3093\u3002" },
 
   { ER_DOCUMENT_REPLACED,
-      "document() \u95a2\u6570\u306e\u5b9f\u88c5\u304c org.apache.xalan.xslt.FuncDocument \u306b\u3088\u308a\u7f6e\u304d\u63db\u3048\u3089\u308c\u307e\u3057\u305f\u3002"},
+      "document() \u95a2\u6570\u306e\u5b9f\u88c5\u304c com.sun.xalan.org.apache.xalan.xslt.FuncDocument \u306b\u3088\u308a\u7f6e\u304d\u63db\u3048\u3089\u308c\u307e\u3057\u305f\u3002"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u6240\u6709\u8005\u6587\u66f8\u304c\u3042\u308a\u307e\u305b\u3093\u3002"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#\u30a8\u30e9\u30fc";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ko.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ko.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ko.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ko.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_ko.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "current() \ud568\uc218\uac00 \uc778\uc218\ub97c \uc2b9\uc778\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4." },
 
   { ER_DOCUMENT_REPLACED,
-      "document() \ud568\uc218 \uad6c\ud604\uc774 org.apache.xalan.xslt.FuncDocument\ub85c \ubc14\ub00c\uc5c8\uc2b5\ub2c8\ub2e4."},
+      "document() \ud568\uc218 \uad6c\ud604\uc774 com.sun.xalan.org.apache.xalan.xslt.FuncDocument\ub85c \ubc14\ub00c\uc5c8\uc2b5\ub2c8\ub2e4."},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "\ubb38\ub9e5\uc5d0 \uc18c\uc720\uc790 \ubb38\uc11c\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pl.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pl.java	Thu Aug 11 18:14:43 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_pl.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "Funkcja current() nie akceptuje argument\u00f3w!" },
 
   { ER_DOCUMENT_REPLACED,
-      "Implementacja funkcji document() zosta\u0142a zast\u0105piona przez org.apache.xalan.xslt.FuncDocument!"},
+      "Implementacja funkcji document() zosta\u0142a zast\u0105piona przez com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "Kontekst nie ma dokumentu w\u0142a\u015bciciela!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "nr b\u0142\u0119du";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pt_BR.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pt_BR.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pt_BR.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_pt_BR.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_pt_BR.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -375,7 +375,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "A fun\u00e7\u00e3o current() n\u00e3o aceita argumentos!" },
 
   { ER_DOCUMENT_REPLACED,
-      "A implementa\u00e7\u00e3o da fun\u00e7\u00e3o document() foi substitu\u00edda por org.apache.xalan.xslt.FuncDocument!"},
+      "A implementa\u00e7\u00e3o da fun\u00e7\u00e3o document() foi substitu\u00edda por com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "context n\u00e3o possui um documento do propriet\u00e1rio!"},
@@ -905,7 +905,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ru.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ru.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ru.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_ru.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_ru.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "\u0423 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 current() \u043d\u0435\u0442 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u043e\u0432!" },
 
   { ER_DOCUMENT_REPLACED,
-      "\u0420\u0435\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u044f \u0444\u0443\u043d\u043a\u0446\u0438\u0438 document() \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u0430 \u043d\u0430 org.apache.xalan.xslt.FuncDocument!"},
+      "\u0420\u0435\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u044f \u0444\u0443\u043d\u043a\u0446\u0438\u0438 document() \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u0430 \u043d\u0430 com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "\u0412 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0435 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442-\u0432\u043b\u0430\u0434\u0435\u043b\u0435\u0446!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "\u041e\u0448\u0438\u0431\u043a\u0430";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sk.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sk.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sk.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sk.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_sk.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "Funkcia current () nepr\u00edma argumenty!" },
 
   { ER_DOCUMENT_REPLACED,
-      "Implement\u00e1cia funkcie document() bola nahraden\u00e1 org.apache.xalan.xslt.FuncDocument!"},
+      "Implement\u00e1cia funkcie document() bola nahraden\u00e1 com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "kontext nem\u00e1 dokument vlastn\u00edka!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sl.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sl.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sl.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sl.java	Thu Aug 11 18:14:44 2011
@@ -19,7 +19,7 @@
  * $Id: XPATHErrorResources_sl.java,v 1.29 2005/02/09 21:44:08 zongaro Exp $
  */
 
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -375,7 +375,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "Funkcija current() ne sprejema argumentov!" },
 
   { ER_DOCUMENT_REPLACED,
-      "Implementacija funkcije document() je bila nadome\u0161\u010dena z org.apache.xalan.xslt.FuncDocument!"},
+      "Implementacija funkcije document() je bila nadome\u0161\u010dena z com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "Kontekst ne vsebuje lastni\u0161kega dokumenta!"},
@@ -905,7 +905,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sv.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sv.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sv.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_sv.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_sv.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 /**
  * Set up error messages.
@@ -89,7 +89,7 @@
 
   {
     ER_DOCUMENT_REPLACED,
-      "Implementeringen av funktionen document() har ersatts av org.apache.xalan.xslt.FuncDocument!"},
+      "Implementeringen av funktionen document() har ersatts av com.sun.xalan.org.apache.xalan.xslt.FuncDocument!"},
 
 
   /** Field ER_CONTEXT_HAS_NO_OWNERDOC          */
@@ -1227,7 +1227,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "//fel";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_tr.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_tr.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_tr.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_tr.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_tr.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "current() i\u015flevi ba\u011f\u0131ms\u0131z de\u011fi\u015fken kabul etmez!" },
 
   { ER_DOCUMENT_REPLACED,
-      "document() i\u015flevi uygulamas\u0131 org.apache.xalan.xslt.FuncDocument ile de\u011fi\u015ftirildi!"},
+      "document() i\u015flevi uygulamas\u0131 com.sun.xalan.org.apache.xalan.xslt.FuncDocument ile de\u011fi\u015ftirildi!"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "Ba\u011flam\u0131n iye belgesi yok!"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#hata";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_zh.java 338104 2005-01-23 01:39:54Z mcnamara $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "current() \u51fd\u6570\u4e0d\u63a5\u53d7\u53c2\u6570\uff01" },
 
   { ER_DOCUMENT_REPLACED,
-      "document() \u51fd\u6570\u5b9e\u73b0\u5df2\u88ab org.apache.xalan.xslt.FuncDocument \u66ff\u6362\uff01"},
+      "document() \u51fd\u6570\u5b9e\u73b0\u5df2\u88ab com.sun.xalan.org.apache.xalan.xslt.FuncDocument \u66ff\u6362\uff01"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "\u4e0a\u4e0b\u6587\u6ca1\u6709\u6240\u6709\u8005\u6587\u6863\uff01"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#\u9519\u8bef";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_CN.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_CN.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_CN.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_CN.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_zh_CN.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 public class XPATHErrorResources_zh_CN extends XPATHErrorResources_zh
 {
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_TW.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_TW.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_TW.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHErrorResources_zh_TW.java	Thu Aug 11 18:14:44 2011
@@ -18,7 +18,7 @@
 /*
  * $Id: XPATHErrorResources_zh_TW.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -374,7 +374,7 @@
   { ER_CURRENT_TAKES_NO_ARGS, "current() \u51fd\u6578\u4e0d\u63a5\u53d7\u5f15\u6578\uff01" },
 
   { ER_DOCUMENT_REPLACED,
-      "document() \u51fd\u6578\u5be6\u4f5c\u5df2\u88ab org.apache.xalan.xslt.FuncDocument \u53d6\u4ee3\uff01"},
+      "document() \u51fd\u6578\u5be6\u4f5c\u5df2\u88ab com.sun.xalan.org.apache.xalan.xslt.FuncDocument \u53d6\u4ee3\uff01"},
 
   { ER_CONTEXT_HAS_NO_OWNERDOC,
       "\u74b0\u5883\u5b9a\u7fa9\u6c92\u6709\u64c1\u6709\u8005\u6587\u4ef6\uff01"},
@@ -904,7 +904,7 @@
 
   /** Field ERROR_RESOURCES          */
   public static final String ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
 
   /** Field ERROR_STRING          */
   public static final String ERROR_STRING = "#error";
diff -uNwr ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHMessages.java /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHMessages.java
--- ./xalan-j_2_7_1_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHMessages.java	Mon Nov 14 16:41:08 2011
+++ /export/home/xalan271_comsun/src/com/sun/xalan/org/apache/xpath/res/XPATHMessages.java	Thu Aug 11 18:14:44 2011
@@ -18,11 +18,11 @@
 /*
  * $Id: XPATHMessages.java 468655 2006-10-28 07:12:06Z minchau $
  */
-package org.apache.xpath.res;
+package com.sun.xalan.org.apache.xpath.res;
 
 import java.util.ListResourceBundle;
 
-import org.apache.xml.res.XMLMessages;
+import com.sun.xalan.org.apache.xml.res.XMLMessages;
 
 /**
  * A utility class for issuing XPath error messages.
@@ -35,7 +35,7 @@
 
   /** The class name of the XPath error message string table.     */
   private static final String XPATH_ERROR_RESOURCES =
-    "org.apache.xpath.res.XPATHErrorResources";
+    "com.sun.xalan.org.apache.xpath.res.XPATHErrorResources";
   
   /**
    * Creates a message from the specified key and replacement
diff -uNwr ./xalan-j_2_7_1_comsun/src/manifest.xalan-interpretive /export/home/xalan271_comsun/src/manifest.xalan-interpretive
--- ./xalan-j_2_7_1_comsun/src/manifest.xalan-interpretive	Fri Nov 23 03:13:52 2007
+++ /export/home/xalan271_comsun/src/manifest.xalan-interpretive	Fri Aug 12 13:14:07 2011
@@ -3,26 +3,26 @@
 Main-Class: org.apache.xalan.xslt.Process

 Class-Path: xercesImpl.jar xml-apis.jar serializer.jar

 

-Name: org/apache/xalan/

+Name: com/sun/xalan/org/apache/xalan/
 Comment: Main Xalan engine implementing TrAX/JAXP

 Specification-Title: Java API for XML Processing

 Specification-Vendor: Sun Microsystems Inc.

 Specification-Version: 1.3

-Implementation-Title: org.apache.xalan

+Implementation-Title: com.sun.xalan.org.apache.xalan
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/dist/

 

-Name: org/apache/xml/

+Name: com/sun/xalan/org/apache/xml/
 Comment: DTM implementation and utilities

-Implementation-Title: org.apache.xml

+Implementation-Title: com.sun.xalan.org.apache.xml
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/dist/

 

-Name: org/apache/xpath/

+Name: com/sun/xalan/org/apache/xpath/
 Comment: XPath engine

-Implementation-Title: org.apache.xpath

+Implementation-Title: com.sun.xalan.org.apache.xpath
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/dist/

diff -uNwr ./xalan-j_2_7_1_comsun/src/manifest.xsltc /export/home/xalan271_comsun/src/manifest.xsltc
--- ./xalan-j_2_7_1_comsun/src/manifest.xsltc	Fri Nov 23 03:13:55 2007
+++ /export/home/xalan271_comsun/src/manifest.xsltc	Fri Aug 12 13:13:08 2011
@@ -2,19 +2,19 @@
 Created-By: @java.version@ (@java.vendor@)

 Class-Path: xercesImpl.jar xml-apis.jar serializer.jar

 

-Name: org/apache/xalan/xsltc/

+Name: com/sun/xalan/org/apache/xalan/xsltc/
 Comment: Main XSLTC engine implementing TrAX/JAXP

 Specification-Title: Java API for XML Processing

 Specification-Vendor: Sun Microsystems Inc.

 Specification-Version: 1.3

-Implementation-Title: org.apache.xalan.xsltc

+Implementation-Title: com.sun.xalan.org.apache.xalan.xsltc
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/dist/

 

-Name: org/apache/xml/

+Name: com/sun/xalan/org/apache/xml/
 Comment: DTM implementation and utilities

-Implementation-Title: org.apache.xml

+Implementation-Title: com.sun.xalan.org.apache.xml
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://xml.apache.org/xalan-j/dist/

@@ -29,22 +29,22 @@
 Implementation-Vendor: Princeton University  

 Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 

 

-Name: org/apache/bcel/

+Name: com/sun/xalan/org/apache/bcel/
 Comment: Byte Code Engineering Library 

 Specification-Title: Byte Code Engineering Library 

 Specification-Vendor: Markus Dahm 

 Specification-Version: 5.0 rc1 

-Implementation-Title: org.apache.bcel

+Implementation-Title: com.sun.xalan.org.apache.bcel
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://jakarta.apache.org/bcel

 

-Name: org/apache/regexp/

+Name: com/sun/xalan/org/apache/regexp/
 Comment: Java Regular Expression package 

 Specification-Title: Java Regular Expression package 

 Specification-Vendor: Apache Software Foundation 

 Specification-Version: 1.2

-Implementation-Title: org.apache.regexp

+Implementation-Title: com.sun.xalan.org.apache.regexp
 Implementation-Version: @impl.version@

 Implementation-Vendor: Apache Software Foundation

 Implementation-URL: http://jakarta.apache.org/regexp