You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2009/12/07 18:52:12 UTC
svn commit: r888049 - in /mina/sandbox/vysper/trunk/nbxml/src:
main/java/org/apache/vysper/xml/ main/java/org/apache/vysper/xml/decoder/
main/java/org/apache/vysper/xml/fragment/
main/java/org/apache/vysper/xmpp/xmldecoder/ main/java/org/apache/vysper/...
Author: ngn
Date: Mon Dec 7 17:52:09 2009
New Revision: 888049
URL: http://svn.apache.org/viewvc?rev=888049&view=rev
Log:
Renamed packaged for XML implementation
Added:
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/
- copied from r888000, mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmldecoder/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/ParticleDecoder.java
- copied, changed from r888001, mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoder.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/
- copied from r888000, mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/
- copied from r888000, mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmldecoder/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/ParticleDecoderTestCase.java
- copied, changed from r888001, mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoderTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/
- copied from r888000, mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/
Removed:
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmldecoder/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmldecoder/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/
Modified:
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/DecodingException.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/UnsupportedXMLException.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementBuilderFactory.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLParticle.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverter.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLStreamTokenizer.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/AbstractXMLElementBuilder.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Attribute.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/EqualityVerifier.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/FragmentFactory.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceResolver.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/SimpleNamespaceResolver.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementBuilder.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLFragment.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLSemanticError.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLText.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLParticleTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterBalancedTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertErrorTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/AttributeTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/DecodingException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/DecodingException.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/DecodingException.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/DecodingException.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
/**
*
Copied: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/ParticleDecoder.java (from r888001, mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoder.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/ParticleDecoder.java?p2=mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/ParticleDecoder.java&p1=mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoder.java&r1=888001&r2=888049&rev=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoder.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/ParticleDecoder.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import org.apache.mina.common.ByteBuffer;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/UnsupportedXMLException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/UnsupportedXMLException.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/UnsupportedXMLException.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/UnsupportedXMLException.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
/**
* some valid XML is unsupported in XMPP. see RFC3920/11.
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementBuilderFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementBuilderFactory.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementBuilderFactory.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementBuilderFactory.java Mon Dec 7 17:52:09 2009
@@ -18,14 +18,14 @@
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import java.util.List;
-import org.apache.vysper.xmpp.xmlfragment.AbstractXMLElementBuilder;
-import org.apache.vysper.xmpp.xmlfragment.Attribute;
-import org.apache.vysper.xmpp.xmlfragment.XMLElementBuilder;
-import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
+import org.apache.vysper.xml.fragment.AbstractXMLElementBuilder;
+import org.apache.vysper.xml.fragment.Attribute;
+import org.apache.vysper.xml.fragment.XMLElementBuilder;
+import org.apache.vysper.xml.fragment.XMLFragment;
/**
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLParticle.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLParticle.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLParticle.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLParticle.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverter.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverter.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverter.java Mon Dec 7 17:52:09 2009
@@ -17,16 +17,16 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
-import org.apache.vysper.xmpp.xmlfragment.Attribute;
-import org.apache.vysper.xmpp.xmlfragment.XMLElement;
-import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
-import org.apache.vysper.xmpp.xmlfragment.XMLText;
+import org.apache.vysper.xml.fragment.Attribute;
+import org.apache.vysper.xml.fragment.XMLElement;
+import org.apache.vysper.xml.fragment.XMLFragment;
+import org.apache.vysper.xml.fragment.XMLText;
/**
* determines, if a sequence of XMLParticles is balanced, and if it is, converts them to XMLFragments (which are understood
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLStreamTokenizer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLStreamTokenizer.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLStreamTokenizer.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLStreamTokenizer.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +27,8 @@
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.vysper.charset.CharsetUtil;
-import org.apache.vysper.xmpp.xmlfragment.XMLElement;
-import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
+import org.apache.vysper.xml.fragment.XMLElement;
+import org.apache.vysper.xml.fragment.XMLFragment;
/**
* splits xml stream into handy tokens for further processing
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/AbstractXMLElementBuilder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/AbstractXMLElementBuilder.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/AbstractXMLElementBuilder.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/AbstractXMLElementBuilder.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.ArrayList;
import java.util.List;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Attribute.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Attribute.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Attribute.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Attribute.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
* represents an XML element's attribute
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/EqualityVerifier.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/EqualityVerifier.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/EqualityVerifier.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/EqualityVerifier.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.Comparator;
import java.util.TreeSet;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/FragmentFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/FragmentFactory.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/FragmentFactory.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/FragmentFactory.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.ArrayList;
import java.util.Arrays;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
*
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceResolver.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceResolver.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceResolver.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceResolver.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
public interface NamespaceResolver {
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
* common XML namespace URIs
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.Map;
import java.util.Map.Entry;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/SimpleNamespaceResolver.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/SimpleNamespaceResolver.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/SimpleNamespaceResolver.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/SimpleNamespaceResolver.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.LinkedHashMap;
import java.util.Map;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.ArrayList;
import java.util.Collections;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementBuilder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementBuilder.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementBuilder.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementBuilder.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.List;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import java.util.List;
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLFragment.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLFragment.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLFragment.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLFragment.java Mon Dec 7 17:52:09 2009
@@ -18,7 +18,7 @@
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
*
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLSemanticError.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLSemanticError.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLSemanticError.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLSemanticError.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
* the XML was syntactically ok, but business logic applied on xml level revealed semantical problems
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLText.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLText.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLText.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/XMLText.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
/**
* immutable text section (as it can appear between two xml elements
Copied: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/ParticleDecoderTestCase.java (from r888001, mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoderTestCase.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/ParticleDecoderTestCase.java?p2=mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/ParticleDecoderTestCase.java&p1=mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoderTestCase.java&r1=888001&r2=888049&rev=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoderTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/ParticleDecoderTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.vysper.charset.CharsetUtil;
+import org.apache.vysper.xml.decoder.ParticleDecoder;
+import org.apache.vysper.xml.decoder.XMLParticle;
/**
*/
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLParticleTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLParticleTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLParticleTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLParticleTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,10 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
+
+import org.apache.vysper.xml.decoder.DecodingException;
+import org.apache.vysper.xml.decoder.XMLParticle;
import junit.framework.TestCase;
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterBalancedTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterBalancedTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterBalancedTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterBalancedTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,13 +17,17 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import junit.framework.TestCase;
import java.util.List;
import java.util.ArrayList;
+import org.apache.vysper.xml.decoder.DecodingException;
+import org.apache.vysper.xml.decoder.XMLParticle;
+import org.apache.vysper.xml.decoder.XMLRawToFragmentConverter;
+
/**
*/
public class XMLRawToFragmentConverterBalancedTestCase extends TestCase {
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertErrorTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertErrorTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertErrorTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertErrorTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,13 +17,18 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import junit.framework.TestCase;
import java.util.ArrayList;
import java.util.List;
+import org.apache.vysper.xml.decoder.DecodingException;
+import org.apache.vysper.xml.decoder.UnsupportedXMLException;
+import org.apache.vysper.xml.decoder.XMLParticle;
+import org.apache.vysper.xml.decoder.XMLRawToFragmentConverter;
+
/**
*/
public class XMLRawToFragmentConverterConvertErrorTestCase extends TestCase {
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/decoder/XMLRawToFragmentConverterConvertTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,12 +17,16 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmldecoder;
+package org.apache.vysper.xml.decoder;
import junit.framework.TestCase;
-import org.apache.vysper.xmpp.xmlfragment.XMLElement;
-import org.apache.vysper.xmpp.xmlfragment.Attribute;
-import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
+
+import org.apache.vysper.xml.decoder.DecodingException;
+import org.apache.vysper.xml.decoder.XMLParticle;
+import org.apache.vysper.xml.decoder.XMLRawToFragmentConverter;
+import org.apache.vysper.xml.fragment.Attribute;
+import org.apache.vysper.xml.fragment.XMLElement;
+import org.apache.vysper.xml.fragment.XMLElementVerifier;
import java.util.ArrayList;
import java.util.List;
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/AttributeTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/AttributeTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/AttributeTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/AttributeTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,9 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
+
+import org.apache.vysper.xml.fragment.Attribute;
import junit.framework.TestCase;
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,16 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
+
+import org.apache.vysper.xml.fragment.Attribute;
+import org.apache.vysper.xml.fragment.NamespaceAttribute;
+import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.Renderer;
+import org.apache.vysper.xml.fragment.XMLElement;
+import org.apache.vysper.xml.fragment.XMLElementBuilder;
+import org.apache.vysper.xml.fragment.XMLFragment;
+import org.apache.vysper.xml.fragment.XMLText;
import junit.framework.TestCase;
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,13 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
+
+import org.apache.vysper.xml.fragment.Attribute;
+import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.StackNamespaceResolver;
+import org.apache.vysper.xml.fragment.XMLElement;
+import org.apache.vysper.xml.fragment.XMLElementBuilder;
import junit.framework.TestCase;
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java?rev=888049&r1=888000&r2=888049&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java Mon Dec 7 17:52:09 2009
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.vysper.xmpp.xmlfragment;
+package org.apache.vysper.xml.fragment;
import junit.framework.TestCase;
@@ -26,6 +26,13 @@
import java.util.Map;
import java.util.Collections;
+import org.apache.vysper.xml.fragment.Attribute;
+import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.XMLElement;
+import org.apache.vysper.xml.fragment.XMLElementBuilder;
+import org.apache.vysper.xml.fragment.XMLSemanticError;
+import org.apache.vysper.xml.fragment.XMLText;
+
/**
*/
public class XMLElementTestCase extends TestCase {