Andrew, On Sat, Sep 06, 2008 at 02:23:51PM +0100, Andrew Haley wrote: > Michael Schutte wrote: > > Hi Javaists, > > > > [Please Cc me on replies, I’m not subscribed] > > > > Could one of you be so kind and check my proposed QA upload of trang > > fixing #478187? The error occurs because gcj hides an internal package > > of trang behind a built-in one, which causes the very fancy message > > described in the bug report. The source package is at: > > > > http://alioth.debian.org/~michi-guest/packages/trang_20030619-7.dsc > > […] > > I'm guessing that there was a missing -findirect-dispatch -Bsymbolic. Thanks for the tip, but -findirect-dispatch was already there, and adding -Bsymbolic does not fix the problem. > I'd be quite interested to see what you've changed and what broke, but > sadly my Debian smarts are inadequate to decude that URL. # aptitude install devscripts $ dget -xu http://alioth.debian.org/~michi-guest/packages/trang_20030619-7.dsc $ cd trang-20030619 For your convenience, I’ve also attached a patch between the buggy -6.1 and my -7. Cheers, -- Michael Schutte <michi@uiae.at>
diff -u trang-20030619/Makefile trang-20030619/Makefile
--- trang-20030619/Makefile
+++ trang-20030619/Makefile
@@ -501,7 +501,7 @@
src/META-INF/services/com.thaiopensource.validate.auto.SchemaReceiverFactory.o \
src/META-INF/services/com.thaiopensource.validate.SchemaReaderFactory.o \
src/META-INF/services/javax.xml.parsers.SAXParserFactory.o \
- src/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory.o \
+ src/META-INF/services/com.thaiopensource.relaxng.datatype.DatatypeLibraryFactory.o \
src/com/thaiopensource/datatype/xsd/resources/Messages.properties.o \
src/com/thaiopensource/relaxng/parse/compact/resources/Messages.properties.o \
src/com/thaiopensource/relaxng/parse/sax/resources/Messages.properties.o \
diff -u trang-20030619/debian/rules trang-20030619/debian/rules
--- trang-20030619/debian/rules
+++ trang-20030619/debian/rules
@@ -39,6 +39,7 @@
dh_testdir
# Add here commands to compile the package.
+ mv src/org/relaxng/datatype src/com/thaiopensource/relaxng/
$(MAKE)
#/usr/bin/docbook-to-man debian/trang.sgml > trang.1
@@ -50,6 +51,8 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
+ [ ! -d src/com/thaiopensource/relaxng/datatype ] || \
+ mv src/com/thaiopensource/relaxng/datatype src/org/relaxng/
[ ! -f config.status ] || [ ! -f Makefile ] || $(MAKE) distclean
rm -f config.sub config.guess test_trang
diff -u trang-20030619/debian/control trang-20030619/debian/control
--- trang-20030619/debian/control
+++ trang-20030619/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends: debhelper (>> 5), autotools-dev, gcj [!alpha !arm !hppa !hurd-i386]
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.thaiopensource.com/relaxng/trang.html
Package: trang
diff -u trang-20030619/debian/changelog trang-20030619/debian/changelog
--- trang-20030619/debian/changelog
+++ trang-20030619/debian/changelog
@@ -1,3 +1,14 @@
+trang (20030619-7) unstable; urgency=low
+
+ * QA upload.
+ * Before running make, move the org.relaxng.datatype directory to
+ com.thaiopensource.relaxng.datatype and adjust the affected import
+ statements. This avoids that gcj erroneously uses its built-in version of
+ this package and closes: #478187.
+ * Bump Standards-Version to 3.8.0 (no changes needed).
+
+ -- Michael Schutte <m.schutte.jr@gmail.com> Fri, 05 Sep 2008 22:07:08 +0200
+
trang (20030619-6.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- trang-20030619.orig/Makefile.in
+++ trang-20030619/Makefile.in
@@ -447,16 +447,16 @@
$(srcdir)/src/com/thaiopensource/xml/infer/ElementDeclInferrer.java \
$(srcdir)/src/com/thaiopensource/xml/infer/ContentModelInferrerImpl.java \
$(srcdir)/src/com/thaiopensource/xml/infer/ContentModelInferrer.java \
- $(srcdir)/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java \
- $(srcdir)/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java \
- $(srcdir)/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java \
- $(srcdir)/src/org/relaxng/datatype/Datatype.java \
- $(srcdir)/src/org/relaxng/datatype/DatatypeBuilder.java \
- $(srcdir)/src/org/relaxng/datatype/DatatypeException.java \
- $(srcdir)/src/org/relaxng/datatype/DatatypeLibrary.java \
- $(srcdir)/src/org/relaxng/datatype/DatatypeLibraryFactory.java \
- $(srcdir)/src/org/relaxng/datatype/DatatypeStreamingValidator.java \
- $(srcdir)/src/org/relaxng/datatype/ValidationContext.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/helpers/DatatypeLibraryLoader.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/helpers/StreamingValidatorImpl.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/Datatype.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/DatatypeBuilder.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/DatatypeException.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/DatatypeLibrary.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/DatatypeLibraryFactory.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/DatatypeStreamingValidator.java \
+ $(srcdir)/src/com/thaiopensource/relaxng/datatype/ValidationContext.java \
$(srcdir)/src/org/apache/crimson/jaxp/DefaultValidationErrorHandler.java \
$(srcdir)/src/org/apache/crimson/jaxp/SAXParserFactoryImpl.java \
$(srcdir)/src/org/apache/crimson/jaxp/SAXParserImpl.java \
@@ -582,9 +582,8 @@
src/META-INF \
src/META-INF/services \
src/org \
- src/org/relaxng \
- src/org/relaxng/datatype \
- src/org/relaxng/datatype/helpers \
+ src/com/thaiopensource/relaxng/datatype \
+ src/com/thaiopensource/relaxng/datatype/helpers \
src/org/apache \
src/org/apache/crimson \
src/org/apache/crimson/jaxp \
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/xml/infer/InferHandler.java
+++ trang-20030619/src/com/thaiopensource/xml/infer/InferHandler.java
@@ -3,7 +3,7 @@
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.relaxng.datatype.DatatypeLibraryFactory;
+import com.thaiopensource.relaxng.datatype.DatatypeLibraryFactory;
import java.util.Map;
import java.util.HashMap;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/xml/infer/TestDriver.java
+++ trang-20030619/src/com/thaiopensource/xml/infer/TestDriver.java
@@ -7,7 +7,7 @@
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
-import org.relaxng.datatype.helpers.DatatypeLibraryLoader;
+import com.thaiopensource.relaxng.datatype.helpers.DatatypeLibraryLoader;
import java.io.IOException;
import java.util.Iterator;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/xml/infer/DatatypeRepertoire.java
+++ trang-20030619/src/com/thaiopensource/xml/infer/DatatypeRepertoire.java
@@ -1,9 +1,9 @@
package com.thaiopensource.xml.infer;
-import org.relaxng.datatype.DatatypeLibrary;
-import org.relaxng.datatype.Datatype;
-import org.relaxng.datatype.DatatypeException;
-import org.relaxng.datatype.DatatypeLibraryFactory;
+import com.thaiopensource.relaxng.datatype.DatatypeLibrary;
+import com.thaiopensource.relaxng.datatype.Datatype;
+import com.thaiopensource.relaxng.datatype.DatatypeException;
+import com.thaiopensource.relaxng.datatype.DatatypeLibraryFactory;
import com.thaiopensource.util.Uri;
import com.thaiopensource.xml.util.WellKnownNamespaces;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/input/xml/Inferrer.java
+++ trang-20030619/src/com/thaiopensource/relaxng/input/xml/Inferrer.java
@@ -33,7 +33,7 @@
import com.thaiopensource.xml.infer.Schema;
import com.thaiopensource.xml.infer.SequenceParticle;
import com.thaiopensource.xml.infer.TextParticle;
-import org.relaxng.datatype.helpers.DatatypeLibraryLoader;
+import com.thaiopensource.relaxng.datatype.helpers.DatatypeLibraryLoader;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/input/parse/ParseInputFormat.java
+++ trang-20030619/src/com/thaiopensource/relaxng/input/parse/ParseInputFormat.java
@@ -11,7 +11,7 @@
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.relaxng.datatype.helpers.DatatypeLibraryLoader;
+import com.thaiopensource.relaxng.datatype.helpers.DatatypeLibraryLoader;
import java.io.IOException;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/input/parse/SchemaBuilderImpl.java
+++ trang-20030619/src/com/thaiopensource/relaxng/input/parse/SchemaBuilderImpl.java
@@ -63,12 +63,12 @@
import com.thaiopensource.relaxng.parse.CommentList;
import com.thaiopensource.relaxng.parse.SubParser;
import com.thaiopensource.util.Localizer;
-import org.relaxng.datatype.Datatype;
-import org.relaxng.datatype.DatatypeException;
-import org.relaxng.datatype.DatatypeLibrary;
-import org.relaxng.datatype.DatatypeLibraryFactory;
-import org.relaxng.datatype.ValidationContext;
-import org.relaxng.datatype.DatatypeBuilder;
+import com.thaiopensource.relaxng.datatype.Datatype;
+import com.thaiopensource.relaxng.datatype.DatatypeException;
+import com.thaiopensource.relaxng.datatype.DatatypeLibrary;
+import com.thaiopensource.relaxng.datatype.DatatypeLibraryFactory;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.DatatypeBuilder;
import org.xml.sax.SAXException;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/parse/SchemaBuilder.java
+++ trang-20030619/src/com/thaiopensource/relaxng/parse/SchemaBuilder.java
@@ -1,6 +1,6 @@
package com.thaiopensource.relaxng.parse;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
public interface SchemaBuilder {
ParsedPattern makeChoice(ParsedPattern[] patterns, int nPatterns, Location loc, Annotations anno) throws BuildException;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/parse/Context.java
+++ trang-20030619/src/com/thaiopensource/relaxng/parse/Context.java
@@ -1,6 +1,6 @@
package com.thaiopensource.relaxng.parse;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import java.util.Enumeration;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/relaxng/parse/sax/DtdContext.java
+++ trang-20030619/src/com/thaiopensource/relaxng/parse/sax/DtdContext.java
@@ -2,7 +2,7 @@
import org.xml.sax.DTDHandler;
import org.xml.sax.SAXException;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import java.util.Hashtable;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/Datatype2.java
+++ trang-20030619/src/com/thaiopensource/datatype/Datatype2.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype;
-import org.relaxng.datatype.Datatype;
+import com.thaiopensource.relaxng.datatype.Datatype;
public interface Datatype2 extends Datatype {
boolean alwaysValid();
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/FloatDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/FloatDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class FloatDatatype extends DoubleDatatype {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/EntityDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/EntityDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class EntityDatatype extends NCNameDatatype {
boolean allowsValue(String str, ValidationContext vc) {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/Base64BinaryDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/Base64BinaryDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class Base64BinaryDatatype extends BinaryDatatype {
static private final byte[] weightTable = makeWeightTable();
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DateTimeDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DateTimeDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import java.util.Calendar;
import java.util.Date;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/QNameDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/QNameDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import com.thaiopensource.xml.util.Naming;
class QNameDatatype extends DatatypeBase {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/AnyUriDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/AnyUriDatatype.java
@@ -1,7 +1,7 @@
package com.thaiopensource.datatype.xsd;
import com.thaiopensource.util.Uri;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class AnyUriDatatype extends TokenDatatype {
public boolean lexicallyAllows(String str) {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/MaxExclusiveRestrictDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/MaxExclusiveRestrictDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class MaxExclusiveRestrictDatatype extends ValueRestrictDatatype {
private final OrderRelation order;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DoubleDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DoubleDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class DoubleDatatype extends DatatypeBase implements OrderRelation {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DatatypeLibraryImpl.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DatatypeLibraryImpl.java
@@ -7,10 +7,10 @@
import com.thaiopensource.datatype.xsd.regex.RegexEngine;
import com.thaiopensource.datatype.xsd.regex.RegexSyntaxException;
-import org.relaxng.datatype.DatatypeLibrary;
-import org.relaxng.datatype.Datatype;
-import org.relaxng.datatype.DatatypeException;
-import org.relaxng.datatype.DatatypeBuilder;
+import com.thaiopensource.relaxng.datatype.DatatypeLibrary;
+import com.thaiopensource.relaxng.datatype.Datatype;
+import com.thaiopensource.relaxng.datatype.DatatypeException;
+import com.thaiopensource.relaxng.datatype.DatatypeBuilder;
public class DatatypeLibraryImpl implements DatatypeLibrary {
private final Hashtable typeTable = new Hashtable();
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/TokenDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/TokenDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import com.thaiopensource.util.Utf16;
class TokenDatatype extends DatatypeBase implements Measure {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/RestrictDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/RestrictDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class RestrictDatatype extends DatatypeBase {
protected final DatatypeBase base;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DatatypeBuilderImpl.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DatatypeBuilderImpl.java
@@ -3,10 +3,10 @@
import java.util.ResourceBundle;
import java.text.MessageFormat;
-import org.relaxng.datatype.Datatype;
-import org.relaxng.datatype.DatatypeBuilder;
-import org.relaxng.datatype.ValidationContext;
-import org.relaxng.datatype.DatatypeException;
+import com.thaiopensource.relaxng.datatype.Datatype;
+import com.thaiopensource.relaxng.datatype.DatatypeBuilder;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.DatatypeException;
import com.thaiopensource.datatype.xsd.regex.RegexSyntaxException;
import com.thaiopensource.util.Localizer;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/BooleanDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/BooleanDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class BooleanDatatype extends DatatypeBase {
boolean lexicallyAllows(String str) {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/MinInclusiveRestrictDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/MinInclusiveRestrictDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class MinInclusiveRestrictDatatype extends ValueRestrictDatatype {
private final OrderRelation order;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DatatypeBase.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DatatypeBase.java
@@ -1,10 +1,10 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.Datatype;
-import org.relaxng.datatype.DatatypeException;
-import org.relaxng.datatype.ValidationContext;
-import org.relaxng.datatype.DatatypeStreamingValidator;
-import org.relaxng.datatype.helpers.StreamingValidatorImpl;
+import com.thaiopensource.relaxng.datatype.Datatype;
+import com.thaiopensource.relaxng.datatype.DatatypeException;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.DatatypeStreamingValidator;
+import com.thaiopensource.relaxng.datatype.helpers.StreamingValidatorImpl;
import com.thaiopensource.datatype.Datatype2;
abstract class DatatypeBase implements Datatype2 {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/HexBinaryDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/HexBinaryDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class HexBinaryDatatype extends BinaryDatatype {
static private final int INVALID = -1;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DurationDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DurationDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import java.math.BigInteger;
import java.math.BigDecimal;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/ListDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/ListDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
import com.thaiopensource.xml.util.StringSplitter;
class ListDatatype extends DatatypeBase implements Measure {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/ValueRestrictDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/ValueRestrictDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
abstract class ValueRestrictDatatype extends RestrictDatatype {
ValueRestrictDatatype(DatatypeBase base) {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/MaxInclusiveRestrictDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/MaxInclusiveRestrictDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class MaxInclusiveRestrictDatatype extends ValueRestrictDatatype {
private final OrderRelation order;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/MinExclusiveRestrictDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/MinExclusiveRestrictDatatype.java
@@ -1,6 +1,6 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class MinExclusiveRestrictDatatype extends ValueRestrictDatatype {
private final OrderRelation order;
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DecimalDatatype.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DecimalDatatype.java
@@ -2,7 +2,7 @@
import java.math.BigDecimal;
-import org.relaxng.datatype.ValidationContext;
+import com.thaiopensource.relaxng.datatype.ValidationContext;
class DecimalDatatype extends DatatypeBase implements OrderRelation {
only in patch2:
unchanged:
--- trang-20030619.orig/src/com/thaiopensource/datatype/xsd/DatatypeLibraryFactoryImpl.java
+++ trang-20030619/src/com/thaiopensource/datatype/xsd/DatatypeLibraryFactoryImpl.java
@@ -1,7 +1,7 @@
package com.thaiopensource.datatype.xsd;
-import org.relaxng.datatype.DatatypeLibrary;
-import org.relaxng.datatype.DatatypeLibraryFactory;
+import com.thaiopensource.relaxng.datatype.DatatypeLibrary;
+import com.thaiopensource.relaxng.datatype.DatatypeLibraryFactory;
import com.thaiopensource.xml.util.WellKnownNamespaces;
public class DatatypeLibraryFactoryImpl implements DatatypeLibraryFactory {
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/DatatypeLibrary.java
+++ trang-20030619/src/org/relaxng/datatype/DatatypeLibrary.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* A Datatype library
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/DatatypeLibraryFactory.java
+++ trang-20030619/src/org/relaxng/datatype/DatatypeLibraryFactory.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* Factory class for the DatatypeLibrary class.
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/DatatypeException.java
+++ trang-20030619/src/org/relaxng/datatype/DatatypeException.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* Signals Datatype related exceptions.
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/Datatype.java
+++ trang-20030619/src/org/relaxng/datatype/Datatype.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* Datatype object.
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/DatatypeBuilder.java
+++ trang-20030619/src/org/relaxng/datatype/DatatypeBuilder.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* Creates a user-defined type by adding parameters to
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/DatatypeStreamingValidator.java
+++ trang-20030619/src/org/relaxng/datatype/DatatypeStreamingValidator.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* Datatype streaming validator.
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/ValidationContext.java
+++ trang-20030619/src/org/relaxng/datatype/ValidationContext.java
@@ -1,4 +1,4 @@
-package org.relaxng.datatype;
+package com.thaiopensource.relaxng.datatype;
/**
* An interface that must be implemented by caller to
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+++ trang-20030619/src/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
@@ -1,6 +1,6 @@
-package org.relaxng.datatype.helpers;
+package com.thaiopensource.relaxng.datatype.helpers;
-import org.relaxng.datatype.*;
+import com.thaiopensource.relaxng.datatype.*;
/**
* Dummy implementation of {@link DatatypeStreamingValidator}.
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
+++ trang-20030619/src/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
@@ -31,10 +31,10 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.relaxng.datatype.helpers;
+package com.thaiopensource.relaxng.datatype.helpers;
-import org.relaxng.datatype.DatatypeLibraryFactory;
-import org.relaxng.datatype.DatatypeLibrary;
+import com.thaiopensource.relaxng.datatype.DatatypeLibraryFactory;
+import com.thaiopensource.relaxng.datatype.DatatypeLibrary;
import java.util.Enumeration;
import java.util.NoSuchElementException;
import java.util.Vector;
only in patch2:
unchanged:
--- trang-20030619.orig/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
+++ trang-20030619/src/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
@@ -1,6 +1,6 @@
-package org.relaxng.datatype.helpers;
+package com.thaiopensource.relaxng.datatype.helpers;
-import org.relaxng.datatype.*;
+import com.thaiopensource.relaxng.datatype.*;
/**
* Dummy implementation of {@link DatatypeBuilder}.
Attachment:
signature.asc
Description: Digital signature