33 files changed, 61 insertions, 51 deletions
diff --git a/src/main/java/org/anarres/cpp/Argument.java b/src/main/java/com/jogamp/gluegen/jcpp/Argument.java
index 31d9e93..bccddcb 100644
--- a/src/main/java/org/anarres/cpp/Argument.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Argument.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/org/anarres/cpp/BuildMetadata.java b/src/main/java/com/jogamp/gluegen/jcpp/BuildMetadata.java
index 79de407..f22d853 100644
--- a/src/main/java/org/anarres/cpp/BuildMetadata.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/BuildMetadata.java
@@ -1,4 +1,4 @@
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/anarres/cpp/ChrootFileSystem.java b/src/main/java/com/jogamp/gluegen/jcpp/ChrootFileSystem.java
index 1cec184..f3806fa 100644
--- a/src/main/java/org/anarres/cpp/ChrootFileSystem.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/ChrootFileSystem.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/anarres/cpp/CppReader.java b/src/main/java/com/jogamp/gluegen/jcpp/CppReader.java
index 5517f47..82ef2fe 100644
--- a/src/main/java/org/anarres/cpp/CppReader.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/CppReader.java
@@ -14,15 +14,17 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.Reader;
+
 import javax.annotation.Nonnull;
-import static org.anarres.cpp.Token.CCOMMENT;
-import static org.anarres.cpp.Token.CPPCOMMENT;
-import static org.anarres.cpp.Token.EOF;
+
+import static com.jogamp.gluegen.jcpp.Token.CCOMMENT;
+import static com.jogamp.gluegen.jcpp.Token.CPPCOMMENT;
+import static com.jogamp.gluegen.jcpp.Token.EOF;
 
 /**
  * A Reader wrapper around the Preprocessor.
diff --git a/src/main/java/org/anarres/cpp/CppTask.java b/src/main/java/com/jogamp/gluegen/jcpp/CppTask.java
index 66df1a6..e3be324 100644
--- a/src/main/java/org/anarres/cpp/CppTask.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/CppTask.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/main/java/org/anarres/cpp/DefaultPreprocessorListener.java b/src/main/java/com/jogamp/gluegen/jcpp/DefaultPreprocessorListener.java
index 4d6ee7e..bcb3000 100644
--- a/src/main/java/org/anarres/cpp/DefaultPreprocessorListener.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/DefaultPreprocessorListener.java
@@ -1,4 +1,4 @@
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /*
  * Anarres C Preprocessor
diff --git a/src/main/java/org/anarres/cpp/Feature.java b/src/main/java/com/jogamp/gluegen/jcpp/Feature.java
index 369d79c..e2feefc 100644
--- a/src/main/java/org/anarres/cpp/Feature.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Feature.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /**
  * Features of the Preprocessor, which may be enabled or disabled.
diff --git a/src/main/java/org/anarres/cpp/FileLexerSource.java b/src/main/java/com/jogamp/gluegen/jcpp/FileLexerSource.java
index bdc411f..6d7e4c5 100644
--- a/src/main/java/org/anarres/cpp/FileLexerSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/FileLexerSource.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/main/java/org/anarres/cpp/FixedTokenSource.java b/src/main/java/com/jogamp/gluegen/jcpp/FixedTokenSource.java
index 4d9f41f..d084932 100644
--- a/src/main/java/org/anarres/cpp/FixedTokenSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/FixedTokenSource.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/src/main/java/org/anarres/cpp/InputLexerSource.java b/src/main/java/com/jogamp/gluegen/jcpp/InputLexerSource.java
index 93cda54..00cb01a 100644
--- a/src/main/java/org/anarres/cpp/InputLexerSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/InputLexerSource.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/org/anarres/cpp/InternalException.java b/src/main/java/com/jogamp/gluegen/jcpp/InternalException.java
index fc3b650..72abaf9 100644
--- a/src/main/java/org/anarres/cpp/InternalException.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/InternalException.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /**
  * An internal exception.
diff --git a/src/main/java/org/anarres/cpp/JavaFileSystem.java b/src/main/java/com/jogamp/gluegen/jcpp/JavaFileSystem.java
index a60271d..f62ba53 100644
--- a/src/main/java/org/anarres/cpp/JavaFileSystem.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/JavaFileSystem.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/anarres/cpp/JoinReader.java b/src/main/java/com/jogamp/gluegen/jcpp/JoinReader.java
index c39ee79..e44a7e6 100644
--- a/src/main/java/org/anarres/cpp/JoinReader.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/JoinReader.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/main/java/org/anarres/cpp/LexerException.java b/src/main/java/com/jogamp/gluegen/jcpp/LexerException.java
index d4b2e9c..6a9bf5b 100644
--- a/src/main/java/org/anarres/cpp/LexerException.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/LexerException.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /**
  * A preprocessor exception.
diff --git a/src/main/java/org/anarres/cpp/LexerSource.java b/src/main/java/com/jogamp/gluegen/jcpp/LexerSource.java
index 82d76b6..798e0a9 100644
--- a/src/main/java/org/anarres/cpp/LexerSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/LexerSource.java
@@ -14,12 +14,14 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.io.Reader;
+
 import javax.annotation.Nonnull;
-import static org.anarres.cpp.Token.*;
+
+import static com.jogamp.gluegen.jcpp.Token.*;
 
 /** Does not handle digraphs. */
 public class LexerSource extends Source {
diff --git a/src/main/java/org/anarres/cpp/Macro.java b/src/main/java/com/jogamp/gluegen/jcpp/Macro.java
index ce00930..e41273e 100644
--- a/src/main/java/org/anarres/cpp/Macro.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Macro.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/org/anarres/cpp/MacroTokenSource.java b/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java
index b512c3d..fbb2428 100644
--- a/src/main/java/org/anarres/cpp/MacroTokenSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java
@@ -14,13 +14,15 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.annotation.Nonnull;
-import static org.anarres.cpp.Token.*;
+
+import static com.jogamp.gluegen.jcpp.Token.*;
 
 /* This source should always be active, since we don't expand macros
  * in any inactive context. */
diff --git a/src/main/java/org/anarres/cpp/Main.java b/src/main/java/com/jogamp/gluegen/jcpp/Main.java
index acf2436..9f06fb0 100644
--- a/src/main/java/org/anarres/cpp/Main.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Main.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.File;
 import java.io.PrintStream;
diff --git a/src/main/java/org/anarres/cpp/NumericValue.java b/src/main/java/com/jogamp/gluegen/jcpp/NumericValue.java
index e4235d3..8e79fd3 100644
--- a/src/main/java/org/anarres/cpp/NumericValue.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/NumericValue.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/main/java/org/anarres/cpp/Preprocessor.java b/src/main/java/com/jogamp/gluegen/jcpp/Preprocessor.java
index c7a106a..31eca4e 100644
--- a/src/main/java/org/anarres/cpp/Preprocessor.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Preprocessor.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.Closeable;
 import java.io.File;
@@ -35,14 +35,12 @@ import java.util.TreeMap;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import static org.anarres.cpp.PreprocessorCommand.*;
-
-import org.anarres.cpp.PreprocessorListener.SourceChangeEvent;
+import static com.jogamp.gluegen.jcpp.PreprocessorCommand.*;
+import static com.jogamp.gluegen.jcpp.Token.*;
 
 import com.jogamp.gluegen.Logging;
 import com.jogamp.gluegen.Logging.LoggerIf;
-
-import static org.anarres.cpp.Token.*;
+import com.jogamp.gluegen.jcpp.PreprocessorListener.SourceChangeEvent;
 
 /**
  * A C Preprocessor.
diff --git a/src/main/java/org/anarres/cpp/PreprocessorCommand.java b/src/main/java/com/jogamp/gluegen/jcpp/PreprocessorCommand.java
index 3938360..a01a04b 100644
--- a/src/main/java/org/anarres/cpp/PreprocessorCommand.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/PreprocessorCommand.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/src/main/java/org/anarres/cpp/PreprocessorListener.java b/src/main/java/com/jogamp/gluegen/jcpp/PreprocessorListener.java
index 0d3f7fc..1152a58 100644
--- a/src/main/java/org/anarres/cpp/PreprocessorListener.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/PreprocessorListener.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/org/anarres/cpp/ResourceFileSystem.java b/src/main/java/com/jogamp/gluegen/jcpp/ResourceFileSystem.java
index 7efd664..438d9c1 100644
--- a/src/main/java/org/anarres/cpp/ResourceFileSystem.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/ResourceFileSystem.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/org/anarres/cpp/Source.java b/src/main/java/com/jogamp/gluegen/jcpp/Source.java
index 817c162..d56b5d7 100644
--- a/src/main/java/org/anarres/cpp/Source.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Source.java
@@ -14,19 +14,21 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Iterator;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
-import static org.anarres.cpp.Token.CCOMMENT;
-import static org.anarres.cpp.Token.CPPCOMMENT;
-import static org.anarres.cpp.Token.EOF;
-import static org.anarres.cpp.Token.NL;
-import static org.anarres.cpp.Token.WHITESPACE;
+
+import static com.jogamp.gluegen.jcpp.Token.CCOMMENT;
+import static com.jogamp.gluegen.jcpp.Token.CPPCOMMENT;
+import static com.jogamp.gluegen.jcpp.Token.EOF;
+import static com.jogamp.gluegen.jcpp.Token.NL;
+import static com.jogamp.gluegen.jcpp.Token.WHITESPACE;
 
 /**
  * An input to the Preprocessor.
diff --git a/src/main/java/org/anarres/cpp/SourceIterator.java b/src/main/java/com/jogamp/gluegen/jcpp/SourceIterator.java
index 82e36d9..4990512 100644
--- a/src/main/java/org/anarres/cpp/SourceIterator.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/SourceIterator.java
@@ -14,12 +14,13 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import static org.anarres.cpp.Token.EOF;
+
+import static com.jogamp.gluegen.jcpp.Token.EOF;
 
 /**
  * An Iterator for {@link Source Sources},
diff --git a/src/main/java/org/anarres/cpp/State.java b/src/main/java/com/jogamp/gluegen/jcpp/State.java
index e24195d..4d7f886 100644
--- a/src/main/java/org/anarres/cpp/State.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/State.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /* pp */ class State {
 
diff --git a/src/main/java/org/anarres/cpp/StringLexerSource.java b/src/main/java/com/jogamp/gluegen/jcpp/StringLexerSource.java
index 8640bc8..568bdca 100644
--- a/src/main/java/org/anarres/cpp/StringLexerSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/StringLexerSource.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.StringReader;
 
diff --git a/src/main/java/org/anarres/cpp/Token.java b/src/main/java/com/jogamp/gluegen/jcpp/Token.java
index 3e6eb3e..9c1794b 100644
--- a/src/main/java/org/anarres/cpp/Token.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Token.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /**
  * A Preprocessor token.
diff --git a/src/main/java/org/anarres/cpp/TokenSnifferSource.java b/src/main/java/com/jogamp/gluegen/jcpp/TokenSnifferSource.java
index 21e1cb8..cc60698 100644
--- a/src/main/java/org/anarres/cpp/TokenSnifferSource.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/TokenSnifferSource.java
@@ -14,11 +14,12 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import java.util.List;
-import static org.anarres.cpp.Token.EOF;
+
+import static com.jogamp.gluegen.jcpp.Token.EOF;
 
 @Deprecated
 /* pp */ class TokenSnifferSource extends Source {
diff --git a/src/main/java/org/anarres/cpp/TokenType.java b/src/main/java/com/jogamp/gluegen/jcpp/TokenType.java
index 86df097..e481bab 100644
--- a/src/main/java/org/anarres/cpp/TokenType.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/TokenType.java
@@ -3,14 +3,16 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
-import static org.anarres.cpp.Token.*;
+
+import static com.jogamp.gluegen.jcpp.Token.*;
 
 /**
  *
diff --git a/src/main/java/org/anarres/cpp/VirtualFile.java b/src/main/java/com/jogamp/gluegen/jcpp/VirtualFile.java
index aee1cad..26bbbcb 100644
--- a/src/main/java/org/anarres/cpp/VirtualFile.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/VirtualFile.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import java.io.IOException;
 import javax.annotation.CheckForNull;
diff --git a/src/main/java/org/anarres/cpp/VirtualFileSystem.java b/src/main/java/com/jogamp/gluegen/jcpp/VirtualFileSystem.java
index 9c77d30..3f72f0c 100644
--- a/src/main/java/org/anarres/cpp/VirtualFileSystem.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/VirtualFileSystem.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/org/anarres/cpp/Warning.java b/src/main/java/com/jogamp/gluegen/jcpp/Warning.java
index 80d184a..89388f4 100644
--- a/src/main/java/org/anarres/cpp/Warning.java
+++ b/src/main/java/com/jogamp/gluegen/jcpp/Warning.java
@@ -14,7 +14,7 @@
  * or implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.anarres.cpp;
+package com.jogamp.gluegen.jcpp;
 
 /**
  * Warning classes which may optionally be emitted by the Preprocessor.