Separate the public project (fbjava) from the implementation one (fbjava-impl).

Author: asfernandes

src/etc/bin/create-package.sh

@@ -20,10 +20,10 @@ else
 fi
 
 cd $BASE_DIR
-make TARGET=$CONFIG
+make TARGET=$CONFIG clean all
 
-cd $BASE_DIR/src/fbjava
-mvn package dependency:copy-dependencies
+cd $BASE_DIR/src
+mvn clean package dependency:copy-dependencies
 
 mkdir -p \
 	$TARGET_DIR/bin \
@@ -35,9 +35,10 @@ mkdir -p \
 cp $BASE_DIR/src/etc/bin/setenv.$SHELL_EXT $TARGET_DIR/bin
 cp $BASE_DIR/src/etc/bin/fbjava-deployer.$SHELL_EXT $TARGET_DIR/bin
 cp $BASE_DIR/src/fbjava/target/*.jar $TARGET_DIR/jar
-cp $BASE_DIR/src/fbjava/target/dependency/*.jar $TARGET_DIR/jar
+cp $BASE_DIR/src/fbjava-impl/target/*.jar $TARGET_DIR/jar
+cp $BASE_DIR/src/fbjava-impl/target/dependency/*.jar $TARGET_DIR/jar
 cp $BASE_DIR/output/$CONFIG/lib/libfbjava.$SHRLIB_EXT $TARGET_DIR/lib
-cp $BASE_DIR/src/fbjava/src/main/resources/org/firebirdsql/fbjava/*.sql $TARGET_DIR/scripts
+cp $BASE_DIR/src/fbjava-impl/src/main/resources/org/firebirdsql/fbjava/*.sql $TARGET_DIR/scripts
 cp $BASE_DIR/src/etc/conf/fbjava.conf $TARGET_DIR/conf
 cp $BASE_DIR/src/etc/scripts/java-security.sql $TARGET_DIR/scripts
 

src/fbjava-impl/.gitignore

@@ -0,0 +1,4 @@
+/target/
+.settings/
+.classpath
+.project

src/fbjava-impl/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.firebirdsql.fbjava</groupId>
+		<artifactId>fbjava-parent</artifactId>
+		<version>0.1-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>fbjava-impl</artifactId>
+	<name>fbjava-impl</name>
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.firebirdsql.fbjava</groupId>
+			<artifactId>fbjava</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.firebirdsql.jdbc</groupId>
+			<artifactId>jaybird-jdk18</artifactId>
+			<version>${jaybird.version}</version>
+			<!-- FIXME: Use a Jaybird public release. -->
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../../../jaybird.git/output/lib/jaybird-full-3.0.0-SNAPSHOT.jar</systemPath>
+		</dependency>
+
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna</artifactId>
+		</dependency>
+	</dependencies>
+</project>

src/fbjava/src/main/java/org/firebirdsql/fbjava/Deployer.java renamed to src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/Deployer.java

@@ -35,6 +35,8 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
+import org.firebirdsql.fbjava.ExternalResultSet;
+
 
 public class Deployer
 {

src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/BlobConnection.java renamed to src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/BlobConnection.java

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.firebirdsql.fbjava</groupId>
 			<artifactId>fbjava</artifactId>
-			<version>${fbjava.version}</version>
+			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/CallableRoutineContextImpl.java renamed to src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/CallableRoutineContextImpl.java

@@ -14,20 +14,4 @@
 	<artifactId>fbjava</artifactId>
 	<name>fbjava</name>
 	<packaging>jar</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.firebirdsql.jdbc</groupId>
-			<artifactId>jaybird-jdk18</artifactId>
-			<version>${jaybird.version}</version>
-			<!-- FIXME: Use a Jaybird public release. -->
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../../../jaybird.git/output/lib/jaybird-full-3.0.0-SNAPSHOT.jar</systemPath>
-		</dependency>
-
-		<dependency>
-			<groupId>net.java.dev.jna</groupId>
-			<artifactId>jna</artifactId>
-		</dependency>
-	</dependencies>
 </project>

src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/CallableThrowable.java renamed to src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/CallableThrowable.java

@@ -6,16 +6,14 @@
 
 	<groupId>org.firebirdsql.fbjava</groupId>
 	<artifactId>fbjava-parent</artifactId>
-	<version>0.1-SNAPSHOT</version>
 	<name>fbjava-parent</name>
+	<version>0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 
-		<fbjava.version>0.1-SNAPSHOT</fbjava.version>
-
 		<jaybird.version>3.0.0-SNAPSHOT</jaybird.version>
 		<jna.version>4.2.1</jna.version>
 	</properties>
@@ -32,6 +30,7 @@
 
 	<modules>
 		<module>fbjava</module>
+		<module>fbjava-impl</module>
 		<module>fbjava-tests</module>
 	</modules>