diff --git a/jaxb-ri/boms/bom-ext/pom.xml b/jaxb-ri/boms/bom-ext/pom.xml index 92271356e..15d784a7c 100644 --- a/jaxb-ri/boms/bom-ext/pom.xml +++ b/jaxb-ri/boms/bom-ext/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/jaxb-ri/boms/bom/pom.xml b/jaxb-ri/boms/bom/pom.xml index ed3eed3c1..808fc5005 100644 --- a/jaxb-ri/boms/bom/pom.xml +++ b/jaxb-ri/boms/bom/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/jaxb-ri/bundles/jxc/pom.xml b/jaxb-ri/bundles/jxc/pom.xml index 12607c54f..f5b400ed1 100644 --- a/jaxb-ri/bundles/jxc/pom.xml +++ b/jaxb-ri/bundles/jxc/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -338,7 +338,7 @@ relaxngDatatype:relaxngDatatype org.glassfish.jaxb:codemodel - org.kohsuke.rngom:rngom + com.sun.tools.rngom:rngom com.sun.xml.bind.external:rngom com.sun.xml.dtd-parser:dtd-parser com.sun.istack:istack-commons-tools diff --git a/jaxb-ri/bundles/osgi/osgi/pom.xml b/jaxb-ri/bundles/osgi/osgi/pom.xml index cd37359b3..786461447 100644 --- a/jaxb-ri/bundles/osgi/osgi/pom.xml +++ b/jaxb-ri/bundles/osgi/osgi/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -274,7 +274,7 @@ org.jvnet.fastinfoset.*;version=${fastinfoset.version}, org.jvnet.staxex;version=${stax-ex.version}, org.jvnet.staxex.util;version=${stax-ex.version}, - org.kohsuke.rngom.*;version=${jaxb.osgiVersion}, + com.sun.tools.rngom.*;version=${jaxb.osgiVersion}, org.relaxng.datatype;version=${relaxngDatatype.version}, org.relaxng.datatype.*;version=${relaxngDatatype.version} diff --git a/jaxb-ri/external/rngom/exclude-rngom.xml b/jaxb-ri/external/rngom/exclude-rngom.xml index 2e50f842b..74fb7357b 100644 --- a/jaxb-ri/external/rngom/exclude-rngom.xml +++ b/jaxb-ri/external/rngom/exclude-rngom.xml @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -60,27 +60,27 @@ - - - - - - - + + + + + + + - + - - + + diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Annotations.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Annotations.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Annotations.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Annotations.java index f23604803..93501bfd2 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Annotations.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Annotations.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.Location; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/BuildException.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/BuildException.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/BuildException.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/BuildException.java index 934878f2b..2780c209a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/BuildException.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/BuildException.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; /** * Signals an error while building schemas. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/CommentList.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/CommentList.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/CommentList.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/CommentList.java index e0e62151e..160d60752 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/CommentList.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/CommentList.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.Location; public interface CommentList { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/DataPatternBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/DataPatternBuilder.java similarity index 85% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/DataPatternBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/DataPatternBuilder.java index 71d5691f0..57837b40e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/DataPatternBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/DataPatternBuilder.java @@ -19,12 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.*; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.*; public interface DataPatternBuilder< diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Div.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Div.java similarity index 87% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Div.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Div.java index 8353cf99b..7d76c0604 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Div.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Div.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; public interface Div< diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/ElementAnnotationBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/ElementAnnotationBuilder.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/ElementAnnotationBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/ElementAnnotationBuilder.java index 55f862251..685b349fc 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/ElementAnnotationBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/ElementAnnotationBuilder.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * Used to build foreign element annotations. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Grammar.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Grammar.java similarity index 88% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Grammar.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Grammar.java index fa28fea58..270695aab 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Grammar.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Grammar.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * {@link Scope} for {@code } element that serves as a container diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/GrammarSection.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/GrammarSection.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/GrammarSection.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/GrammarSection.java index 0005bd63a..a364f979d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/GrammarSection.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/GrammarSection.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * The container that can have {@code } elements. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Include.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Include.java similarity index 84% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Include.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Include.java index 566f4641f..7df09d042 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Include.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Include.java @@ -19,14 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; - -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; public interface Include< P extends ParsedPattern, diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/IncludedGrammar.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/IncludedGrammar.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java index e88c8a969..7d3529605 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/IncludedGrammar.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Parseable; /** * {@link Scope} for {@code } element of the {@code }d grammar. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/NameClassBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/NameClassBuilder.java similarity index 91% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/NameClassBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/NameClassBuilder.java index a9428370e..77426d03b 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/NameClassBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/NameClassBuilder.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedNameClass; import java.util.List; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/SchemaBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/SchemaBuilder.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/SchemaBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/SchemaBuilder.java index 259f88ea2..99737c49c 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/SchemaBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/SchemaBuilder.java @@ -19,15 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; - -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.*; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +package com.sun.tools.rngom.ast.builder; + +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.parse.*; import java.util.List; @@ -43,7 +45,7 @@ public interface SchemaBuilder< /** * Returns the {@link NameClassBuilder}, which is used to build name * classes for this {@link SchemaBuilder}. The - * {@link org.kohsuke.rngom.nc.NameClass}es that are built will then be + * {@link NameClass}es that are built will then be * fed into this {@link SchemaBuilder}to further build RELAX NG patterns. * * @return always return a non-null valid object. This method can (and @@ -80,7 +82,7 @@ public interface SchemaBuilder< DataPatternBuilder makeDataPatternBuilder(String datatypeLibrary, String type, L loc) throws BuildException; P makeValue(String datatypeLibrary, String type, String value, - Context c, String ns, L loc, A anno) throws BuildException; + Context c, String ns, L loc, A anno) throws BuildException; /** * @@ -138,7 +140,7 @@ P makeValue(String datatypeLibrary, String type, String value, * when this parameter can be null. */ P makeExternalRef(Parseable current, String uri, String ns, Scope scope, - L loc, A anno) throws BuildException, IllegalSchemaException; + L loc, A anno) throws BuildException, IllegalSchemaException; L makeLocation(String systemId, int lineNumber, int columnNumber); diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Scope.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Scope.java similarity index 88% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Scope.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Scope.java index 063d2089a..61af4fc5f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/builder/Scope.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/Scope.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.builder; +package com.sun.tools.rngom.ast.builder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; public interface Scope< P extends ParsedPattern, diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/Location.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/Location.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/Location.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/Location.java index bdc596d07..1fb249de6 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/Location.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/Location.java @@ -19,6 +19,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.om; +package com.sun.tools.rngom.ast.om; public interface Location { } diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedElementAnnotation.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedElementAnnotation.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedElementAnnotation.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedElementAnnotation.java index 2e82b7906..9ecdf246f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedElementAnnotation.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedElementAnnotation.java @@ -19,6 +19,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.om; +package com.sun.tools.rngom.ast.om; public interface ParsedElementAnnotation { } diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedNameClass.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedNameClass.java index ed9ddaf00..963a28a22 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedNameClass.java @@ -19,6 +19,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.om; +package com.sun.tools.rngom.ast.om; public interface ParsedNameClass { } diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedPattern.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedPattern.java index 9ea4d3679..479e93e4d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/om/ParsedPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/om/ParsedPattern.java @@ -19,6 +19,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.om; +package com.sun.tools.rngom.ast.om; public interface ParsedPattern { } diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/CheckingSchemaBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/CheckingSchemaBuilder.java similarity index 84% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/CheckingSchemaBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/CheckingSchemaBuilder.java index 7f0fc2a37..0a66cc9d7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/CheckingSchemaBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/CheckingSchemaBuilder.java @@ -19,16 +19,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.util; +package com.sun.tools.rngom.ast.util; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.binary.SchemaBuilderImpl; -import org.kohsuke.rngom.binary.SchemaPatternBuilder; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.host.ParsedPatternHost; -import org.kohsuke.rngom.parse.host.SchemaBuilderHost; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.binary.SchemaBuilderImpl; +import com.sun.tools.rngom.binary.SchemaPatternBuilder; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.host.SchemaBuilderHost; +import com.sun.tools.rngom.parse.host.ParsedPatternHost; import org.relaxng.datatype.DatatypeLibraryFactory; import org.xml.sax.ErrorHandler; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/LocatorImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/LocatorImpl.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/LocatorImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/LocatorImpl.java index bd26dea01..3845ff230 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/LocatorImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/LocatorImpl.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.ast.util; +package com.sun.tools.rngom.ast.util; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.Location; import org.xml.sax.Locator; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/package.html b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/ast/util/package.html rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/util/package.html diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/AfterPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/AfterPattern.java similarity index 90% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/AfterPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/AfterPattern.java index a549e4d4f..ba1ec6e1f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/AfterPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/AfterPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; public class AfterPattern extends BinaryPattern { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/Alphabet.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/Alphabet.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/Alphabet.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/Alphabet.java index 53a6a2435..3f4d750ac 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/Alphabet.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/Alphabet.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.nc.ChoiceNameClass; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.ChoiceNameClass; +import com.sun.tools.rngom.nc.NameClass; class Alphabet { private NameClass nameClass; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/AttributePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/AttributePattern.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/AttributePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/AttributePattern.java index 2d5a01ebe..3886a0e76 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/AttributePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/AttributePattern.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.SimpleNameClass; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.SimpleNameClass; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/BinaryPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/BinaryPattern.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/BinaryPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/BinaryPattern.java index 0e5b12e2e..e75e2d565 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/BinaryPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/BinaryPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ChoicePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ChoicePattern.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ChoicePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ChoicePattern.java index 11881153d..390be5a6f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ChoicePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ChoicePattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; public class ChoicePattern extends BinaryPattern { ChoicePattern(Pattern p1, Pattern p2) { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DataExceptPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DataExceptPattern.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DataExceptPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DataExceptPattern.java index 61693e0d6..b98d1da4d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DataExceptPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DataExceptPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; import org.relaxng.datatype.Datatype; import org.xml.sax.Locator; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DataPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DataPattern.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DataPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DataPattern.java index b549ddd17..a9d004b0a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DataPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DataPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; import org.relaxng.datatype.Datatype; public class DataPattern extends StringPattern { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DuplicateAttributeDetector.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DuplicateAttributeDetector.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DuplicateAttributeDetector.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DuplicateAttributeDetector.java index 7968f8c67..0cf5d8320 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/DuplicateAttributeDetector.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/DuplicateAttributeDetector.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; import java.util.ArrayList; import java.util.List; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClass; class DuplicateAttributeDetector { private List nameClasses = new ArrayList(); diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ElementPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ElementPattern.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ElementPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ElementPattern.java index 6a9ea8a59..9da09928e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ElementPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ElementPattern.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.binary.visitor.PatternFunction; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/EmptyPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/EmptyPattern.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/EmptyPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/EmptyPattern.java index 5feb95427..54b76b7c2 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/EmptyPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/EmptyPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; public class EmptyPattern extends Pattern { EmptyPattern() { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ErrorPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ErrorPattern.java similarity index 90% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ErrorPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ErrorPattern.java index 789079de7..518589ee7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ErrorPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ErrorPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; public class ErrorPattern extends Pattern { ErrorPattern() { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/GroupPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/GroupPattern.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/GroupPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/GroupPattern.java index 08f614fc1..a21283c99 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/GroupPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/GroupPattern.java @@ -19,9 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.*; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.*; public class GroupPattern extends BinaryPattern { GroupPattern(Pattern p1, Pattern p2) { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/InterleavePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/InterleavePattern.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/InterleavePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/InterleavePattern.java index 74301c70e..ed7fda4c2 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/InterleavePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/InterleavePattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; public class InterleavePattern extends BinaryPattern { InterleavePattern(Pattern p1, Pattern p2) { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ListPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ListPattern.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ListPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ListPattern.java index 9bfa22cd2..7d79b02ca 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ListPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ListPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/NotAllowedPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/NotAllowedPattern.java similarity index 91% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/NotAllowedPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/NotAllowedPattern.java index df58d116a..5515b27cc 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/NotAllowedPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/NotAllowedPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; public class NotAllowedPattern extends Pattern { NotAllowedPattern() { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/OneOrMorePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/OneOrMorePattern.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/OneOrMorePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/OneOrMorePattern.java index 5a777be90..d53884b2f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/OneOrMorePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/OneOrMorePattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; import org.xml.sax.SAXException; public class OneOrMorePattern extends Pattern { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/Pattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/Pattern.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/Pattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/Pattern.java index 449f32dbb..bdfb46bba 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/Pattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/Pattern.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; import org.xml.sax.SAXException; public abstract class Pattern implements ParsedPattern { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/PatternBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/PatternBuilder.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/PatternBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/PatternBuilder.java index 1ae978e12..e90e177bd 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/PatternBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/PatternBuilder.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; public class PatternBuilder { private final EmptyPattern empty; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/PatternInterner.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/PatternInterner.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/PatternInterner.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/PatternInterner.java index c17218125..26b56d315 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/PatternInterner.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/PatternInterner.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; final class PatternInterner { private static final int INIT_SIZE = 256; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/RefPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/RefPattern.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/RefPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/RefPattern.java index b359b2497..21cc2f5fc 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/RefPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/RefPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/RestrictionViolationException.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/RestrictionViolationException.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/RestrictionViolationException.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/RestrictionViolationException.java index 717400506..94cd7ab59 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/RestrictionViolationException.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/RestrictionViolationException.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/SchemaBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/SchemaBuilderImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java index 214d94b66..0567e2385 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/SchemaBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java @@ -19,38 +19,38 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; import java.util.Enumeration; import java.util.Hashtable; import java.util.List; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.util.LocatorImpl; -import org.kohsuke.rngom.dt.builtin.BuiltinDatatypeLibraryFactory; -import org.kohsuke.rngom.dt.CascadingDatatypeLibraryFactory; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.NameClassBuilderImpl; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.util.Localizer; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.GrammarSection; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.dt.builtin.BuiltinDatatypeLibraryFactory; +import com.sun.tools.rngom.dt.CascadingDatatypeLibraryFactory; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClassBuilderImpl; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.util.Localizer; import org.relaxng.datatype.Datatype; import org.relaxng.datatype.DatatypeBuilder; import org.relaxng.datatype.DatatypeException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/SchemaPatternBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaPatternBuilder.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/SchemaPatternBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaPatternBuilder.java index f28c48006..eb5c6676e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/SchemaPatternBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaPatternBuilder.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClass; import org.relaxng.datatype.Datatype; import org.xml.sax.Locator; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/StringPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/StringPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/StringPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/StringPattern.java index 8933001ab..91e0fc3b7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/StringPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/StringPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; abstract class StringPattern extends Pattern { StringPattern(int hc) { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/TextPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/TextPattern.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/TextPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/TextPattern.java index f01d61b71..d4efc1ccb 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/TextPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/TextPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; public class TextPattern extends Pattern { TextPattern() { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ValuePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ValuePattern.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ValuePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ValuePattern.java index 0b492b4e2..0a4eb6502 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/ValuePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/ValuePattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary; +package com.sun.tools.rngom.binary; -import org.kohsuke.rngom.binary.visitor.PatternFunction; -import org.kohsuke.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternVisitor; +import com.sun.tools.rngom.binary.visitor.PatternFunction; import org.relaxng.datatype.Datatype; public class ValuePattern extends StringPattern { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/package.html b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/package.html rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/package.html diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/ChildElementFinder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/ChildElementFinder.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/ChildElementFinder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/ChildElementFinder.java index 35b75b77a..be6baaec7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/ChildElementFinder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/ChildElementFinder.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary.visitor; +package com.sun.tools.rngom.binary.visitor; -import org.kohsuke.rngom.binary.Pattern; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.binary.Pattern; +import com.sun.tools.rngom.nc.NameClass; import java.util.HashSet; import java.util.Set; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternFunction.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternFunction.java similarity index 68% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternFunction.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternFunction.java index 3c5edddb2..abf115e36 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternFunction.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternFunction.java @@ -19,24 +19,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary.visitor; +package com.sun.tools.rngom.binary.visitor; -import org.kohsuke.rngom.binary.AfterPattern; -import org.kohsuke.rngom.binary.AttributePattern; -import org.kohsuke.rngom.binary.ChoicePattern; -import org.kohsuke.rngom.binary.DataExceptPattern; -import org.kohsuke.rngom.binary.DataPattern; -import org.kohsuke.rngom.binary.ElementPattern; -import org.kohsuke.rngom.binary.EmptyPattern; -import org.kohsuke.rngom.binary.ErrorPattern; -import org.kohsuke.rngom.binary.GroupPattern; -import org.kohsuke.rngom.binary.InterleavePattern; -import org.kohsuke.rngom.binary.ListPattern; -import org.kohsuke.rngom.binary.NotAllowedPattern; -import org.kohsuke.rngom.binary.OneOrMorePattern; -import org.kohsuke.rngom.binary.RefPattern; -import org.kohsuke.rngom.binary.TextPattern; -import org.kohsuke.rngom.binary.ValuePattern; +import com.sun.tools.rngom.binary.DataExceptPattern; +import com.sun.tools.rngom.binary.DataPattern; +import com.sun.tools.rngom.binary.ElementPattern; +import com.sun.tools.rngom.binary.GroupPattern; +import com.sun.tools.rngom.binary.InterleavePattern; +import com.sun.tools.rngom.binary.ListPattern; +import com.sun.tools.rngom.binary.NotAllowedPattern; +import com.sun.tools.rngom.binary.OneOrMorePattern; +import com.sun.tools.rngom.binary.RefPattern; +import com.sun.tools.rngom.binary.TextPattern; +import com.sun.tools.rngom.binary.ValuePattern; +import com.sun.tools.rngom.binary.AfterPattern; +import com.sun.tools.rngom.binary.AttributePattern; +import com.sun.tools.rngom.binary.ChoicePattern; +import com.sun.tools.rngom.binary.EmptyPattern; +import com.sun.tools.rngom.binary.ErrorPattern; public interface PatternFunction { Object caseEmpty(EmptyPattern p); diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternVisitor.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternVisitor.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternVisitor.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternVisitor.java index 3e7396f18..1b2d139ee 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternVisitor.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternVisitor.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary.visitor; +package com.sun.tools.rngom.binary.visitor; -import org.kohsuke.rngom.binary.Pattern; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.binary.Pattern; +import com.sun.tools.rngom.nc.NameClass; import org.relaxng.datatype.Datatype; public interface PatternVisitor { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternWalker.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternWalker.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternWalker.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternWalker.java index 95cf1d906..40252feee 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/binary/visitor/PatternWalker.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/visitor/PatternWalker.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.binary.visitor; +package com.sun.tools.rngom.binary.visitor; -import org.kohsuke.rngom.binary.Pattern; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.binary.Pattern; +import com.sun.tools.rngom.nc.NameClass; import org.relaxng.datatype.Datatype; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/Annotation.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/Annotation.java similarity index 90% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/Annotation.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/Annotation.java index f04a43a1f..5ced74d6a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/Annotation.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/Annotation.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.util.LocatorImpl; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/CommentListImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/CommentListImpl.java similarity index 87% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/CommentListImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/CommentListImpl.java index 3fc9bf7e8..0dfbbe910 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/CommentListImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/CommentListImpl.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.util.LocatorImpl; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DAnnotation.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DAnnotation.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DAnnotation.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DAnnotation.java index 7bbe16b7f..5a7d9ad7e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DAnnotation.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DAnnotation.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import org.xml.sax.Locator; import org.w3c.dom.Element; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DAttributePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DAttributePattern.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DAttributePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DAttributePattern.java index 2809f637d..99f0d55a1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DAttributePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DAttributePattern.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClass; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DChoicePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DChoicePattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DChoicePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DChoicePattern.java index d7f93742a..70cd10728 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DChoicePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DChoicePattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * {@code } pattern. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DContainerPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DContainerPattern.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DContainerPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DContainerPattern.java index 0ebb8e421..d79570465 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DContainerPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DContainerPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import java.util.Iterator; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DDataPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DDataPattern.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DDataPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DDataPattern.java index a0c11a5ca..28dc42ae1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DDataPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DDataPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.parse.Context; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.parse.Context; import java.util.ArrayList; import java.util.List; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DDefine.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DDefine.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DDefine.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DDefine.java index dee275f59..44b02cce1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DDefine.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DDefine.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DElementPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DElementPattern.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DElementPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DElementPattern.java index 1d20c967d..7d92129c9 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DElementPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DElementPattern.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClass; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DEmptyPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DEmptyPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DEmptyPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DEmptyPattern.java index 76eae7c81..75a3043be 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DEmptyPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DEmptyPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DGrammarPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DGrammarPattern.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DGrammarPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DGrammarPattern.java index 6ca795227..f6d45db87 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DGrammarPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DGrammarPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import java.util.HashMap; import java.util.Iterator; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DGroupPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DGroupPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DGroupPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DGroupPattern.java index f29d1de04..4cadf21b4 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DGroupPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DGroupPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DInterleavePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DInterleavePattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DInterleavePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DInterleavePattern.java index e18fc8142..5148a024d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DInterleavePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DInterleavePattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DListPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DListPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DListPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DListPattern.java index 408b2415f..5dc8a29a1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DListPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DListPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DMixedPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DMixedPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DMixedPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DMixedPattern.java index be21372a1..aece6731f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DMixedPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DMixedPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DNotAllowedPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DNotAllowedPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DNotAllowedPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DNotAllowedPattern.java index 5cee56273..c5c3971c9 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DNotAllowedPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DNotAllowedPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOMPrinter.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOMPrinter.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOMPrinter.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOMPrinter.java index 588c56d06..1f6c7d02c 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOMPrinter.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOMPrinter.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOneOrMorePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOneOrMorePattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOneOrMorePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOneOrMorePattern.java index 5fdbcdcd8..3d1f544b7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOneOrMorePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOneOrMorePattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOptionalPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOptionalPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOptionalPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOptionalPattern.java index 6a55babe5..3174438d7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DOptionalPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DOptionalPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPattern.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPattern.java index 020d1178b..816485385 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPattern.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Parseable; import org.xml.sax.Locator; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPatternVisitor.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPatternVisitor.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPatternVisitor.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPatternVisitor.java index 64d7e7793..38c1c2c41 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPatternVisitor.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPatternVisitor.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPatternWalker.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPatternWalker.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPatternWalker.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPatternWalker.java index 026cceab2..104944885 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DPatternWalker.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DPatternWalker.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DRefPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DRefPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DRefPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DRefPattern.java index 91963638f..9f42436ba 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DRefPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DRefPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DSchemaBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DSchemaBuilderImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java index 077c31bdf..2dc7a5b8d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DSchemaBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java @@ -19,22 +19,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; - -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.util.LocatorImpl; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.NameClassBuilderImpl; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +package com.sun.tools.rngom.digested; + +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.nc.NameClassBuilderImpl; import org.w3c.dom.Document; import javax.xml.parsers.DocumentBuilderFactory; @@ -84,7 +84,7 @@ static DContainerPattern addAll( DContainerPattern parent, List childr return parent; } - static DUnaryPattern addBody( DUnaryPattern parent, ParsedPattern _body, LocatorImpl loc ) { + static DUnaryPattern addBody(DUnaryPattern parent, ParsedPattern _body, LocatorImpl loc ) { parent.setChild( (DPattern)_body ); return parent; } diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DTextPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DTextPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DTextPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DTextPattern.java index e765a213d..afe92227f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DTextPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DTextPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DUnaryPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DUnaryPattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DUnaryPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DUnaryPattern.java index aa5b031b3..656f01571 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DUnaryPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DUnaryPattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DValuePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DValuePattern.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DValuePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DValuePattern.java index e4283f754..04465e5ee 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DValuePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DValuePattern.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.parse.Context; +import com.sun.tools.rngom.parse.Context; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DXMLPrinter.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DXMLPrinter.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DXMLPrinter.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DXMLPrinter.java index 32689b514..16afa6753 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DXMLPrinter.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DXMLPrinter.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import java.io.File; import java.io.FileOutputStream; @@ -31,16 +31,16 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.util.CheckingSchemaBuilder; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.NameClassVisitor; -import org.kohsuke.rngom.nc.SimpleNameClass; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.util.CheckingSchemaBuilder; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClassVisitor; +import com.sun.tools.rngom.nc.SimpleNameClass; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.parse.compact.CompactParseable; +import com.sun.tools.rngom.parse.xml.SAXParseable; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.xml.sax.ErrorHandler; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DXmlTokenPattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DXmlTokenPattern.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DXmlTokenPattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DXmlTokenPattern.java index a4893550e..55cf6f897 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DXmlTokenPattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DXmlTokenPattern.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClass; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DZeroOrMorePattern.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DZeroOrMorePattern.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DZeroOrMorePattern.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DZeroOrMorePattern.java index 2fd2fd12d..b407d476d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DZeroOrMorePattern.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DZeroOrMorePattern.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DataPatternBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DataPatternBuilderImpl.java similarity index 84% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DataPatternBuilderImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DataPatternBuilderImpl.java index 3b88dad6a..b1847ff74 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/DataPatternBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DataPatternBuilderImpl.java @@ -19,15 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; import org.xml.sax.Locator; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/ElementAnnotationBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/ElementAnnotationBuilderImpl.java similarity index 87% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/ElementAnnotationBuilderImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/ElementAnnotationBuilderImpl.java index c526025ce..7abf0d3ad 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/ElementAnnotationBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/ElementAnnotationBuilderImpl.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.om.Location; import org.w3c.dom.Element; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/ElementWrapper.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/ElementWrapper.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/ElementWrapper.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/ElementWrapper.java index 0f260bec9..c47dfb58c 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/ElementWrapper.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/ElementWrapper.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; import org.w3c.dom.Element; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/GrammarBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/GrammarBuilderImpl.java similarity index 86% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/GrammarBuilderImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/GrammarBuilderImpl.java index 002eaeda4..1b078d589 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/GrammarBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/GrammarBuilderImpl.java @@ -19,22 +19,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import java.util.ArrayList; import java.util.List; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.util.LocatorImpl; import org.w3c.dom.Element; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/IncludeImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/IncludeImpl.java similarity index 85% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/IncludeImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/IncludeImpl.java index da4edf0f2..d3397d9d8 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/IncludeImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/IncludeImpl.java @@ -19,17 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; import java.util.HashSet; import java.util.Set; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/Main.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/Main.java similarity index 88% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/Main.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/Main.java index 65b9adeb1..e1fff5291 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/Main.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/Main.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.util.CheckingSchemaBuilder; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.util.CheckingSchemaBuilder; +import com.sun.tools.rngom.parse.compact.CompactParseable; +import com.sun.tools.rngom.parse.xml.SAXParseable; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/PatternParseable.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/PatternParseable.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/PatternParseable.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/PatternParseable.java index 0d5fb343b..0047050c0 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/PatternParseable.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/PatternParseable.java @@ -19,18 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; - -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.parse.Parseable; +package com.sun.tools.rngom.digested; + +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.parse.Parseable; import org.xml.sax.Locator; import java.util.List; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/package.html b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/digested/package.html rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/package.html diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/CachedDatatypeLibraryFactory.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/CachedDatatypeLibraryFactory.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/CachedDatatypeLibraryFactory.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/CachedDatatypeLibraryFactory.java index d2e02c960..481d64fab 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/CachedDatatypeLibraryFactory.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/CachedDatatypeLibraryFactory.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt; +package com.sun.tools.rngom.dt; import org.relaxng.datatype.DatatypeLibrary; import org.relaxng.datatype.DatatypeLibraryFactory; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/CascadingDatatypeLibraryFactory.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/CascadingDatatypeLibraryFactory.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/CascadingDatatypeLibraryFactory.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/CascadingDatatypeLibraryFactory.java index 293de9336..c31d6ef80 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/CascadingDatatypeLibraryFactory.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/CascadingDatatypeLibraryFactory.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt; +package com.sun.tools.rngom.dt; import org.relaxng.datatype.DatatypeLibrary; import org.relaxng.datatype.DatatypeLibraryFactory; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java index 27405b75d..80b3685a1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt; +package com.sun.tools.rngom.dt; import org.relaxng.datatype.DatatypeLibraryFactory; import org.relaxng.datatype.DatatypeLibrary; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeBuilder.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeBuilder.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeBuilder.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeBuilder.java index 9e9f4726d..941f5bef1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeBuilder.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeBuilder.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt.builtin; +package com.sun.tools.rngom.dt.builtin; import org.relaxng.datatype.Datatype; import org.relaxng.datatype.DatatypeBuilder; import org.relaxng.datatype.DatatypeException; import org.relaxng.datatype.ValidationContext; -import org.kohsuke.rngom.util.Localizer; +import com.sun.tools.rngom.util.Localizer; class BuiltinDatatypeBuilder implements DatatypeBuilder { private final Datatype dt; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeLibrary.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeLibrary.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeLibrary.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeLibrary.java index 810fa5f1f..a2c8cb3d2 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeLibrary.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeLibrary.java @@ -19,16 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt.builtin; +package com.sun.tools.rngom.dt.builtin; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; import org.relaxng.datatype.Datatype; import org.relaxng.datatype.DatatypeBuilder; import org.relaxng.datatype.DatatypeException; import org.relaxng.datatype.DatatypeLibrary; import org.relaxng.datatype.DatatypeLibraryFactory; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; - public class BuiltinDatatypeLibrary implements DatatypeLibrary { private final DatatypeLibraryFactory factory; private DatatypeLibrary xsdDatatypeLibrary = null; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java similarity index 95% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java index 0d634bb8e..6e1f280e1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt.builtin; +package com.sun.tools.rngom.dt.builtin; import org.relaxng.datatype.DatatypeLibrary; import org.relaxng.datatype.DatatypeLibraryFactory; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; /** * {@link DatatypeLibraryFactory} for diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/CompatibilityDatatypeLibrary.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/CompatibilityDatatypeLibrary.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/CompatibilityDatatypeLibrary.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/CompatibilityDatatypeLibrary.java index 178cadb92..a616250b2 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/CompatibilityDatatypeLibrary.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/CompatibilityDatatypeLibrary.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dt.builtin; +package com.sun.tools.rngom.dt.builtin; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; import org.relaxng.datatype.Datatype; import org.relaxng.datatype.DatatypeBuilder; import org.relaxng.datatype.DatatypeException; import org.relaxng.datatype.DatatypeLibrary; import org.relaxng.datatype.DatatypeLibraryFactory; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; class CompatibilityDatatypeLibrary implements DatatypeLibrary { private final DatatypeLibraryFactory factory; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/package.html b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/dt/builtin/package.html rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/dt/builtin/package.html diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/AnyNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/AnyNameClass.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/AnyNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/AnyNameClass.java index ca48241a5..a5993bf8b 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/AnyNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/AnyNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/AnyNameExceptNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/AnyNameExceptNameClass.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/AnyNameExceptNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/AnyNameExceptNameClass.java index 109945f7c..fc5eb7bc9 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/AnyNameExceptNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/AnyNameExceptNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/ChoiceNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/ChoiceNameClass.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/ChoiceNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/ChoiceNameClass.java index 76529942f..59f42c989 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/ChoiceNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/ChoiceNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClass.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClass.java index 20fd89dba..dac61572d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClass.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; -import org.kohsuke.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedNameClass; import javax.xml.namespace.QName; import java.io.Serializable; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassBuilderImpl.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassBuilderImpl.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassBuilderImpl.java index f332e8b11..09a6e7f43 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassBuilderImpl.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.BuildException; import java.util.List; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassVisitor.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassVisitor.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassVisitor.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassVisitor.java index 8d70017c6..162867381 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassVisitor.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassVisitor.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassWalker.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassWalker.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassWalker.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassWalker.java index c9261bd02..93378e206 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NameClassWalker.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NameClassWalker.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NsNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NsNameClass.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NsNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NsNameClass.java index a175b992c..6477db6d0 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NsNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NsNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NsNameExceptNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NsNameExceptNameClass.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NsNameExceptNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NsNameExceptNameClass.java index f9bf207d0..72a5aa41e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NsNameExceptNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NsNameExceptNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NullNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NullNameClass.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NullNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NullNameClass.java index dfa8f72fc..666889b9e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/NullNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/NullNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; @@ -54,6 +54,6 @@ public boolean isOpen() { } private Object readResolve() { - return NameClass.NULL; + return NULL; } } diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/OverlapDetector.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/OverlapDetector.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/OverlapDetector.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/OverlapDetector.java index e40c99ef6..3d5d45867 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/OverlapDetector.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/OverlapDetector.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/SimpleNameClass.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/SimpleNameClass.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/SimpleNameClass.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/SimpleNameClass.java index 441c54521..d927984dc 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/SimpleNameClass.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/SimpleNameClass.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.nc; +package com.sun.tools.rngom.nc; import javax.xml.namespace.QName; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/package.html b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/nc/package.html rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/nc/package.html diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/Context.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/Context.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/Context.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/Context.java index cfe1f4aef..8b6812417 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/Context.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/Context.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse; +package com.sun.tools.rngom.parse; import java.util.Enumeration; import org.relaxng.datatype.ValidationContext; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/IllegalSchemaException.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/IllegalSchemaException.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/IllegalSchemaException.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/IllegalSchemaException.java index 523dec27c..40c939180 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/IllegalSchemaException.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/IllegalSchemaException.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse; +package com.sun.tools.rngom.parse; /** * Signals a violation of the RELAX NG spec. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/Parseable.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/Parseable.java similarity index 83% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/Parseable.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/Parseable.java index d01631621..7bdd92815 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/Parseable.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/Parseable.java @@ -19,10 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse; +package com.sun.tools.rngom.parse; -import org.kohsuke.rngom.ast.builder.*; -import org.kohsuke.rngom.ast.om.*; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.*; +import com.sun.tools.rngom.ast.om.*; /** * An input that can be turned into a RELAX NG pattern. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactParseable.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactParseable.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactParseable.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactParseable.java index be60940f4..95f6e7ba0 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactParseable.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactParseable.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; import java.io.IOException; import java.io.InputStream; @@ -28,14 +28,14 @@ import java.io.Reader; import java.net.URL; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.xml.util.EncodingMap; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.xml.util.EncodingMap; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntax.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntax.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java index 6853d346f..d410b56e5 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntax.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ /* Generated By:JavaCC: Do not edit this line. CompactSyntax.java */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; import java.io.Reader; import java.net.MalformedURLException; @@ -32,34 +32,33 @@ import java.util.Hashtable; import java.util.List; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.GrammarSection; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.util.Localizer; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.om.ParsedNameClass; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.LocatorImpl; -import org.kohsuke.rngom.util.Localizer; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; - public class CompactSyntax implements Context, CompactSyntaxConstants { private static final int IN_ELEMENT = 0; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntax.jj b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.jj similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntax.jj rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.jj index bf6448917..125250ff0 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntax.jj +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.jj @@ -6,7 +6,7 @@ options { PARSER_BEGIN(CompactSyntax) -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; import java.io.Reader; import java.net.MalformedURLException; @@ -18,33 +18,33 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.List; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import Annotations; +import BuildException; +import CommentList; +import DataPatternBuilder; +import Div; +import ElementAnnotationBuilder; +import Grammar; +import GrammarSection; +import Include; +import IncludedGrammar; +import NameClassBuilder; +import SchemaBuilder; +import Scope; +import Location; +import ParsedElementAnnotation; +import ParsedNameClass; +import ParsedPattern; +import Context; +import IllegalSchemaException; +import Parseable; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.LocatorImpl; -import org.kohsuke.rngom.util.Localizer; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +import Localizer; +import WellKnownNamespaces; public class CompactSyntax implements Context { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntaxConstants.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntaxConstants.java index d807a872d..a236a3315 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntaxConstants.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ /* Generated By:JavaCC: Do not edit this line. CompactSyntaxConstants.java */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; /** diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntaxTokenManager.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntaxTokenManager.java index 2b49cc27e..98c44c8f6 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntaxTokenManager.java @@ -20,42 +20,7 @@ * THE SOFTWARE. */ /* Generated By:JavaCC: Do not edit this line. CompactSyntaxTokenManager.java */ -package org.kohsuke.rngom.parse.compact; -import java.io.Reader; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.List; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.LocatorImpl; -import org.kohsuke.rngom.util.Localizer; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +package com.sun.tools.rngom.parse.compact; /** Token Manager. */ public class CompactSyntaxTokenManager implements CompactSyntaxConstants diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/EOFException.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/EOFException.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/EOFException.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/EOFException.java index db26ede48..9daa453e0 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/EOFException.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/EOFException.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; import java.io.IOException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/EscapeSyntaxException.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/EscapeSyntaxException.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/EscapeSyntaxException.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/EscapeSyntaxException.java index c6079fde3..6978c132c 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/EscapeSyntaxException.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/EscapeSyntaxException.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; class EscapeSyntaxException extends RuntimeException { private final String key; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/JavaCharStream.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/JavaCharStream.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java index 4786830f0..696bfa9f4 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/JavaCharStream.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 5.0 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; /** * An implementation of interface CharStream, where the stream is assumed to diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/ParseException.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/ParseException.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/ParseException.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/ParseException.java index 5948abd90..a9aa0c0d1 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/ParseException.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/ParseException.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */ /* JavaCCOptions:KEEP_LINE_COL=null */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; /** * This exception is thrown when parse errors are encountered. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/Token.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/Token.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/Token.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/Token.java index c84f03618..2e4b1bc95 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/Token.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/Token.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; /** * Describes the input token stream. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/TokenMgrError.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/TokenMgrError.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/TokenMgrError.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/TokenMgrError.java index f58eb7c53..1e8f94fdc 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/TokenMgrError.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/TokenMgrError.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */ /* JavaCCOptions: */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; /** Token Manager Error. */ public class TokenMgrError extends Error diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/UCode_UCodeESC_CharStream.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java index 3b3bb99cf..d5d072366 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/compact/UCode_UCodeESC_CharStream.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java @@ -22,10 +22,10 @@ /* Generated By:JavaCC: Do not edit this line. UCode_UCodeESC_CharStream.java Version 0.7pre6 */ /* The previous line keeps JavaCC quiet. In fact, the JavaCC generated file has been edited to fix some bugs. */ -package org.kohsuke.rngom.parse.compact; +package com.sun.tools.rngom.parse.compact; -import org.kohsuke.rngom.util.Utf16; -import org.kohsuke.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.util.Utf16; import java.io.IOException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/AnnotationsHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/AnnotationsHost.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/AnnotationsHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/AnnotationsHost.java index b3fade6ed..9329989e5 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/AnnotationsHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/AnnotationsHost.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/Base.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/Base.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/Base.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/Base.java index 402b1878d..c51146210 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/Base.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/Base.java @@ -19,10 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.om.Location; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/CommentListHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/CommentListHost.java similarity index 89% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/CommentListHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/CommentListHost.java index 192625d77..cc36bf3b7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/CommentListHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/CommentListHost.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.builder.BuildException; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/DataPatternBuilderHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/DataPatternBuilderHost.java similarity index 87% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/DataPatternBuilderHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/DataPatternBuilderHost.java index 967032a79..653614868 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/DataPatternBuilderHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/DataPatternBuilderHost.java @@ -19,15 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/DivHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/DivHost.java similarity index 87% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/DivHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/DivHost.java index daddb42a7..373e43a3c 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/DivHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/DivHost.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.om.Location; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ElementAnnotationBuilderHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ElementAnnotationBuilderHost.java similarity index 87% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ElementAnnotationBuilderHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ElementAnnotationBuilderHost.java index ac798a800..fc62af84a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ElementAnnotationBuilderHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ElementAnnotationBuilderHost.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/GrammarHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/GrammarHost.java similarity index 86% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/GrammarHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/GrammarHost.java index 94df886c0..efc47a113 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/GrammarHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/GrammarHost.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * Wraps {@link Grammar} and provides error checking. diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/GrammarSectionHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/GrammarSectionHost.java similarity index 82% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/GrammarSectionHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/GrammarSectionHost.java index 5a73512ef..527048bd4 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/GrammarSectionHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/GrammarSectionHost.java @@ -19,17 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.GrammarSection; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * @@ -48,7 +48,7 @@ public class GrammarSectionHost extends Base implements GrammarSection { } public void define(String name, Combine combine, ParsedPattern _pattern, - Location _loc, Annotations _anno) throws BuildException { + Location _loc, Annotations _anno) throws BuildException { ParsedPatternHost pattern = (ParsedPatternHost) _pattern; LocationHost loc = cast(_loc); AnnotationsHost anno = cast(_anno); diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/IncludeHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/IncludeHost.java similarity index 84% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/IncludeHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/IncludeHost.java index ff1a6bc30..c6be7cb4d 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/IncludeHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/IncludeHost.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.BuildException; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/LocationHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/LocationHost.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/LocationHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/LocationHost.java index a041c415c..addd2cdf6 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/LocationHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/LocationHost.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.Location; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/NameClassBuilderHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/NameClassBuilderHost.java similarity index 92% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/NameClassBuilderHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/NameClassBuilderHost.java index daa0e102d..f3d978987 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/NameClassBuilderHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/NameClassBuilderHost.java @@ -19,15 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedNameClass; import java.util.List; import java.util.ArrayList; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedElementAnnotationHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedElementAnnotationHost.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedElementAnnotationHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedElementAnnotationHost.java index f17e735c8..4dd0ced49 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedElementAnnotationHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedElementAnnotationHost.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedNameClassHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedNameClassHost.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedNameClassHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedNameClassHost.java index 659596f3d..58bf6bb47 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedNameClassHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedNameClassHost.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedNameClass; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedPatternHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedPatternHost.java similarity index 94% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedPatternHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedPatternHost.java index 0f97c999e..c0bad5626 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ParsedPatternHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ParsedPatternHost.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/SchemaBuilderHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/SchemaBuilderHost.java similarity index 93% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/SchemaBuilderHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/SchemaBuilderHost.java index 7a9accdab..7fbf8c0cf 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/SchemaBuilderHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/SchemaBuilderHost.java @@ -19,24 +19,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; import java.util.List; import java.util.ArrayList; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ScopeHost.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ScopeHost.java similarity index 88% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ScopeHost.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ScopeHost.java index c9fa77fcf..d44783740 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/ScopeHost.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/ScopeHost.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.host; +package com.sun.tools.rngom.parse.host; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.BuildException; /** * diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/package.html b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/host/package.html rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/host/package.html diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/DtdContext.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/DtdContext.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java index ca7b837d1..bcde5124a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/DtdContext.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.xml; +package com.sun.tools.rngom.parse.xml; import org.xml.sax.DTDHandler; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/SAXParseable.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SAXParseable.java similarity index 88% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/SAXParseable.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SAXParseable.java index e065ed12d..a0f4c51e7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/SAXParseable.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SAXParseable.java @@ -19,19 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.xml; +package com.sun.tools.rngom.parse.xml; import java.io.IOException; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.xml.sax.JAXPXMLReaderCreator; -import org.kohsuke.rngom.xml.sax.XMLReaderCreator; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.xml.sax.XMLReaderCreator; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.xml.sax.JAXPXMLReaderCreator; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/SchemaParser.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/SchemaParser.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java index 6c2279ba1..3ee383d2e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/parse/xml/SchemaParser.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.parse.xml; +package com.sun.tools.rngom.parse.xml; import java.util.Enumeration; import java.util.Hashtable; @@ -29,31 +29,31 @@ import java.util.ArrayList; import java.util.Arrays; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.IncludedGrammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.util.Localizer; -import org.kohsuke.rngom.util.Uri; -import org.kohsuke.rngom.xml.sax.AbstractLexicalHandler; -import org.kohsuke.rngom.xml.sax.XmlBaseHandler; -import org.kohsuke.rngom.xml.util.Naming; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.GrammarSection; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.IncludedGrammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.util.Localizer; +import com.sun.tools.rngom.xml.sax.AbstractLexicalHandler; +import com.sun.tools.rngom.xml.sax.XmlBaseHandler; +import com.sun.tools.rngom.xml.util.Naming; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.util.Uri; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Localizer.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Localizer.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Localizer.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Localizer.java index 5b82ac026..12a2b9de4 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Localizer.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Localizer.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.util; +package com.sun.tools.rngom.util; import java.text.MessageFormat; import java.util.MissingResourceException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Uri.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Uri.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Uri.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Uri.java index ef5936bc2..0e935d1d9 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Uri.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Uri.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.util; +package com.sun.tools.rngom.util; import java.net.URL; import java.net.MalformedURLException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Utf16.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Utf16.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Utf16.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Utf16.java index daa254a72..fcabdab1a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/util/Utf16.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/util/Utf16.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.util; +package com.sun.tools.rngom.util; public abstract class Utf16 { // 110110XX XXXXXX 110111XX XXXXXX diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/AbstractLexicalHandler.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/AbstractLexicalHandler.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/AbstractLexicalHandler.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/AbstractLexicalHandler.java index bf6523a6b..49feb2ea5 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/AbstractLexicalHandler.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/AbstractLexicalHandler.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.sax; +package com.sun.tools.rngom.xml.sax; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/JAXPXMLReaderCreator.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/JAXPXMLReaderCreator.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/JAXPXMLReaderCreator.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/JAXPXMLReaderCreator.java index ecab28c27..585d95e3f 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/JAXPXMLReaderCreator.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/JAXPXMLReaderCreator.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.sax; +package com.sun.tools.rngom.xml.sax; import java.util.logging.Level; import java.util.logging.Logger; @@ -66,7 +66,7 @@ public JAXPXMLReaderCreator() { } /** - * @see org.kohsuke.rngom.xml.sax.XMLReaderCreator#createXMLReader() + * @see XMLReaderCreator#createXMLReader() */ public XMLReader createXMLReader() throws SAXException { try { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/XMLReaderCreator.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/XMLReaderCreator.java similarity index 97% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/XMLReaderCreator.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/XMLReaderCreator.java index 66c9ea69a..deb32df3e 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/XMLReaderCreator.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/XMLReaderCreator.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.sax; +package com.sun.tools.rngom.xml.sax; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/XmlBaseHandler.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/XmlBaseHandler.java similarity index 96% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/XmlBaseHandler.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/XmlBaseHandler.java index 8d67a6599..1b6e6a318 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/sax/XmlBaseHandler.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/sax/XmlBaseHandler.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.sax; +package com.sun.tools.rngom.xml.sax; -import org.kohsuke.rngom.util.Uri; +import com.sun.tools.rngom.util.Uri; import org.xml.sax.Locator; public class XmlBaseHandler { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/EncodingMap.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/EncodingMap.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/EncodingMap.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/EncodingMap.java index 03943d735..a8df4faf7 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/EncodingMap.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/EncodingMap.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.util; +package com.sun.tools.rngom.xml.util; import java.io.UnsupportedEncodingException; diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/Naming.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/Naming.java similarity index 99% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/Naming.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/Naming.java index 50d34aa56..5507e0078 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/Naming.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/Naming.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.util; +package com.sun.tools.rngom.xml.util; public class Naming { diff --git a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/WellKnownNamespaces.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/WellKnownNamespaces.java similarity index 98% rename from jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/WellKnownNamespaces.java rename to jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/WellKnownNamespaces.java index 59ae72ce6..f3242ea2a 100644 --- a/jaxb-ri/external/rngom/src/main/java/org/kohsuke/rngom/xml/util/WellKnownNamespaces.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/xml/util/WellKnownNamespaces.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.xml.util; +package com.sun.tools.rngom.xml.util; public class WellKnownNamespaces { static public final String XML = "http://www.w3.org/XML/1998/namespace"; diff --git a/jaxb-ri/external/rngom/src/main/java/module-info.java b/jaxb-ri/external/rngom/src/main/java/module-info.java index 86f05e312..b0a4d49f1 100644 --- a/jaxb-ri/external/rngom/src/main/java/module-info.java +++ b/jaxb-ri/external/rngom/src/main/java/module-info.java @@ -46,13 +46,13 @@ requires java.xml; requires java.logging; - exports org.kohsuke.rngom.parse; - exports org.kohsuke.rngom.parse.compact; - exports org.kohsuke.rngom.parse.xml; - exports org.kohsuke.rngom.digested; - exports org.kohsuke.rngom.nc; - exports org.kohsuke.rngom.xml.sax; - exports org.kohsuke.rngom.xml.util; - exports org.kohsuke.rngom.ast.builder; - exports org.kohsuke.rngom.ast.util; + exports com.sun.tools.rngom.parse; + exports com.sun.tools.rngom.parse.compact; + exports com.sun.tools.rngom.parse.xml; + exports com.sun.tools.rngom.digested; + exports com.sun.tools.rngom.nc; + exports com.sun.tools.rngom.xml.sax; + exports com.sun.tools.rngom.xml.util; + exports com.sun.tools.rngom.ast.builder; + exports com.sun.tools.rngom.ast.util; } diff --git a/jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/binary/Messages.properties b/jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/binary/Messages.properties similarity index 100% rename from jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/binary/Messages.properties rename to jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/binary/Messages.properties diff --git a/jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/dt/builtin/Messages.properties b/jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/dt/builtin/Messages.properties similarity index 100% rename from jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/dt/builtin/Messages.properties rename to jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/dt/builtin/Messages.properties diff --git a/jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/parse/Messages.properties b/jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/parse/Messages.properties similarity index 100% rename from jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/parse/Messages.properties rename to jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/parse/Messages.properties diff --git a/jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/parse/compact/Messages.properties b/jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/parse/compact/Messages.properties similarity index 100% rename from jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/parse/compact/Messages.properties rename to jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/parse/compact/Messages.properties diff --git a/jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/parse/xml/Messages.properties b/jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/parse/xml/Messages.properties similarity index 100% rename from jaxb-ri/external/rngom/src/main/resources/org/kohsuke/rngom/parse/xml/Messages.properties rename to jaxb-ri/external/rngom/src/main/resources/com/sun/tools/rngom/parse/xml/Messages.properties diff --git a/jaxb-ri/external/rngom/src/test/java/Main.java b/jaxb-ri/external/rngom/src/test/java/Main.java index d3ca7ee5f..05f21c347 100644 --- a/jaxb-ri/external/rngom/src/test/java/Main.java +++ b/jaxb-ri/external/rngom/src/test/java/Main.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.util.CheckingSchemaBuilder; -import org.kohsuke.rngom.dump.Dumper; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.util.CheckingSchemaBuilder; +import com.sun.tools.rngom.dump.Dumper; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.parse.compact.CompactParseable; +import com.sun.tools.rngom.parse.xml.SAXParseable; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/digested/DXMLPrinterTest.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/digested/DXMLPrinterTest.java similarity index 98% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/digested/DXMLPrinterTest.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/digested/DXMLPrinterTest.java index 7642c3aec..8c4e39296 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/digested/DXMLPrinterTest.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/digested/DXMLPrinterTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.digested; +package com.sun.tools.rngom.digested; import junit.framework.TestCase; import org.custommonkey.xmlunit.XMLAssert; diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/digested/xmlns.rng b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/digested/xmlns.rng similarity index 100% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/digested/xmlns.rng rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/digested/xmlns.rng diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/AnnotationsImpl.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/AnnotationsImpl.java similarity index 87% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/AnnotationsImpl.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/AnnotationsImpl.java index 1eb76320e..3f78f127b 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/AnnotationsImpl.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/AnnotationsImpl.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Base.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Base.java similarity index 97% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Base.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Base.java index 6037d4561..869315b7c 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Base.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Base.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/CommentListImpl.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/CommentListImpl.java similarity index 89% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/CommentListImpl.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/CommentListImpl.java index 01793bfb8..624e5f22e 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/CommentListImpl.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/CommentListImpl.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.builder.BuildException; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/DataPatternBuilderImpl.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/DataPatternBuilderImpl.java similarity index 84% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/DataPatternBuilderImpl.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/DataPatternBuilderImpl.java index a42104561..caf82c308 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/DataPatternBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/DataPatternBuilderImpl.java @@ -19,15 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Dumper.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Dumper.java similarity index 90% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Dumper.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Dumper.java index ba293e6eb..4ff0778eb 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Dumper.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Dumper.java @@ -19,24 +19,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; - -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +package com.sun.tools.rngom.dump; + +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.om.ParsedNameClass; import java.util.List; import java.io.OutputStream; diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/ElementAnnotationBuilderImpl.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/ElementAnnotationBuilderImpl.java similarity index 85% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/ElementAnnotationBuilderImpl.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/ElementAnnotationBuilderImpl.java index 4a8db968b..284105804 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/ElementAnnotationBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/ElementAnnotationBuilderImpl.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.om.Location; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Factory.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Factory.java similarity index 81% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Factory.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Factory.java index b50f184b2..3bf8fceec 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Factory.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Factory.java @@ -19,20 +19,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/GrammarImpl.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/GrammarImpl.java similarity index 84% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/GrammarImpl.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/GrammarImpl.java index 9bc3d54f7..1ada6b37d 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/GrammarImpl.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/GrammarImpl.java @@ -19,19 +19,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.BuildException; /** * diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/NameClassBuilderImpl.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/NameClassBuilderImpl.java similarity index 90% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/NameClassBuilderImpl.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/NameClassBuilderImpl.java index 235c65053..409ed4e90 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/NameClassBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/NameClassBuilderImpl.java @@ -19,15 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.om.ParsedNameClass; import java.util.List; diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Printer.java b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Printer.java similarity index 81% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Printer.java rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Printer.java index 1e7340a23..3ba4ac03e 100644 --- a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/Printer.java +++ b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/Printer.java @@ -19,24 +19,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kohsuke.rngom.dump; +package com.sun.tools.rngom.dump; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Writer; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.om.ParsedNameClass; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedNameClass; +import com.sun.tools.rngom.ast.om.ParsedPattern; /** * @@ -117,7 +117,7 @@ public Location result( Location l ) { return l; } - public Annotations result( Annotations a ) { + public Annotations result(Annotations a ) { r(a); return a; } @@ -127,7 +127,7 @@ public CommentList result( CommentList c ) { return c; } - public Grammar result( Grammar g ) { + public Grammar result(Grammar g ) { r(g); return g; } @@ -147,7 +147,7 @@ public ElementAnnotationBuilder result( ElementAnnotationBuilder eab ) { return eab; } - public ParsedElementAnnotation result( ParsedElementAnnotation a ) { + public ParsedElementAnnotation result(ParsedElementAnnotation a ) { r(a); return a; } diff --git a/jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/package.html b/jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/package.html similarity index 100% rename from jaxb-ri/external/rngom/src/test/java/org/kohsuke/rngom/dump/package.html rename to jaxb-ri/external/rngom/src/test/java/com/sun/tools/rngom/dump/package.html diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java index a07bff7a0..ffdb76c1b 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -47,10 +47,10 @@ import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.opts.BooleanOption; import org.kohsuke.args4j.opts.StringOption; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; +import com.sun.tools.rngom.parse.compact.CompactParseable; +import com.sun.tools.rngom.parse.xml.SAXParseable; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/RELAXNGLoader.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/RELAXNGLoader.java index a5103967a..99118ad56 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/RELAXNGLoader.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/RELAXNGLoader.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -43,11 +43,11 @@ import com.sun.tools.txw2.builder.relaxng.SchemaBuilderImpl; import com.sun.tools.txw2.model.Leaf; import com.sun.tools.txw2.model.NodeSet; -import org.kohsuke.rngom.ast.util.CheckingSchemaBuilder; -import org.kohsuke.rngom.dt.CascadingDatatypeLibraryFactory; -import org.kohsuke.rngom.dt.builtin.BuiltinDatatypeLibraryFactory; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.util.CheckingSchemaBuilder; +import com.sun.tools.rngom.dt.CascadingDatatypeLibraryFactory; +import com.sun.tools.rngom.dt.builtin.BuiltinDatatypeLibraryFactory; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; import org.relaxng.datatype.DatatypeLibrary; import org.relaxng.datatype.DatatypeLibraryFactory; diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/SchemaBuilder.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/SchemaBuilder.java index 40abc7346..20cbdf1c2 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/SchemaBuilder.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/SchemaBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -41,7 +41,7 @@ package com.sun.tools.txw2; import com.sun.tools.txw2.model.NodeSet; -import org.kohsuke.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.IllegalSchemaException; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/TxwTask.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/TxwTask.java index 1bb4076ad..2b1693028 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/TxwTask.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/TxwTask.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -43,8 +43,8 @@ import com.sun.codemodel.writer.FileCodeWriter; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; +import com.sun.tools.rngom.parse.compact.CompactParseable; +import com.sun.tools.rngom.parse.xml.SAXParseable; import org.xml.sax.InputSource; import java.io.File; diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/AnnotationsImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/AnnotationsImpl.java index fd3db712f..c5cfc3f76 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/AnnotationsImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/AnnotationsImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,10 +40,10 @@ package com.sun.tools.txw2.builder.relaxng; -import org.kohsuke.rngom.ast.builder.Annotations; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.Annotations; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.util.LocatorImpl; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/CommentListImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/CommentListImpl.java index 3d11d0665..6dcf21ebc 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/CommentListImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/CommentListImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,8 +40,8 @@ package com.sun.tools.txw2.builder.relaxng; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.util.LocatorImpl; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DataPatternBuilderImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DataPatternBuilderImpl.java index 5c822a235..dd94fac25 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DataPatternBuilderImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DataPatternBuilderImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -43,11 +43,11 @@ import com.sun.codemodel.JType; import com.sun.tools.txw2.model.Data; import com.sun.tools.txw2.model.Leaf; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; -import org.kohsuke.rngom.parse.Context; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.parse.Context; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DivImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DivImpl.java index 9529ac37a..ea94345e2 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DivImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/DivImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -42,10 +42,10 @@ import com.sun.tools.txw2.model.Grammar; import com.sun.tools.txw2.model.Leaf; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.util.LocatorImpl; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/ElementAnnotationBuilderImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/ElementAnnotationBuilderImpl.java index 5d96bdb2e..7cdaead53 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/ElementAnnotationBuilderImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/ElementAnnotationBuilderImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,11 +40,11 @@ package com.sun.tools.txw2.builder.relaxng; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.CommentList; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.om.Location; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.CommentList; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.om.Location; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarImpl.java index 7fd12e722..2e3f549dd 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -42,11 +42,11 @@ import com.sun.tools.txw2.model.Leaf; import com.sun.tools.txw2.model.Ref; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.util.LocatorImpl; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarSectionImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarSectionImpl.java index 28ea0b7c6..e89a03ad3 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarSectionImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/GrammarSectionImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -43,13 +43,13 @@ import com.sun.tools.txw2.model.Define; import com.sun.tools.txw2.model.Grammar; import com.sun.tools.txw2.model.Leaf; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.Div; +import com.sun.tools.rngom.ast.builder.GrammarSection; +import com.sun.tools.rngom.ast.builder.Include; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.util.LocatorImpl; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/SchemaBuilderImpl.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/SchemaBuilderImpl.java index 1031d85e6..623865d3a 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/SchemaBuilderImpl.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/builder/relaxng/SchemaBuilderImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -50,20 +50,20 @@ import com.sun.tools.txw2.model.Leaf; import com.sun.tools.txw2.model.List; import com.sun.tools.txw2.model.Value; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.NameClassBuilderImpl; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; +import com.sun.tools.rngom.ast.builder.BuildException; +import com.sun.tools.rngom.ast.builder.DataPatternBuilder; +import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; +import com.sun.tools.rngom.ast.builder.Grammar; +import com.sun.tools.rngom.ast.builder.NameClassBuilder; +import com.sun.tools.rngom.ast.builder.SchemaBuilder; +import com.sun.tools.rngom.ast.builder.Scope; +import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; +import com.sun.tools.rngom.ast.util.LocatorImpl; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NameClassBuilderImpl; +import com.sun.tools.rngom.parse.Context; +import com.sun.tools.rngom.parse.IllegalSchemaException; +import com.sun.tools.rngom.parse.Parseable; import javax.xml.namespace.QName; diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Grammar.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Grammar.java index 154d46a2e..7cea18acd 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Grammar.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Grammar.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,7 +40,7 @@ package com.sun.tools.txw2.model; -import org.kohsuke.rngom.ast.builder.GrammarSection; +import com.sun.tools.rngom.ast.builder.GrammarSection; import java.util.HashMap; import java.util.Map; diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Leaf.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Leaf.java index eb5cb5f31..176960063 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Leaf.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/Leaf.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2005-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -47,7 +47,7 @@ import com.sun.tools.txw2.model.prop.Prop; import com.sun.tools.txw2.model.prop.ValueProp; import com.sun.xml.txw2.annotation.XmlValue; -import org.kohsuke.rngom.ast.om.ParsedPattern; +import com.sun.tools.rngom.ast.om.ParsedPattern; import org.xml.sax.Locator; import java.util.Iterator; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/ModelLoader.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/ModelLoader.java index acfd56e6f..f78f9c0bd 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/ModelLoader.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/ModelLoader.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -53,8 +53,6 @@ import com.sun.tools.xjc.reader.internalizer.InternalizationLogic; import com.sun.tools.xjc.reader.internalizer.SCDBasedBindingSet; import com.sun.tools.xjc.reader.internalizer.VersionChecker; -import com.sun.tools.xjc.reader.relaxng.RELAXNGCompiler; -import com.sun.tools.xjc.reader.relaxng.RELAXNGInternalizationLogic; import com.sun.tools.xjc.reader.xmlschema.BGMBuilder; import com.sun.tools.xjc.reader.xmlschema.bindinfo.AnnotationParserFactoryImpl; import com.sun.tools.xjc.reader.xmlschema.parser.CustomizationContextChecker; @@ -69,15 +67,6 @@ import com.sun.xml.xsom.parser.XSOMParser; import javax.xml.XMLConstants; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.util.CheckingSchemaBuilder; -import org.kohsuke.rngom.digested.DPattern; -import org.kohsuke.rngom.digested.DSchemaBuilderImpl; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; -import org.kohsuke.rngom.xml.sax.XMLReaderCreator; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/NamespaceContextImpl.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/NamespaceContextImpl.java index 28cafbf6a..00051e765 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/NamespaceContextImpl.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/NamespaceContextImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/ContentModelBinder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/ContentModelBinder.java index 4fa46eadd..30aed4eb0 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/ContentModelBinder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/ContentModelBinder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -50,14 +50,14 @@ import com.sun.tools.xjc.reader.RawTypeSet; import com.sun.xml.bind.v2.model.core.ID; -import org.kohsuke.rngom.digested.DAttributePattern; -import org.kohsuke.rngom.digested.DChoicePattern; -import org.kohsuke.rngom.digested.DMixedPattern; -import org.kohsuke.rngom.digested.DOneOrMorePattern; -import org.kohsuke.rngom.digested.DOptionalPattern; -import org.kohsuke.rngom.digested.DPattern; -import org.kohsuke.rngom.digested.DPatternWalker; -import org.kohsuke.rngom.digested.DZeroOrMorePattern; +import com.sun.tools.rngom.digested.DAttributePattern; +import com.sun.tools.rngom.digested.DChoicePattern; +import com.sun.tools.rngom.digested.DMixedPattern; +import com.sun.tools.rngom.digested.DOneOrMorePattern; +import com.sun.tools.rngom.digested.DOptionalPattern; +import com.sun.tools.rngom.digested.DPattern; +import com.sun.tools.rngom.digested.DPatternWalker; +import com.sun.tools.rngom.digested.DZeroOrMorePattern; import static com.sun.tools.xjc.model.CElementPropertyInfo.CollectionMode.REPEATED_ELEMENT; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DatatypeLib.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DatatypeLib.java index 286ec73e5..020be7a73 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DatatypeLib.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DatatypeLib.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -48,7 +48,7 @@ import com.sun.tools.xjc.model.TypeUse; import com.sun.tools.xjc.reader.xmlschema.SimpleTypeBuilder; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; /** * Data-bindable datatype library. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DefineFinder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DefineFinder.java index 6ae796633..a971f937a 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DefineFinder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/DefineFinder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -43,10 +43,10 @@ import java.util.HashSet; import java.util.Set; -import org.kohsuke.rngom.digested.DDefine; -import org.kohsuke.rngom.digested.DGrammarPattern; -import org.kohsuke.rngom.digested.DPatternWalker; -import org.kohsuke.rngom.digested.DRefPattern; +import com.sun.tools.rngom.digested.DDefine; +import com.sun.tools.rngom.digested.DGrammarPattern; +import com.sun.tools.rngom.digested.DPatternWalker; +import com.sun.tools.rngom.digested.DRefPattern; /** * Recursively find all {@link DDefine}s in the grammar. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/NameCalculator.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/NameCalculator.java index d02ba0bee..6f055868e 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/NameCalculator.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/NameCalculator.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -40,7 +40,7 @@ package com.sun.tools.xjc.reader.relaxng; -import org.kohsuke.rngom.digested.DPatternWalker; +import com.sun.tools.rngom.digested.DPatternWalker; /** * Decides the name for a particle. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RELAXNGCompiler.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RELAXNGCompiler.java index a47ce4556..129c22796 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RELAXNGCompiler.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RELAXNGCompiler.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -62,15 +62,15 @@ import com.sun.tools.xjc.model.TypeUse; import com.sun.xml.bind.api.impl.NameConverter; -import org.kohsuke.rngom.digested.DChoicePattern; -import org.kohsuke.rngom.digested.DDefine; -import org.kohsuke.rngom.digested.DElementPattern; -import org.kohsuke.rngom.digested.DPattern; -import org.kohsuke.rngom.digested.DPatternWalker; -import org.kohsuke.rngom.digested.DRefPattern; -import org.kohsuke.rngom.digested.DValuePattern; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.xml.util.WellKnownNamespaces; +import com.sun.tools.rngom.digested.DChoicePattern; +import com.sun.tools.rngom.digested.DDefine; +import com.sun.tools.rngom.digested.DElementPattern; +import com.sun.tools.rngom.digested.DPattern; +import com.sun.tools.rngom.digested.DPatternWalker; +import com.sun.tools.rngom.digested.DRefPattern; +import com.sun.tools.rngom.digested.DValuePattern; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.xml.util.WellKnownNamespaces; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.java index aa38dfd2e..a59191fe3 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/RawTypeSetBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -52,12 +52,12 @@ import com.sun.tools.xjc.reader.RawTypeSet; import com.sun.xml.bind.v2.model.core.ID; -import org.kohsuke.rngom.digested.DAttributePattern; -import org.kohsuke.rngom.digested.DElementPattern; -import org.kohsuke.rngom.digested.DOneOrMorePattern; -import org.kohsuke.rngom.digested.DPattern; -import org.kohsuke.rngom.digested.DPatternWalker; -import org.kohsuke.rngom.digested.DZeroOrMorePattern; +import com.sun.tools.rngom.digested.DAttributePattern; +import com.sun.tools.rngom.digested.DElementPattern; +import com.sun.tools.rngom.digested.DOneOrMorePattern; +import com.sun.tools.rngom.digested.DPattern; +import com.sun.tools.rngom.digested.DPatternWalker; +import com.sun.tools.rngom.digested.DZeroOrMorePattern; /** * Builds {@link RawTypeSet} for RELAX NG. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java index c727110f4..b3e5f601e 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -44,16 +44,16 @@ import java.util.Set; import java.util.Stack; -import org.kohsuke.rngom.digested.DAttributePattern; -import org.kohsuke.rngom.digested.DChoicePattern; -import org.kohsuke.rngom.digested.DDefine; -import org.kohsuke.rngom.digested.DListPattern; -import org.kohsuke.rngom.digested.DMixedPattern; -import org.kohsuke.rngom.digested.DOneOrMorePattern; -import org.kohsuke.rngom.digested.DOptionalPattern; -import org.kohsuke.rngom.digested.DPatternWalker; -import org.kohsuke.rngom.digested.DRefPattern; -import org.kohsuke.rngom.digested.DZeroOrMorePattern; +import com.sun.tools.rngom.digested.DAttributePattern; +import com.sun.tools.rngom.digested.DChoicePattern; +import com.sun.tools.rngom.digested.DDefine; +import com.sun.tools.rngom.digested.DListPattern; +import com.sun.tools.rngom.digested.DMixedPattern; +import com.sun.tools.rngom.digested.DOneOrMorePattern; +import com.sun.tools.rngom.digested.DOptionalPattern; +import com.sun.tools.rngom.digested.DPatternWalker; +import com.sun.tools.rngom.digested.DRefPattern; +import com.sun.tools.rngom.digested.DZeroOrMorePattern; /** * Fumigate the named patterns that can be bound to inheritance. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypeUseBinder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypeUseBinder.java index bb4fa64df..62ac65cb8 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypeUseBinder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypeUseBinder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -44,26 +44,26 @@ import com.sun.tools.xjc.model.TypeUse; import com.sun.tools.xjc.model.TypeUseFactory; -import org.kohsuke.rngom.digested.DAttributePattern; -import org.kohsuke.rngom.digested.DChoicePattern; -import org.kohsuke.rngom.digested.DContainerPattern; -import org.kohsuke.rngom.digested.DDataPattern; -import org.kohsuke.rngom.digested.DElementPattern; -import org.kohsuke.rngom.digested.DEmptyPattern; -import org.kohsuke.rngom.digested.DGrammarPattern; -import org.kohsuke.rngom.digested.DGroupPattern; -import org.kohsuke.rngom.digested.DInterleavePattern; -import org.kohsuke.rngom.digested.DListPattern; -import org.kohsuke.rngom.digested.DMixedPattern; -import org.kohsuke.rngom.digested.DNotAllowedPattern; -import org.kohsuke.rngom.digested.DOneOrMorePattern; -import org.kohsuke.rngom.digested.DOptionalPattern; -import org.kohsuke.rngom.digested.DPattern; -import org.kohsuke.rngom.digested.DPatternVisitor; -import org.kohsuke.rngom.digested.DRefPattern; -import org.kohsuke.rngom.digested.DTextPattern; -import org.kohsuke.rngom.digested.DValuePattern; -import org.kohsuke.rngom.digested.DZeroOrMorePattern; +import com.sun.tools.rngom.digested.DAttributePattern; +import com.sun.tools.rngom.digested.DChoicePattern; +import com.sun.tools.rngom.digested.DContainerPattern; +import com.sun.tools.rngom.digested.DDataPattern; +import com.sun.tools.rngom.digested.DElementPattern; +import com.sun.tools.rngom.digested.DEmptyPattern; +import com.sun.tools.rngom.digested.DGrammarPattern; +import com.sun.tools.rngom.digested.DGroupPattern; +import com.sun.tools.rngom.digested.DInterleavePattern; +import com.sun.tools.rngom.digested.DListPattern; +import com.sun.tools.rngom.digested.DMixedPattern; +import com.sun.tools.rngom.digested.DNotAllowedPattern; +import com.sun.tools.rngom.digested.DOneOrMorePattern; +import com.sun.tools.rngom.digested.DOptionalPattern; +import com.sun.tools.rngom.digested.DPattern; +import com.sun.tools.rngom.digested.DPatternVisitor; +import com.sun.tools.rngom.digested.DRefPattern; +import com.sun.tools.rngom.digested.DTextPattern; +import com.sun.tools.rngom.digested.DValuePattern; +import com.sun.tools.rngom.digested.DZeroOrMorePattern; /** * Walks the pattern tree and binds it to a {@link TypeUse}. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.java index c3be8b6b1..06dcafff2 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/WildcardNameClassBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -45,10 +45,10 @@ import com.sun.xml.xsom.XSWildcard; import com.sun.xml.xsom.visitor.XSWildcardFunction; -import org.kohsuke.rngom.nc.AnyNameExceptNameClass; -import org.kohsuke.rngom.nc.ChoiceNameClass; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.NsNameClass; +import com.sun.tools.rngom.nc.AnyNameExceptNameClass; +import com.sun.tools.rngom.nc.ChoiceNameClass; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.NsNameClass; /** * Builds a name class representation of a wildcard. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java index 8430de5d8..6828485e6 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -58,9 +58,9 @@ import com.sun.xml.xsom.visitor.XSTermFunction; import javax.xml.namespace.QName; -import org.kohsuke.rngom.nc.ChoiceNameClass; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.SimpleNameClass; +import com.sun.tools.rngom.nc.ChoiceNameClass; +import com.sun.tools.rngom.nc.NameClass; +import com.sun.tools.rngom.nc.SimpleNameClass; /** * Binds a complex type derived from another complex type by extension.