Merge pull request #1159 from javaee/rngom-renamed

org.kohsuke.rngom rename
javaee · Jan 11, 2018 · 5d40833 · 5d40833
2 parents aee10d7 + 04256b8
commit 5d40833
Show file tree

Hide file tree

Showing 206 changed files with 855 additions and 891 deletions.
diff --git 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
@@ -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
@@ -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 @@
                                     <exclude>relaxngDatatype:relaxngDatatype</exclude>
 
                                     <exclude>org.glassfish.jaxb:codemodel</exclude>
-                                    <exclude>org.kohsuke.rngom:rngom</exclude>
+                                    <exclude>com.sun.tools.rngom:rngom</exclude>
                                     <exclude>com.sun.xml.bind.external:rngom</exclude>
                                     <exclude>com.sun.xml.dtd-parser:dtd-parser</exclude>
                                     <exclude>com.sun.istack:istack-commons-tools</exclude>

diff --git 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}
                                 </Export-Package>

diff --git 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 @@
     <!-- Generated -->
     <Match>
         <Or>
-            <Class name="org.kohsuke.rngom.parse.compact.CompactSyntaxTokenManager"/>
+            <Class name="com.sun.tools.rngom.parse.compact.CompactSyntaxTokenManager"/>
-            <Class name="org.kohsuke.rngom.parse.compact.CompactSyntaxConstants"/>
+            <Class name="com.sun.tools.rngom.parse.compact.CompactSyntaxConstants"/>
-            <Class name="org.kohsuke.rngom.parse.compact.CompactSyntax"/>
+            <Class name="com.sun.tools.rngom.parse.compact.CompactSyntax"/>
-            <Class name="org.kohsuke.rngom.parse.compact.ParseException"/>
+            <Class name="com.sun.tools.rngom.parse.compact.ParseException"/>
-            <Class name="org.kohsuke.rngom.parse.compact.TokenMgrError"/>
+            <Class name="com.sun.tools.rngom.parse.compact.TokenMgrError"/>
-            <Class name="org.kohsuke.rngom.parse.compact.JavaCharStream"/>
+            <Class name="com.sun.tools.rngom.parse.compact.JavaCharStream"/>
-            <Class name="org.kohsuke.rngom.parse.compact.UCode_UCodeESC_CharStream"/>
+            <Class name="com.sun.tools.rngom.parse.compact.UCode_UCodeESC_CharStream"/>
         </Or>
     </Match>
 
     <!-- Supposed to be used elsewhere -->
     <Match>
         <Bug pattern="URF_UNREAD_FIELD"/>
-        <Class name="org.kohsuke.rngom.digested.DPattern"/>
+        <Class name="com.sun.tools.rngom.digested.DPattern"/>
     </Match>
 
     <!-- Potentially allowed to be subclassed or instantiated -->
     <Match>
         <Or>
-            <Class name="org.kohsuke.rngom.digested.DXMLPrinter$XMLWriterException"/>
+            <Class name="com.sun.tools.rngom.digested.DXMLPrinter$XMLWriterException"/>
-            <Class name="org.kohsuke.rngom.digested.DDataPattern$Param"/>
+            <Class name="com.sun.tools.rngom.digested.DDataPattern$Param"/>
         </Or>
         <Bug pattern="SIC_INNER_SHOULD_BE_STATIC"/>        
     </Match>

diff --git a/...ohsuke/rngom/ast/builder/Annotations.java → .../tools/rngom/ast/builder/Annotations.java b/...ohsuke/rngom/ast/builder/Annotations.java → .../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 com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.Location;
 
 
 /**

diff --git a/...uke/rngom/ast/builder/BuildException.java → ...ols/rngom/ast/builder/BuildException.java b/...uke/rngom/ast/builder/BuildException.java → ...ols/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/...ohsuke/rngom/ast/builder/CommentList.java → .../tools/rngom/ast/builder/CommentList.java b/...ohsuke/rngom/ast/builder/CommentList.java → .../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<L extends Location> {

diff --git a/...rngom/ast/builder/DataPatternBuilder.java → ...rngom/ast/builder/DataPatternBuilder.java b/...rngom/ast/builder/DataPatternBuilder.java → ...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 com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
-import org.kohsuke.rngom.parse.*;
+import com.sun.tools.rngom.parse.Context;
+import com.sun.tools.rngom.parse.*;
 
 
 public interface DataPatternBuilder<

diff --git a/...va/org/kohsuke/rngom/ast/builder/Div.java → .../com/sun/tools/rngom/ast/builder/Div.java b/...va/org/kohsuke/rngom/ast/builder/Div.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 com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
 
 
 public interface Div<

diff --git a/...ast/builder/ElementAnnotationBuilder.java → ...ast/builder/ElementAnnotationBuilder.java b/...ast/builder/ElementAnnotationBuilder.java → ...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 com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
 
 /**
  * Used to build foreign element annotations.

diff --git a/...rg/kohsuke/rngom/ast/builder/Grammar.java → .../sun/tools/rngom/ast/builder/Grammar.java b/...rg/kohsuke/rngom/ast/builder/Grammar.java → .../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 com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
 
 /**
  * {@link Scope} for {@code <grammar>} element that serves as a container

diff --git a/...uke/rngom/ast/builder/GrammarSection.java → ...ols/rngom/ast/builder/GrammarSection.java b/...uke/rngom/ast/builder/GrammarSection.java → ...ols/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 com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
 
 /**
  * The container that can have {@code <define>} elements.

diff --git a/...rg/kohsuke/rngom/ast/builder/Include.java → .../sun/tools/rngom/ast/builder/Include.java b/...rg/kohsuke/rngom/ast/builder/Include.java → .../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 com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.parse.IllegalSchemaException;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.parse.Parseable;
-
+import com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.parse.IllegalSchemaException;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
-import org.kohsuke.rngom.parse.Parseable;
 
 public interface Include<
     P extends ParsedPattern,

diff --git a/...ke/rngom/ast/builder/IncludedGrammar.java → ...ls/rngom/ast/builder/IncludedGrammar.java b/...ke/rngom/ast/builder/IncludedGrammar.java → ...ls/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 com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
-import org.kohsuke.rngom.parse.Parseable;
+import com.sun.tools.rngom.parse.Parseable;
 
 /**
  * {@link Scope} for {@code <grammar>} element of the {@code <include>}d grammar.

diff --git a/...e/rngom/ast/builder/NameClassBuilder.java → ...s/rngom/ast/builder/NameClassBuilder.java b/...e/rngom/ast/builder/NameClassBuilder.java → ...s/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 com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedNameClass;
+import com.sun.tools.rngom.ast.om.ParsedNameClass;
 
 import java.util.List;
 

diff --git a/...suke/rngom/ast/builder/SchemaBuilder.java → ...ools/rngom/ast/builder/SchemaBuilder.java b/...suke/rngom/ast/builder/SchemaBuilder.java → ...ools/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;
+package com.sun.tools.rngom.ast.builder;
-
+
-import org.kohsuke.rngom.ast.om.Location;
+import com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedNameClass;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.nc.NameClass;
-import org.kohsuke.rngom.parse.*;
+import com.sun.tools.rngom.parse.Context;
-import org.kohsuke.rngom.parse.IllegalSchemaException;
+import com.sun.tools.rngom.parse.IllegalSchemaException;
-import org.kohsuke.rngom.parse.Parseable;
+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<P,E,L,A,CL> 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/.../org/kohsuke/rngom/ast/builder/Scope.java → ...om/sun/tools/rngom/ast/builder/Scope.java b/.../org/kohsuke/rngom/ast/builder/Scope.java → ...om/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 com.sun.tools.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.om.ParsedPattern;
+import com.sun.tools.rngom.ast.om.Location;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
+import com.sun.tools.rngom.ast.om.ParsedPattern;
 
 public interface Scope<
     P extends ParsedPattern,

diff --git a/...va/org/kohsuke/rngom/ast/om/Location.java → .../com/sun/tools/rngom/ast/om/Location.java b/...va/org/kohsuke/rngom/ast/om/Location.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/...rngom/ast/om/ParsedElementAnnotation.java → ...rngom/ast/om/ParsedElementAnnotation.java b/...rngom/ast/om/ParsedElementAnnotation.java → ...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/...kohsuke/rngom/ast/om/ParsedNameClass.java → ...n/tools/rngom/ast/om/ParsedNameClass.java b/...kohsuke/rngom/ast/om/ParsedNameClass.java → ...n/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/...g/kohsuke/rngom/ast/om/ParsedPattern.java → ...sun/tools/rngom/ast/om/ParsedPattern.java b/...g/kohsuke/rngom/ast/om/ParsedPattern.java → ...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 { }