svn commit: r939035 - in /webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom: om/impl/SwitchingWrapper.java om/impl/util/NamespaceContextImpl.java util/namespace/MapBasedNamespaceContext.java

[veithen]

Author: veithen
Date: Wed Apr 28 18:18:50 2010
New Revision: 939035

URL: http://svn.apache.org/viewvc?rev=939035&view=rev
Log:
Moved NamespaceContextImpl to org.apache.axiom.util.namespace and renamed it to 
MapBasedNamespaceContext. Note that the NamespaceContextImpl class (in 
org.apache.axiom.om.impl) was introduced after the 1.2.8 release; therefore, 
there is no need to keep a compatibility class here.

Added:
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java
      - copied, changed from r937790, 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/NamespaceContextImpl.java
Removed:
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/NamespaceContextImpl.java
Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java?rev=939035&r1=939034&r2=939035&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
 Wed Apr 28 18:18:50 2010
@@ -52,7 +52,7 @@ import org.apache.axiom.om.impl.OMNaviga
 import org.apache.axiom.om.impl.builder.DataHandlerReaderUtils;
 import org.apache.axiom.om.impl.builder.StAXBuilder;
 import org.apache.axiom.om.impl.exception.OMStreamingException;
-import org.apache.axiom.om.impl.util.NamespaceContextImpl;
+import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
 import org.apache.axiom.util.stax.AbstractXMLStreamReader;
 import org.apache.axiom.util.stax.DummyLocation;
 import org.apache.commons.logging.Log;
@@ -1127,7 +1127,7 @@ class SwitchingWrapper extends AbstractX
         if (state==SWITCHED){
             return parser.getNamespaceContext();
         }
-        return new NamespaceContextImpl(
+        return new MapBasedNamespaceContext(
                 currentEvent == END_DOCUMENT ? Collections.EMPTY_MAP : 
getAllNamespaces(lastNode));
     }
 

Copied: 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java
 (from r937790, 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/NamespaceContextImpl.java)
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/NamespaceContextImpl.java&r1=937790&r2=939035&rev=939035&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/NamespaceContextImpl.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java
 Wed Apr 28 18:18:50 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axiom.om.impl.util;
+package org.apache.axiom.util.namespace;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -25,12 +25,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.axiom.util.namespace.AbstractNamespaceContext;
-
-public class NamespaceContextImpl extends AbstractNamespaceContext {
+public class MapBasedNamespaceContext extends AbstractNamespaceContext {
     protected Map namespaces;
 
-    public NamespaceContextImpl(Map map) {
+    public MapBasedNamespaceContext(Map map) {
         namespaces = map;
     }