Refactor creating the org.firebirdsql.fbjava.impl package.

asfernandes · asfernandes · commit 32621d379916 · 2016-02-25T23:53:50.000-03:00
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/BlobConnection.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/BlobConnection.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/CloseableMemory.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/CloseableMemory.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import com.sun.jna.Memory;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/DataType.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/DataType.java
@@ -16,12 +16,12 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalContext;
-import org.firebirdsql.fbjava.FbClientLibrary.IMessageMetadata;
-import org.firebirdsql.fbjava.FbClientLibrary.IMetadataBuilder;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalContext;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMessageMetadata;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMetadataBuilder;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 
 import com.sun.jna.Pointer;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/DbClassLoader.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/DbClassLoader.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalEngine.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalEngine.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,19 +42,20 @@
 
 import org.firebirdsql.encodings.Encoding;
 import org.firebirdsql.encodings.EncodingFactory;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalContext;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalEngine;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalEngineIntf;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalFunction;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalProcedure;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalTrigger;
-import org.firebirdsql.fbjava.FbClientLibrary.IMessageMetadata;
-import org.firebirdsql.fbjava.FbClientLibrary.IMetadataBuilder;
-import org.firebirdsql.fbjava.FbClientLibrary.IReferenceCounted;
-import org.firebirdsql.fbjava.FbClientLibrary.IRoutineMetadata;
-import org.firebirdsql.fbjava.FbClientLibrary.ISC_DATE;
-import org.firebirdsql.fbjava.FbClientLibrary.ISC_TIME;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.ExternalResultSet;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalContext;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalEngine;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalEngineIntf;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalFunction;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalProcedure;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalTrigger;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMessageMetadata;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMetadataBuilder;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IReferenceCounted;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IRoutineMetadata;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.ISC_DATE;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.ISC_TIME;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 import org.firebirdsql.gds.ISCConstants;
 import org.firebirdsql.gds.impl.GDSHelper;
 import org.firebirdsql.jdbc.FBBlob;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalFunction.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalFunction.java
@@ -16,14 +16,14 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalContext;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalFunction;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalFunctionIntf;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalContext;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalFunction;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalFunctionIntf;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 
 import com.sun.jna.Pointer;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalProcedure.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalProcedure.java
@@ -16,17 +16,18 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalContext;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalProcedure;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalProcedureIntf;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalResultSet;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalResultSetIntf;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.ExternalResultSet;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalContext;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalProcedure;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalProcedureIntf;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalResultSet;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalResultSetIntf;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 
 import com.sun.jna.Pointer;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/FbClientLibrary.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/FbClientLibrary.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/FbException.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/FbException.java
@@ -16,9 +16,9 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 import org.firebirdsql.gds.ISCConstants;
 
 import com.sun.jna.Pointer;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalContext.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalContext.java
@@ -16,16 +16,16 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IAttachment;
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalContext;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
-import org.firebirdsql.fbjava.FbClientLibrary.ITransaction;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IAttachment;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalContext;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.ITransaction;
 
 
 class InternalContext implements AutoCloseable
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalDatabaseFactory.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalDatabaseFactory.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.sql.SQLException;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalFBConnection.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalFBConnection.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.sql.SQLException;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalGDSFactoryPlugin.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/InternalGDSFactoryPlugin.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import org.firebirdsql.gds.GDSException;
 import org.firebirdsql.gds.impl.BaseGDSFactoryPlugin;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/JnaUtil.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/JnaUtil.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/Main.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/Main.java
@@ -16,11 +16,11 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IMaster;
-import org.firebirdsql.fbjava.FbClientLibrary.IPluginManager;
-import org.firebirdsql.fbjava.FbClientLibrary.IUtil;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMaster;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginManager;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IUtil;
 
 import com.sun.jna.Native;
 
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/Parameter.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/Parameter.java
@@ -16,7 +16,7 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 
 class Parameter
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/PluginFactory.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/PluginFactory.java
@@ -16,13 +16,13 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IPluginBase;
-import org.firebirdsql.fbjava.FbClientLibrary.IPluginConfig;
-import org.firebirdsql.fbjava.FbClientLibrary.IPluginFactory;
-import org.firebirdsql.fbjava.FbClientLibrary.IPluginFactoryIntf;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginBase;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginConfig;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginFactory;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginFactoryIntf;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 
 
 class PluginFactory implements IPluginFactoryIntf
diff --git a/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/Routine.java b/src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/Routine.java
@@ -16,16 +16,16 @@
  *
  * All rights reserved.
  */
-package org.firebirdsql.fbjava;
+package org.firebirdsql.fbjava.impl;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.firebirdsql.fbjava.FbClientLibrary.IExternalContext;
-import org.firebirdsql.fbjava.FbClientLibrary.IMessageMetadata;
-import org.firebirdsql.fbjava.FbClientLibrary.IMetadataBuilder;
-import org.firebirdsql.fbjava.FbClientLibrary.IStatus;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IExternalContext;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMessageMetadata;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IMetadataBuilder;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IStatus;
 
 import com.sun.jna.Pointer;
 
diff --git a/src/fbjava/src/main/resources/META-INF/services/org.firebirdsql.gds.impl.GDSFactoryPlugin b/src/fbjava/src/main/resources/META-INF/services/org.firebirdsql.gds.impl.GDSFactoryPlugin
@@ -1 +1 @@
-org.firebirdsql.fbjava.InternalGDSFactoryPlugin
+org.firebirdsql.fbjava.impl.InternalGDSFactoryPlugin
diff --git a/src/native/fbjava/fbjava.cpp b/src/native/fbjava/fbjava.cpp
@@ -346,9 +346,9 @@ static void init()
 		checkJavaException(env);
 	}
 
-	// Call org.firebirdsql.fbjava.Main.initialize(String)
+	// Call org.firebirdsql.fbjava.impl.Main.initialize(String)
 
-	jstring mainClassName = env->NewStringUTF("org.firebirdsql.fbjava.Main");
+	jstring mainClassName = env->NewStringUTF("org.firebirdsql.fbjava.impl.Main");
 	if (!mainClassName)
 		checkJavaException(env);
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* All rights reserved.`
`18`	`18`	`*/`
`19`		`-package org.firebirdsql.fbjava;`
	`19`	`+package org.firebirdsql.fbjava.impl;`
`20`	`20`
`21`	`21`	`import java.io.ByteArrayInputStream;`
`22`	`22`	`import java.io.ByteArrayOutputStream;`