Changeset: 74216a3ed2c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74216a3ed2c6
Added Files:
java/embedded/Makefile.ag
java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.h
java/embedded/pom.xml
java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
java/embedded/target/apidocs/allclasses-frame.html
java/embedded/target/apidocs/allclasses-noframe.html
java/embedded/target/apidocs/constant-values.html
java/embedded/target/apidocs/deprecated-list.html
java/embedded/target/apidocs/help-doc.html
java/embedded/target/apidocs/index-all.html
java/embedded/target/apidocs/index.html
java/embedded/target/apidocs/org/monetdb/embedded/MonetDBEmbedded.html
java/embedded/target/apidocs/org/monetdb/embedded/class-use/MonetDBEmbedded.html
java/embedded/target/apidocs/org/monetdb/embedded/package-frame.html
java/embedded/target/apidocs/org/monetdb/embedded/package-summary.html
java/embedded/target/apidocs/org/monetdb/embedded/package-tree.html
java/embedded/target/apidocs/org/monetdb/embedded/package-use.html
java/embedded/target/apidocs/org/monetdb/embedded/result/EmbeddedQueryResult.html
java/embedded/target/apidocs/org/monetdb/embedded/result/QueryResult.html
java/embedded/target/apidocs/org/monetdb/embedded/result/Result.html
java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/EmbeddedQueryResult.html
java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/QueryResult.html
java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/Result.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/Column.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/IntegerColumn.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/class-use/Column.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/class-use/IntegerColumn.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-frame.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-summary.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-tree.html
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-use.html
java/embedded/target/apidocs/org/monetdb/embedded/result/package-frame.html
java/embedded/target/apidocs/org/monetdb/embedded/result/package-summary.html
java/embedded/target/apidocs/org/monetdb/embedded/result/package-tree.html
java/embedded/target/apidocs/org/monetdb/embedded/result/package-use.html
java/embedded/target/apidocs/overview-frame.html
java/embedded/target/apidocs/overview-summary.html
java/embedded/target/apidocs/overview-tree.html
java/embedded/target/apidocs/package-list
java/embedded/target/apidocs/script.js
java/embedded/target/apidocs/stylesheet.css
java/embedded/target/classes/META-INF/MANIFEST.MF
java/embedded/target/classes/META-INF/maven/org.monetdb/monetdb-embedded/pom.xml
java/embedded/target/classes/org_monetdb_embedded_MonetDBEmbedded.h
java/embedded/target/classes/org_monetdb_embedded_result_EmbeddedQueryResult.h
java/embedded/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml
java/embedded/target/javadoc-bundle-options/package-list
java/embedded/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
java/embedded/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Removed Files:
tools/embedded/java-package/Makefile.ag
tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.h
tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.h
tools/embedded/java-package/pom.xml
tools/embedded/java-package/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/column/Column.java
tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
tools/embedded/java-package/target/apidocs/allclasses-frame.html
tools/embedded/java-package/target/apidocs/allclasses-noframe.html
tools/embedded/java-package/target/apidocs/constant-values.html
tools/embedded/java-package/target/apidocs/deprecated-list.html
tools/embedded/java-package/target/apidocs/help-doc.html
tools/embedded/java-package/target/apidocs/index-all.html
tools/embedded/java-package/target/apidocs/index.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/MonetDBEmbedded.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/class-use/MonetDBEmbedded.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-frame.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-summary.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-tree.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-use.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/EmbeddedQueryResult.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/QueryResult.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/Result.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/EmbeddedQueryResult.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/QueryResult.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/Result.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/Column.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/IntegerColumn.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/class-use/Column.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/class-use/IntegerColumn.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-frame.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-summary.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-tree.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-use.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-frame.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-summary.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-tree.html
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-use.html
tools/embedded/java-package/target/apidocs/overview-frame.html
tools/embedded/java-package/target/apidocs/overview-summary.html
tools/embedded/java-package/target/apidocs/overview-tree.html
tools/embedded/java-package/target/apidocs/package-list
tools/embedded/java-package/target/apidocs/script.js
tools/embedded/java-package/target/apidocs/stylesheet.css
tools/embedded/java-package/target/classes/META-INF/MANIFEST.MF
tools/embedded/java-package/target/classes/META-INF/maven/org.monetdb/monetdb-embedded/pom.xml
tools/embedded/java-package/target/classes/org_monetdb_embedded_MonetDBEmbedded.h
tools/embedded/java-package/target/classes/org_monetdb_embedded_result_EmbeddedQueryResult.h
tools/embedded/java-package/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml
tools/embedded/java-package/target/javadoc-bundle-options/package-list
tools/embedded/java-package/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
tools/embedded/java-package/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Modified Files:
configure.ag
java/Makefile.ag
tools/embedded/Makefile.ag
Branch: embedded-java
Log Message:
Milestone 1: Compile on unix
To achive that:
- Included the monetdb_config.h in all C sources
- Moved project under java
-- Fixed include and lib paths
- Add a have_embedded_java conditional
diffs (270 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2987,6 +2987,7 @@ AM_CONDITIONAL(HAVE_MONETDB5, test "x$en
AM_CONDITIONAL(HAVE_SQL, test "x$enable_sql" = xyes -o "x$enable_sql" = xauto)
AM_CONDITIONAL(HAVE_GEOM, test "x$enable_geom" = xyes -o "x$enable_geom" =
xauto)
AM_CONDITIONAL(HAVE_EMBEDDED, test "x$enable_embedded" = xyes)
+AM_CONDITIONAL(HAVE_EMBEDDED_JAVA, test "x$enable_embedded_java" = xyes)
AM_CONDITIONAL(HAVE_MEROVINGIAN, test "x$enable_merovingian" = xyes -o
"x$enable_merovingian" = xauto)
AM_CONDITIONAL(HAVE_MSERVER, test "x$enable_mserver" = xyes -o
"x$enable_mserver" = xauto)
AM_CONDITIONAL(HAVE_TESTING, test "x$enable_testing" = xyes -o
"x$enable_testing" = xauto)
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = HAVE_JAVAJDBC?tests
+SUBDIRS = HAVE_JAVAJDBC?tests HAVE_EMBEDDED_JAVA?embedded
EXTRA_DIST = build.xml build.properties release.txt
diff --git a/tools/embedded/java-package/Makefile.ag b/java/embedded/Makefile.ag
rename from tools/embedded/java-package/Makefile.ag
rename to java/embedded/Makefile.ag
--- a/tools/embedded/java-package/Makefile.ag
+++ b/java/embedded/Makefile.ag
@@ -17,22 +17,22 @@
MTSAFE
-INCLUDES = ../ \
- ../../../monetdb5/mal \
- ../../../monetdb5/modules/atoms \
- ../../../monetdb5/modules/mal \
- ../../../monetdb5/extras/rapi \
- ../../../gdk \
- ../../../common/stream \
- ../../../common/utils \
- ../../../common/options \
- ../../../clients/mapilib \
- ../../../sql/include \
- ../../../sql/server \
- ../../../sql/common \
- ../../../sql/storage \
- ../../../sql/storage/bat \
- ../../../sql/backends/monet5 \
+INCLUDES = ../../tools/embedded \
+ ../../monetdb5/mal \
+ ../../monetdb5/modules/atoms \
+ ../../monetdb5/modules/mal \
+ ../../monetdb5/extras/rapi \
+ ../../gdk \
+ ../../common/stream \
+ ../../common/utils \
+ ../../common/options \
+ ../../clients/mapilib \
+ ../../sql/include \
+ ../../sql/server \
+ ../../sql/common \
+ ../../sql/storage \
+ ../../sql/storage/bat \
+ ../../sql/backends/monet5 \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/darwin \
-I"/Library/Frameworks/R.framework/Resources/include" \
@@ -45,7 +45,7 @@ lib_embedded_java = {
VERSION = 0.1
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
- ../embedded \
+ ../../tools/embedded/libembedded \
$(pcre_LIBS) $(PSAPILIB) \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(DL_LIBS) $(PTHREAD_LIBS)
}
diff --git a/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
rename from tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
rename to java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
--- a/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.c
+++ b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
@@ -9,6 +9,7 @@
#include "org_monetdb_embedded_MonetDBEmbedded.h"
#include "embedded.h"
+#include "monetdb_config.h"
#include "res_table.h"
#include "mal_type.h"
diff --git a/tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.h
b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
rename from tools/embedded/java-package/org_monetdb_embedded_MonetDBEmbedded.h
rename to java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
diff --git
a/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
rename from
tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
rename to java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
---
a/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.c
+++ b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
@@ -9,6 +9,7 @@
#include "org_monetdb_embedded_result_EmbeddedQueryResult.h"
#include "embedded.h"
+#include "monetdb_config.h"
#include "res_table.h"
jobject JNICALL
Java_org_monetdb_embedded_result_EmbeddedQueryResult_getColumnWrapper
diff --git
a/tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.h
b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.h
rename from
tools/embedded/java-package/org_monetdb_embedded_result_EmbeddedQueryResult.h
rename to java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.h
diff --git a/tools/embedded/java-package/pom.xml b/java/embedded/pom.xml
rename from tools/embedded/java-package/pom.xml
rename to java/embedded/pom.xml
diff --git
a/tools/embedded/java-package/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
rename from
tools/embedded/java-package/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
rename to java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
diff --git
a/tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
rename from
tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
rename to
java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
diff --git
a/tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/column/Column.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
rename from
tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/column/Column.java
rename to
java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
diff --git
a/tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
rename from
tools/embedded/java-package/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
rename to
java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
diff --git a/tools/embedded/java-package/target/apidocs/allclasses-frame.html
b/java/embedded/target/apidocs/allclasses-frame.html
rename from tools/embedded/java-package/target/apidocs/allclasses-frame.html
rename to java/embedded/target/apidocs/allclasses-frame.html
diff --git a/tools/embedded/java-package/target/apidocs/allclasses-noframe.html
b/java/embedded/target/apidocs/allclasses-noframe.html
rename from tools/embedded/java-package/target/apidocs/allclasses-noframe.html
rename to java/embedded/target/apidocs/allclasses-noframe.html
diff --git a/tools/embedded/java-package/target/apidocs/constant-values.html
b/java/embedded/target/apidocs/constant-values.html
rename from tools/embedded/java-package/target/apidocs/constant-values.html
rename to java/embedded/target/apidocs/constant-values.html
diff --git a/tools/embedded/java-package/target/apidocs/deprecated-list.html
b/java/embedded/target/apidocs/deprecated-list.html
rename from tools/embedded/java-package/target/apidocs/deprecated-list.html
rename to java/embedded/target/apidocs/deprecated-list.html
diff --git a/tools/embedded/java-package/target/apidocs/help-doc.html
b/java/embedded/target/apidocs/help-doc.html
rename from tools/embedded/java-package/target/apidocs/help-doc.html
rename to java/embedded/target/apidocs/help-doc.html
diff --git a/tools/embedded/java-package/target/apidocs/index-all.html
b/java/embedded/target/apidocs/index-all.html
rename from tools/embedded/java-package/target/apidocs/index-all.html
rename to java/embedded/target/apidocs/index-all.html
diff --git a/tools/embedded/java-package/target/apidocs/index.html
b/java/embedded/target/apidocs/index.html
rename from tools/embedded/java-package/target/apidocs/index.html
rename to java/embedded/target/apidocs/index.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/MonetDBEmbedded.html
b/java/embedded/target/apidocs/org/monetdb/embedded/MonetDBEmbedded.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/MonetDBEmbedded.html
rename to java/embedded/target/apidocs/org/monetdb/embedded/MonetDBEmbedded.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/class-use/MonetDBEmbedded.html
b/java/embedded/target/apidocs/org/monetdb/embedded/class-use/MonetDBEmbedded.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/class-use/MonetDBEmbedded.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/class-use/MonetDBEmbedded.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-frame.html
b/java/embedded/target/apidocs/org/monetdb/embedded/package-frame.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-frame.html
rename to java/embedded/target/apidocs/org/monetdb/embedded/package-frame.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-summary.html
b/java/embedded/target/apidocs/org/monetdb/embedded/package-summary.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-summary.html
rename to java/embedded/target/apidocs/org/monetdb/embedded/package-summary.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-tree.html
b/java/embedded/target/apidocs/org/monetdb/embedded/package-tree.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-tree.html
rename to java/embedded/target/apidocs/org/monetdb/embedded/package-tree.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-use.html
b/java/embedded/target/apidocs/org/monetdb/embedded/package-use.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/package-use.html
rename to java/embedded/target/apidocs/org/monetdb/embedded/package-use.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/EmbeddedQueryResult.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/EmbeddedQueryResult.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/EmbeddedQueryResult.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/EmbeddedQueryResult.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/QueryResult.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/QueryResult.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/QueryResult.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/QueryResult.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/Result.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/Result.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/Result.html
rename to java/embedded/target/apidocs/org/monetdb/embedded/result/Result.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/EmbeddedQueryResult.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/EmbeddedQueryResult.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/EmbeddedQueryResult.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/EmbeddedQueryResult.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/QueryResult.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/QueryResult.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/QueryResult.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/QueryResult.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/Result.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/Result.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/class-use/Result.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/class-use/Result.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/Column.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/Column.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/Column.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/Column.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/IntegerColumn.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/IntegerColumn.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/IntegerColumn.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/IntegerColumn.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/class-use/Column.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/class-use/Column.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/class-use/Column.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/class-use/Column.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/class-use/IntegerColumn.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/class-use/IntegerColumn.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/class-use/IntegerColumn.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/class-use/IntegerColumn.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-frame.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-frame.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-frame.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-frame.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-summary.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-summary.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-summary.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-summary.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-tree.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-tree.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-tree.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-tree.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-use.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-use.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/column/package-use.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/column/package-use.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-frame.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/package-frame.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-frame.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/package-frame.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-summary.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/package-summary.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-summary.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/package-summary.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-tree.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/package-tree.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-tree.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/package-tree.html
diff --git
a/tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-use.html
b/java/embedded/target/apidocs/org/monetdb/embedded/result/package-use.html
rename from
tools/embedded/java-package/target/apidocs/org/monetdb/embedded/result/package-use.html
rename to
java/embedded/target/apidocs/org/monetdb/embedded/result/package-use.html
diff --git a/tools/embedded/java-package/target/apidocs/overview-frame.html
b/java/embedded/target/apidocs/overview-frame.html
rename from tools/embedded/java-package/target/apidocs/overview-frame.html
rename to java/embedded/target/apidocs/overview-frame.html
diff --git a/tools/embedded/java-package/target/apidocs/overview-summary.html
b/java/embedded/target/apidocs/overview-summary.html
rename from tools/embedded/java-package/target/apidocs/overview-summary.html
rename to java/embedded/target/apidocs/overview-summary.html
diff --git a/tools/embedded/java-package/target/apidocs/overview-tree.html
b/java/embedded/target/apidocs/overview-tree.html
rename from tools/embedded/java-package/target/apidocs/overview-tree.html
rename to java/embedded/target/apidocs/overview-tree.html
diff --git a/tools/embedded/java-package/target/apidocs/package-list
b/java/embedded/target/apidocs/package-list
rename from tools/embedded/java-package/target/apidocs/package-list
rename to java/embedded/target/apidocs/package-list
diff --git a/tools/embedded/java-package/target/apidocs/script.js
b/java/embedded/target/apidocs/script.js
rename from tools/embedded/java-package/target/apidocs/script.js
rename to java/embedded/target/apidocs/script.js
diff --git a/tools/embedded/java-package/target/apidocs/stylesheet.css
b/java/embedded/target/apidocs/stylesheet.css
rename from tools/embedded/java-package/target/apidocs/stylesheet.css
rename to java/embedded/target/apidocs/stylesheet.css
diff --git a/tools/embedded/java-package/target/classes/META-INF/MANIFEST.MF
b/java/embedded/target/classes/META-INF/MANIFEST.MF
rename from tools/embedded/java-package/target/classes/META-INF/MANIFEST.MF
rename to java/embedded/target/classes/META-INF/MANIFEST.MF
diff --git
a/tools/embedded/java-package/target/classes/META-INF/maven/org.monetdb/monetdb-embedded/pom.xml
b/java/embedded/target/classes/META-INF/maven/org.monetdb/monetdb-embedded/pom.xml
rename from
tools/embedded/java-package/target/classes/META-INF/maven/org.monetdb/monetdb-embedded/pom.xml
rename to
java/embedded/target/classes/META-INF/maven/org.monetdb/monetdb-embedded/pom.xml
diff --git
a/tools/embedded/java-package/target/classes/org_monetdb_embedded_MonetDBEmbedded.h
b/java/embedded/target/classes/org_monetdb_embedded_MonetDBEmbedded.h
rename from
tools/embedded/java-package/target/classes/org_monetdb_embedded_MonetDBEmbedded.h
rename to java/embedded/target/classes/org_monetdb_embedded_MonetDBEmbedded.h
diff --git
a/tools/embedded/java-package/target/classes/org_monetdb_embedded_result_EmbeddedQueryResult.h
b/java/embedded/target/classes/org_monetdb_embedded_result_EmbeddedQueryResult.h
rename from
tools/embedded/java-package/target/classes/org_monetdb_embedded_result_EmbeddedQueryResult.h
rename to
java/embedded/target/classes/org_monetdb_embedded_result_EmbeddedQueryResult.h
diff --git
a/tools/embedded/java-package/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml
b/java/embedded/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml
rename from
tools/embedded/java-package/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml
rename to
java/embedded/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml
diff --git
a/tools/embedded/java-package/target/javadoc-bundle-options/package-list
b/java/embedded/target/javadoc-bundle-options/package-list
rename from
tools/embedded/java-package/target/javadoc-bundle-options/package-list
rename to java/embedded/target/javadoc-bundle-options/package-list
diff --git
a/tools/embedded/java-package/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
b/java/embedded/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
rename from
tools/embedded/java-package/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
rename to
java/embedded/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
diff --git
a/tools/embedded/java-package/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
b/java/embedded/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
rename from
tools/embedded/java-package/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
rename to
java/embedded/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
diff --git a/tools/embedded/Makefile.ag b/tools/embedded/Makefile.ag
--- a/tools/embedded/Makefile.ag
+++ b/tools/embedded/Makefile.ag
@@ -17,8 +17,6 @@
MTSAFE
-SUBDIRS = HAVE_JAVA?java-package
-
INCLUDES = ../../monetdb5/mal \
../../monetdb5/modules/atoms \
../../monetdb5/modules/mal \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
