You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/11/04 21:53:10 UTC
svn commit: r711396 - in /labs/vysper/src:
main/java/org/apache/vysper/mina/codec/
main/java/org/apache/vysper/xmpp/parser/
main/java/org/apache/vysper/xmpp/xmldecoder/
main/java/org/apache/vysper/xmpp/xmlfragment/
test/java/org/apache/vysper/xmpp/xmld...
Author: berndf
Date: Tue Nov 4 12:53:10 2008
New Revision: 711396
URL: http://svn.apache.org/viewvc?rev=711396&view=rev
Log:
[vysper] correct everything *Fragement* to *Fragment*
Added:
labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
- copied, changed from r671604, labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterBalancedTestCase.java
- copied, changed from r671604, labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterBalancedTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertErrorTestCase.java
- copied, changed from r672387, labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertTestCase.java
- copied, changed from r672387, labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java
Removed:
labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterBalancedTestCase.java
Modified:
labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java
Modified: labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java?rev=711396&r1=711395&r2=711396&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java Tue Nov 4 12:53:10 2008
@@ -25,7 +25,7 @@
import org.apache.vysper.xmpp.xmldecoder.DecodingException;
import org.apache.vysper.xmpp.xmldecoder.ParticleDecoder;
import org.apache.vysper.xmpp.xmldecoder.XMLParticle;
-import org.apache.vysper.xmpp.xmldecoder.XMLRawToFragementConverter;
+import org.apache.vysper.xmpp.xmldecoder.XMLRawToFragmentConverter;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
import org.slf4j.Logger;
@@ -40,7 +40,7 @@
public class XMLStreamTokenizer extends CumulativeProtocolDecoder {
public static final String SESSION_ATTRIBUTE_NAME = "tokenizerParticleList";
- private static final XMLRawToFragementConverter CONVERTER = new XMLRawToFragementConverter();
+ private static final XMLRawToFragmentConverter CONVERTER = new XMLRawToFragmentConverter();
final Logger clientStanzaLogger = LoggerFactory.getLogger("stanza.client");
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java?rev=711396&r1=711395&r2=711396&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java Tue Nov 4 12:53:10 2008
@@ -49,7 +49,7 @@
final protected static String DEFAULT_OPENING_XML_ELEMENT_NAME = "defaultOpener";
/**
- * to allow XML fragements to be parsed, which contain XML like this:
+ * to allow XML fragments to be parsed, which contain XML like this:
* <element1/><element2/>
* which is not allowed for top level XML (only one top level xml element, not more)
* an artificial opening element is prepended so that following elements are not top level anymore
Copied: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java (from r671604, labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java?p2=labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java&p1=labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java&r1=671604&r2=711396&rev=711396&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java Tue Nov 4 12:53:10 2008
@@ -26,13 +26,11 @@
import java.util.List;
import java.util.Stack;
-import com.sun.jndi.ldap.Ber;
-
/**
* determines, if a sequence of XMLParticles is balanced, and if it is, converts them to XMLFragments (which are understood
* by core XMPP engine.
*/
-public class XMLRawToFragementConverter {
+public class XMLRawToFragmentConverter {
private static final String CHAR_ATTR_EQUALS = "=";
private static final String CHAR_ATTR_SINGLEQUOTE = "'";
private static final String CHAR_ATTR_DOUBLEQUOTE = "\"";
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java?rev=711396&r1=711395&r2=711396&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java Tue Nov 4 12:53:10 2008
@@ -67,7 +67,7 @@
else if (xmlFragment instanceof XMLText) {
elementContentBuffer.append(((XMLText) xmlFragment).getText());
} else {
- throw new UnsupportedOperationException("cannot render XML fragement of type " + xmlFragment.getClass().getName());
+ throw new UnsupportedOperationException("cannot render XML fragment of type " + xmlFragment.getClass().getName());
}
}
Copied: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterBalancedTestCase.java (from r671604, labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterBalancedTestCase.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterBalancedTestCase.java?p2=labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterBalancedTestCase.java&p1=labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterBalancedTestCase.java&r1=671604&r2=711396&rev=711396&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterBalancedTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterBalancedTestCase.java Tue Nov 4 12:53:10 2008
@@ -23,7 +23,7 @@
/**
*/
-public class XMLRawToFragementConverterBalancedTestCase extends TestCase {
+public class XMLRawToFragmentConverterBalancedTestCase extends TestCase {
public void testSimple1() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -31,7 +31,7 @@
particles.add(new XMLParticle("<balanced>"));
particles.add(new XMLParticle("</balanced>"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testSimple2() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -40,28 +40,28 @@
particles.add(new XMLParticle("plain"));
particles.add(new XMLParticle("</balanced>"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testSimple3() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
particles.add(new XMLParticle("<balanced/>"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testSimple4() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
particles.add(new XMLParticle("balanced"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testSimple5() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
particles.add(new XMLParticle("<unbalanced>"));
- assertFalse(new XMLRawToFragementConverter().isBalanced(particles));
+ assertFalse(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testSimple6() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -69,7 +69,7 @@
particles.add(new XMLParticle("<unbalanced>"));
particles.add(new XMLParticle("<unbalanced2>"));
- assertFalse(new XMLRawToFragementConverter().isBalanced(particles));
+ assertFalse(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testSimple7() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -78,7 +78,7 @@
particles.add(new XMLParticle("</balanced>"));
particles.add(new XMLParticle("<unbalanced>"));
- assertFalse(new XMLRawToFragementConverter().isBalanced(particles));
+ assertFalse(new XMLRawToFragmentConverter().isBalanced(particles));
}
@@ -89,7 +89,7 @@
particles.add(new XMLParticle("<inner/>"));
particles.add(new XMLParticle("</balanced>"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testNested2() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -98,7 +98,7 @@
particles.add(new XMLParticle("inner"));
particles.add(new XMLParticle("</balanced>"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testNested3() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -108,7 +108,7 @@
particles.add(new XMLParticle("</inner>"));
particles.add(new XMLParticle("</balanced>"));
- assertTrue(new XMLRawToFragementConverter().isBalanced(particles));
+ assertTrue(new XMLRawToFragmentConverter().isBalanced(particles));
}
public void testNested4() throws DecodingException {
List<XMLParticle> particles = new ArrayList<XMLParticle>();
@@ -117,6 +117,6 @@
particles.add(new XMLParticle("<inner>"));
particles.add(new XMLParticle("</inner>"));
- assertFalse(new XMLRawToFragementConverter().isBalanced(particles));
+ assertFalse(new XMLRawToFragmentConverter().isBalanced(particles));
}
}
Copied: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertErrorTestCase.java (from r672387, labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertErrorTestCase.java?p2=labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertErrorTestCase.java&p1=labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java&r1=672387&r2=711396&rev=711396&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertErrorTestCase.java Tue Nov 4 12:53:10 2008
@@ -23,13 +23,13 @@
/**
*/
-public class XMLRawToFragementConverterConvertErrorTestCase extends TestCase {
- private XMLRawToFragementConverter xmlRawToFragementConverter;
+public class XMLRawToFragmentConverterConvertErrorTestCase extends TestCase {
+ private XMLRawToFragmentConverter xmlRawToFragmentConverter;
@Override
protected void setUp() throws Exception {
super.setUp();
- xmlRawToFragementConverter = new XMLRawToFragementConverter();
+ xmlRawToFragmentConverter = new XMLRawToFragmentConverter();
}
public void testTwoToplevels() throws DecodingException {
@@ -41,7 +41,7 @@
particles.add(new XMLParticle("</illegal-top-level>"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("to consecutive elements are not allowed on top level");
} catch (DecodingException e) {
// test succeded
@@ -58,7 +58,7 @@
particles.add(new XMLParticle("</illegal-top-level>"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("to consecutive elements are not allowed on top level");
} catch (DecodingException e) {
// test succeded
@@ -70,7 +70,7 @@
particles.add(new XMLParticle("<start <illegal start>> "));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("opening not allowed inside element");
} catch (DecodingException e) {
// test succeded
@@ -82,7 +82,7 @@
particles.add(new XMLParticle("<start attr='val' <illegal start>>"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("opening not allowed inside element");
} catch (DecodingException e) {
// test succeded
@@ -94,7 +94,7 @@
particles.add(new XMLParticle("< latename attr='val'>"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("opening xml element name to follow immediately after '<' ");
} catch (DecodingException e) {
// test succeded
@@ -107,7 +107,7 @@
particles.add(new XMLParticle("<name attr='val'>"));
particles.add(new XMLParticle("</nameother >"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("closing xml element name to follow immediately after '</'");
} catch (DecodingException e) {
// test succeded
@@ -120,7 +120,7 @@
particles.add(new XMLParticle("<name attr='val'>"));
particles.add(new XMLParticle("</ name >"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("closing xml element name to follow immediately after '</'");
} catch (DecodingException e) {
// test succeded
@@ -133,7 +133,7 @@
particles.add(new XMLParticle("<name attr='val'>"));
particles.add(new XMLParticle("< /name >"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("closing xml element must start with '</'");
} catch (DecodingException e) {
// test succeded
@@ -152,7 +152,7 @@
}
particles.add(particle);
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("closing xml element must not be empty (indirect access)");
} catch (DecodingException e) {
// test succeded
@@ -176,7 +176,7 @@
XMLParticle particle = new XMLParticle("<namespace: />");
particles.add(particle);
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("illegal element name");
} catch (DecodingException e) {
// test succeded
@@ -218,7 +218,7 @@
particles.add(new XMLParticle("<name attr='val' / >"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("opening+closing xml element must end with '/>'");
} catch (DecodingException e) {
// test succeded
@@ -230,7 +230,7 @@
particles.add(new XMLParticle("<name attr 'val' />"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("attribute and value must be separated by '='");
} catch (DecodingException e) {
// test succeded
@@ -242,7 +242,7 @@
particles.add(new XMLParticle("<!-- unsupported comment -->"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("comments are unsupported");
} catch (UnsupportedXMLException e) {
// test succeded
@@ -258,7 +258,7 @@
particles.add(new XMLParticle("<!-- unsupported comment -->"));
particles.add(new XMLParticle("</name >"));
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("comments are unsupported");
} catch (UnsupportedXMLException e) {
// test succeded
Copied: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertTestCase.java (from r672387, labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertTestCase.java?p2=labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertTestCase.java&p1=labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java&r1=672387&r2=711396&rev=711396&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverterConvertTestCase.java Tue Nov 4 12:53:10 2008
@@ -25,13 +25,13 @@
/**
*/
-public class XMLRawToFragementConverterConvertTestCase extends TestCase {
- private XMLRawToFragementConverter xmlRawToFragementConverter;
+public class XMLRawToFragmentConverterConvertTestCase extends TestCase {
+ private XMLRawToFragmentConverter xmlRawToFragmentConverter;
@Override
protected void setUp() throws Exception {
super.setUp();
- xmlRawToFragementConverter = new XMLRawToFragementConverter();
+ xmlRawToFragmentConverter = new XMLRawToFragmentConverter();
}
public void testElementSimple() throws DecodingException {
@@ -39,7 +39,7 @@
particles.add(new XMLParticle("<balanced/>"));
- XMLElement xmlElement = (XMLElement) xmlRawToFragementConverter.convert(particles);
+ XMLElement xmlElement = (XMLElement) xmlRawToFragmentConverter.convert(particles);
assertNotNull(xmlElement);
assertEquals("balanced", xmlElement.getName());
}
@@ -49,7 +49,7 @@
particles.add(new XMLParticle("<balanced attr1=\"1\" attr2='2' ns:at_tr3=\"\" />"));
- XMLElement xmlElement = (XMLElement) xmlRawToFragementConverter.convert(particles);
+ XMLElement xmlElement = (XMLElement) xmlRawToFragmentConverter.convert(particles);
assertNotNull(xmlElement);
assertEquals("balanced", xmlElement.getName());
List<Attribute> attributes = xmlElement.getAttributes();
@@ -66,7 +66,7 @@
particles.add(new XMLParticle("<balanced attr1 = \"1\" attr2=' 2 ' ns:at_tr3= \" \" />"));
- XMLElement xmlElement = (XMLElement) xmlRawToFragementConverter.convert(particles);
+ XMLElement xmlElement = (XMLElement) xmlRawToFragmentConverter.convert(particles);
assertNotNull(xmlElement);
assertEquals("balanced", xmlElement.getName());
List<Attribute> attributes = xmlElement.getAttributes();
@@ -85,7 +85,7 @@
particles.add(new XMLParticle("<balanced>"));
particles.add(new XMLParticle("</balanced>"));
- XMLElement xmlElement = (XMLElement) xmlRawToFragementConverter.convert(particles);
+ XMLElement xmlElement = (XMLElement) xmlRawToFragmentConverter.convert(particles);
assertNotNull(xmlElement);
}
@@ -97,7 +97,7 @@
particles.add(new XMLParticle("</inner>"));
particles.add(new XMLParticle("</balanced>"));
- XMLElement xmlElement = (XMLElement) xmlRawToFragementConverter.convert(particles);
+ XMLElement xmlElement = (XMLElement) xmlRawToFragmentConverter.convert(particles);
assertEquals(1, ((XMLElement)xmlElement).getInnerElements().size());
}
@@ -107,7 +107,7 @@
XMLParticle particle = new XMLParticle("<:name />");
particles.add(particle);
try {
- xmlRawToFragementConverter.convert(particles);
+ xmlRawToFragmentConverter.convert(particles);
fail("colon at start denotes legal element name (according to XML Spec) -- but we don't support it");
} catch (DecodingException e) {
// succeeded
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org