cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r569791 - in /cocoon/trunk/core: cocoon-core/src/main/java/org/apache/cocoon/transformation/ cocoon-core/src/main/java/org/apache/cocoon/xml/ cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl...
Date Sun, 26 Aug 2007 09:58:45 GMT
Author: danielf
Date: Sun Aug 26 02:58:43 2007
New Revision: 569791

URL: http://svn.apache.org/viewvc?rev=569791&view=rev
Log:
Avoid split packages. The o.a.c.xml package is defined in the pipeline modules. NamespacesTable
hopefully only is used internally, so this shouldn't create any problems.

Added:
    cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/util/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/util/NamespacesTable.java
      - copied, changed from r569061, cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/NamespacesTable.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/util/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/util/NamespacesTableTestCase.java
      - copied, changed from r569061, cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java
Removed:
    cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/NamespacesTable.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java
Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/RedundantNamespacesFilter.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/JXPathExpression.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/NamespacesTablePointer.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java?rev=569791&r1=569790&r2=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
Sun Aug 26 02:58:43 2007
@@ -39,9 +39,9 @@
 import org.apache.cocoon.util.NetUtils;
 import org.apache.cocoon.xml.AbstractXMLPipe;
 import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.NamespacesTable;
 import org.apache.cocoon.xml.SaxBuffer;
 import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.util.NamespacesTable;
 
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceValidity;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java?rev=569791&r1=569790&r2=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java
Sun Aug 26 02:58:43 2007
@@ -20,6 +20,7 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
+import org.apache.cocoon.xml.util.NamespacesTable;
 import org.xml.sax.AttributeList;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DocumentHandler;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java?rev=569791&r1=569790&r2=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
Sun Aug 26 02:58:43 2007
@@ -17,6 +17,7 @@
 package org.apache.cocoon.xml;
 
 import org.apache.avalon.framework.logger.Logger;
+import org.apache.cocoon.xml.util.NamespacesTable;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.DocumentHandler;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/RedundantNamespacesFilter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/RedundantNamespacesFilter.java?rev=569791&r1=569790&r2=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/RedundantNamespacesFilter.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/RedundantNamespacesFilter.java
Sun Aug 26 02:58:43 2007
@@ -16,6 +16,7 @@
  */
 package org.apache.cocoon.xml;
 
+import org.apache.cocoon.xml.util.NamespacesTable;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/JXPathExpression.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/JXPathExpression.java?rev=569791&r1=569790&r2=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/JXPathExpression.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/JXPathExpression.java
Sun Aug 26 02:58:43 2007
@@ -24,7 +24,7 @@
 import org.apache.cocoon.el.ExpressionException;
 import org.apache.cocoon.el.impl.jexl.JSIntrospector;
 import org.apache.cocoon.el.objectmodel.ObjectModel;
-import org.apache.cocoon.xml.NamespacesTable;
+import org.apache.cocoon.xml.util.NamespacesTable;
 import org.apache.commons.jxpath.CompiledExpression;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.Pointer;

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/NamespacesTablePointer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/NamespacesTablePointer.java?rev=569791&r1=569790&r2=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/NamespacesTablePointer.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jxpath/NamespacesTablePointer.java
Sun Aug 26 02:58:43 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.cocoon.el.impl.jxpath;
 
-import org.apache.cocoon.xml.NamespacesTable;
+import org.apache.cocoon.xml.util.NamespacesTable;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;

Copied: cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/util/NamespacesTable.java
(from r569061, cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/NamespacesTable.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/util/NamespacesTable.java?p2=cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/util/NamespacesTable.java&p1=cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/NamespacesTable.java&r1=569061&r2=569791&rev=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/NamespacesTable.java
(original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/main/java/org/apache/cocoon/xml/util/NamespacesTable.java
Sun Aug 26 02:58:43 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.xml;
+package org.apache.cocoon.xml.util;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;

Copied: cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/util/NamespacesTableTestCase.java
(from r569061, cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/util/NamespacesTableTestCase.java?p2=cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/util/NamespacesTableTestCase.java&p1=cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java&r1=569061&r2=569791&rev=569791&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-util/src/test/java/org/apache/cocoon/xml/util/NamespacesTableTestCase.java
Sun Aug 26 02:58:43 2007
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.xml;
+package org.apache.cocoon.xml.util;
 
 import junit.framework.TestCase;
 
+import org.apache.cocoon.xml.util.NamespacesTable;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.helpers.DefaultHandler;
 



Mime
View raw message