Create a default fbjava.conf to be included in plugins.conf and work in progress with security.

Author: asfernandes

src/etc/bin/create-package.sh

@@ -26,7 +26,8 @@ cp $BASE_DIR/src/fbjava/target/*.jar $TARGET_DIR/jar
 cp $BASE_DIR/src/fbjava/target/dependency/*.jar $TARGET_DIR/jar
 cp $BASE_DIR/output/$CONFIG/lib/libfbjava.so $TARGET_DIR/lib
 cp $BASE_DIR/src/fbjava/src/main/resources/org/firebirdsql/fbjava/*.sql $TARGET_DIR/scripts
-cp $BASE_DIR/src/etc/scripts/*.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
 
 if [ -f $TARGET_DIR/conf/java-security.fdb ]; then
 	rm $TARGET_DIR/conf/java-security.fdb

src/etc/conf/fbjava.conf

@@ -0,0 +1,8 @@
+Plugin = JAVA {
+	Module = $(this)/../lib/libfbjava.so
+	Config = JAVA_config
+}
+
+Config = JAVA_config {
+	SecurityDatabase = $(this)/java-security.fdb
+}

src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/ExternalEngine.java

@@ -126,7 +126,7 @@ boolean closeAttachment(IStatus status, IExternalContext context) throws IOExcep
 		}
 	}
 
-	private ExternalEngine()
+	private ExternalEngine(String securityDatabase)
 	{
 	}
 
@@ -1034,9 +1034,9 @@ private static int javaTimeToFb(long n)
 		return iscTime.value;
 	}
 
-	public static IExternalEngine create()
+	public static IExternalEngine create(String securityDatabase)
 	{
-		ExternalEngine wrapped = new ExternalEngine();
+		ExternalEngine wrapped = new ExternalEngine(securityDatabase);
 		wrapped.wrapper = JnaUtil.pin(new IExternalEngine(wrapped));
 		return wrapped.wrapper;
 	}

src/fbjava/src/main/java/org/firebirdsql/fbjava/impl/PluginFactory.java

@@ -18,6 +18,8 @@
  */
 package org.firebirdsql.fbjava.impl;
 
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IConfig;
+import org.firebirdsql.fbjava.impl.FbClientLibrary.IConfigEntry;
 import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginBase;
 import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginConfig;
 import org.firebirdsql.fbjava.impl.FbClientLibrary.IPluginFactory;
@@ -37,8 +39,28 @@ public static IPluginFactory create()
 	}
 
 	@Override
-	public IPluginBase createPlugin(IStatus status, IPluginConfig factoryParameter) throws FbException
+	public IPluginBase createPlugin(IStatus status, IPluginConfig pluginConfig) throws FbException
 	{
-		return ExternalEngine.create();
+		String securityDatabase;
+
+		IConfig config = pluginConfig.getDefaultConfig(status);
+		try
+		{
+			IConfigEntry entry = config.find(status, "SecurityDatabase");
+			try
+			{
+				securityDatabase = entry.getValue();
+			}
+			finally
+			{
+				entry.release();
+			}
+		}
+		finally
+		{
+			config.release();
+		}
+
+		return ExternalEngine.create(securityDatabase);
 	}
 }