diff --git a/.classpath b/.classpath index 7b2786cf5..4f067bbc5 100644 --- a/.classpath +++ b/.classpath @@ -1,11 +1,5 @@ - - - - - - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ebbbd5fe9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.classpath +/.project +/.settings diff --git a/.project b/.project index 534e2fa4e..4f98022b5 100644 --- a/.project +++ b/.project @@ -15,11 +15,11 @@ clean,full,incremental, - org.eclipse.cdt.make.core.build.arguments - -e /bin/make + org.eclipse.cdt.core.errorOutputParser + org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.VCErrorParser; - org.eclipse.cdt.make.core.enableCleanBuild + org.eclipse.cdt.make.core.append_environment true @@ -27,84 +27,84 @@ all - org.eclipse.cdt.make.core.build.location - \org.postgresql.pljava + org.eclipse.cdt.make.core.build.arguments + -e /bin/make - org.eclipse.cdt.make.core.buildCommand - c:/msys/1.0/bin/make + org.eclipse.cdt.make.core.build.command + c:/msys/bin/rxvt - org.eclipse.cdt.make.core.environment - JAVA_HOME=C:/Progra~1/Java/jdk1.5.0_06| + org.eclipse.cdt.make.core.build.location + \org.postgresql.pljava - org.eclipse.cdt.make.core.incrementalBuildTarget + org.eclipse.cdt.make.core.build.target.auto all - org.eclipse.cdt.make.core.fullBuildTarget - clean all + org.eclipse.cdt.make.core.build.target.clean + clean - org.eclipse.cdt.make.core.build.target.auto - all + org.eclipse.cdt.make.core.build.target.full + clean all - org.eclipse.cdt.make.core.enableFullBuild - true + org.eclipse.cdt.make.core.build.target.inc + all - org.eclipse.cdt.make.core.append_environment - true + org.eclipse.cdt.make.core.buildArguments + - org.eclipse.cdt.make.core.stopOnError - false + org.eclipse.cdt.make.core.buildCommand + c:/msys/1.0/bin/make - org.eclipse.cdt.make.core.build.target.full - clean all + org.eclipse.cdt.make.core.buildLocation + org.eclipse.cdt.make.core.cleanBuildTarget clean - org.eclipse.cdt.make.core.build.command - c:/msys/bin/rxvt + org.eclipse.cdt.make.core.enableAutoBuild + false - org.eclipse.cdt.make.core.build.target.clean - clean + org.eclipse.cdt.make.core.enableCleanBuild + true - org.eclipse.cdt.make.core.enabledIncrementalBuild + org.eclipse.cdt.make.core.enableFullBuild true - org.eclipse.cdt.core.errorOutputParser - org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.VCErrorParser; + org.eclipse.cdt.make.core.enabledIncrementalBuild + true - org.eclipse.cdt.make.core.buildLocation - + org.eclipse.cdt.make.core.environment + JAVA_HOME=C:/Progra~1/Java/jdk1.5.0_06| - org.eclipse.cdt.make.core.enableAutoBuild - false + org.eclipse.cdt.make.core.fullBuildTarget + clean all - org.eclipse.cdt.make.core.useDefaultBuildCmd - true + org.eclipse.cdt.make.core.incrementalBuildTarget + all - org.eclipse.cdt.make.core.buildArguments - + org.eclipse.cdt.make.core.stopOnError + false - org.eclipse.cdt.make.core.build.target.inc - all + org.eclipse.cdt.make.core.useDefaultBuildCmd + true @@ -117,8 +117,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.cdt.core.cnature org.eclipse.cdt.make.core.makeNature diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs deleted file mode 100644 index 41aa2ac57..000000000 --- a/.settings/org.eclipse.cdt.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri May 19 16:01:32 CEST 2006 -eclipse.preferences.version=1 -indexerId=org.eclipse.cdt.core.fastIndexer diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index dbabbccf9..000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Fri Feb 11 14:44:25 CET 2005 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.4 diff --git a/pljava-ant/.gitignore b/pljava-ant/.gitignore new file mode 100644 index 000000000..4e247eee2 --- /dev/null +++ b/pljava-ant/.gitignore @@ -0,0 +1,4 @@ +/.settings +/target +/.classpath +/.project diff --git a/pljava-ant/pom.xml b/pljava-ant/pom.xml new file mode 100644 index 000000000..3397cd4d4 --- /dev/null +++ b/pljava-ant/pom.xml @@ -0,0 +1,19 @@ + + 4.0.0 + + org.postgresql + pljava.app + 0.0.1-SNAPSHOT + + pljava-ant + pl/java Ant Tasks + Ant tasks for pl/java + + + org.apache.ant + ant + 1.7.0 + + + \ No newline at end of file diff --git a/src/java/tasks/org/postgresql/pljava/tasks/JarLoaderTask.java b/pljava-ant/src/main/java/org/postgresql/pljava/tasks/JarLoaderTask.java similarity index 100% rename from src/java/tasks/org/postgresql/pljava/tasks/JarLoaderTask.java rename to pljava-ant/src/main/java/org/postgresql/pljava/tasks/JarLoaderTask.java diff --git a/src/java/tasks/org/postgresql/pljava/tasks/PLJavaTask.java b/pljava-ant/src/main/java/org/postgresql/pljava/tasks/PLJavaTask.java similarity index 100% rename from src/java/tasks/org/postgresql/pljava/tasks/PLJavaTask.java rename to pljava-ant/src/main/java/org/postgresql/pljava/tasks/PLJavaTask.java diff --git a/pljava-api/.gitignore b/pljava-api/.gitignore new file mode 100644 index 000000000..4e247eee2 --- /dev/null +++ b/pljava-api/.gitignore @@ -0,0 +1,4 @@ +/.settings +/target +/.classpath +/.project diff --git a/pljava-api/pom.xml b/pljava-api/pom.xml new file mode 100644 index 000000000..9d4cd9e92 --- /dev/null +++ b/pljava-api/pom.xml @@ -0,0 +1,12 @@ + + 4.0.0 + + org.postgresql + pljava.app + 0.0.1-SNAPSHOT + + pljava-api + PL/JAVA API + The api for Java stored procedures + \ No newline at end of file diff --git a/src/java/pljava/org/postgresql/pljava/ObjectPool.java b/pljava-api/src/main/java/org/postgresql/pljava/ObjectPool.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/ObjectPool.java rename to pljava-api/src/main/java/org/postgresql/pljava/ObjectPool.java diff --git a/src/java/pljava/org/postgresql/pljava/PooledObject.java b/pljava-api/src/main/java/org/postgresql/pljava/PooledObject.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/PooledObject.java rename to pljava-api/src/main/java/org/postgresql/pljava/PooledObject.java diff --git a/src/java/pljava/org/postgresql/pljava/ResultSetHandle.java b/pljava-api/src/main/java/org/postgresql/pljava/ResultSetHandle.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/ResultSetHandle.java rename to pljava-api/src/main/java/org/postgresql/pljava/ResultSetHandle.java diff --git a/src/java/pljava/org/postgresql/pljava/ResultSetProvider.java b/pljava-api/src/main/java/org/postgresql/pljava/ResultSetProvider.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/ResultSetProvider.java rename to pljava-api/src/main/java/org/postgresql/pljava/ResultSetProvider.java diff --git a/src/java/pljava/org/postgresql/pljava/SavepointListener.java b/pljava-api/src/main/java/org/postgresql/pljava/SavepointListener.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/SavepointListener.java rename to pljava-api/src/main/java/org/postgresql/pljava/SavepointListener.java diff --git a/src/java/pljava/org/postgresql/pljava/Session.java b/pljava-api/src/main/java/org/postgresql/pljava/Session.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/Session.java rename to pljava-api/src/main/java/org/postgresql/pljava/Session.java diff --git a/src/java/pljava/org/postgresql/pljava/SessionManager.java b/pljava-api/src/main/java/org/postgresql/pljava/SessionManager.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/SessionManager.java rename to pljava-api/src/main/java/org/postgresql/pljava/SessionManager.java diff --git a/src/java/pljava/org/postgresql/pljava/TransactionListener.java b/pljava-api/src/main/java/org/postgresql/pljava/TransactionListener.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/TransactionListener.java rename to pljava-api/src/main/java/org/postgresql/pljava/TransactionListener.java diff --git a/src/java/pljava/org/postgresql/pljava/TriggerData.java b/pljava-api/src/main/java/org/postgresql/pljava/TriggerData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/TriggerData.java rename to pljava-api/src/main/java/org/postgresql/pljava/TriggerData.java diff --git a/src/java/pljava/org/postgresql/pljava/TriggerException.java b/pljava-api/src/main/java/org/postgresql/pljava/TriggerException.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/TriggerException.java rename to pljava-api/src/main/java/org/postgresql/pljava/TriggerException.java diff --git a/pljava-deploy/.gitignore b/pljava-deploy/.gitignore new file mode 100644 index 000000000..4e247eee2 --- /dev/null +++ b/pljava-deploy/.gitignore @@ -0,0 +1,4 @@ +/.settings +/target +/.classpath +/.project diff --git a/pljava-deploy/pom.xml b/pljava-deploy/pom.xml new file mode 100644 index 000000000..8e5570c52 --- /dev/null +++ b/pljava-deploy/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + + org.postgresql + pljava.app + 0.0.1-SNAPSHOT + + pljava-deploy + pl/java deploy + pl/java deployment utility + + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + org.postgresql.pljava.deploy.Deployer + + + + + + + \ No newline at end of file diff --git a/src/java/deploy/org/postgresql/pljava/deploy/Deployer.java b/pljava-deploy/src/main/java/org/postgresql/pljava/deploy/Deployer.java similarity index 100% rename from src/java/deploy/org/postgresql/pljava/deploy/Deployer.java rename to pljava-deploy/src/main/java/org/postgresql/pljava/deploy/Deployer.java diff --git a/pljava-examples/.gitignore b/pljava-examples/.gitignore new file mode 100644 index 000000000..4e247eee2 --- /dev/null +++ b/pljava-examples/.gitignore @@ -0,0 +1,4 @@ +/.settings +/target +/.classpath +/.project diff --git a/pljava-examples/pom.xml b/pljava-examples/pom.xml new file mode 100644 index 000000000..9d628e389 --- /dev/null +++ b/pljava-examples/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + + org.postgresql + pljava.app + 0.0.1-SNAPSHOT + + pljava-examples + pl/java examples + Examples of java stored procedures + + + org.postgresql + pljava-api + 0.0.1-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + \ No newline at end of file diff --git a/src/java/examples/org/postgresql/pljava/example/AnyTest.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/AnyTest.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/AnyTest.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/AnyTest.java diff --git a/src/java/examples/org/postgresql/pljava/example/BinaryColumnTest.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/BinaryColumnTest.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/BinaryColumnTest.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/BinaryColumnTest.java diff --git a/src/java/examples/org/postgresql/pljava/example/ComplexScalar.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/ComplexScalar.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/ComplexScalar.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/ComplexScalar.java diff --git a/src/java/examples/org/postgresql/pljava/example/ComplexTuple.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/ComplexTuple.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/ComplexTuple.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/ComplexTuple.java diff --git a/src/java/examples/org/postgresql/pljava/example/HugeResultSet.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/HugeResultSet.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/HugeResultSet.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/HugeResultSet.java diff --git a/src/java/examples/org/postgresql/pljava/example/LoggerTest.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/LoggerTest.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/LoggerTest.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/LoggerTest.java diff --git a/src/java/examples/org/postgresql/pljava/example/MetaDataBooleans.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataBooleans.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/MetaDataBooleans.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataBooleans.java diff --git a/src/java/examples/org/postgresql/pljava/example/MetaDataInts.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataInts.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/MetaDataInts.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataInts.java diff --git a/src/java/examples/org/postgresql/pljava/example/MetaDataStrings.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataStrings.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/MetaDataStrings.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataStrings.java diff --git a/src/java/examples/org/postgresql/pljava/example/MetaDataTest.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataTest.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/MetaDataTest.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/MetaDataTest.java diff --git a/src/java/examples/org/postgresql/pljava/example/Parameters.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/Parameters.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/Parameters.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/Parameters.java diff --git a/src/java/examples/org/postgresql/pljava/example/Point.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/Point.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/Point.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/Point.java diff --git a/src/java/examples/org/postgresql/pljava/example/RandomInts.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/RandomInts.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/RandomInts.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/RandomInts.java diff --git a/src/java/examples/org/postgresql/pljava/example/ResultSetTest.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/ResultSetTest.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/ResultSetTest.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/ResultSetTest.java diff --git a/src/java/examples/org/postgresql/pljava/example/SPIActions.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/SPIActions.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/SPIActions.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/SPIActions.java diff --git a/src/java/examples/org/postgresql/pljava/example/Security.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/Security.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/Security.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/Security.java diff --git a/src/java/examples/org/postgresql/pljava/example/SetOfRecordTest.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/SetOfRecordTest.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/SetOfRecordTest.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/SetOfRecordTest.java diff --git a/src/java/examples/org/postgresql/pljava/example/Threads.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/Threads.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/Threads.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/Threads.java diff --git a/src/java/examples/org/postgresql/pljava/example/Triggers.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/Triggers.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/Triggers.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/Triggers.java diff --git a/src/java/examples/org/postgresql/pljava/example/TupleReturn.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/TupleReturn.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/TupleReturn.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/TupleReturn.java diff --git a/src/java/examples/org/postgresql/pljava/example/Users.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/Users.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/Users.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/Users.java diff --git a/src/java/examples/org/postgresql/pljava/example/UsingProperties.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/UsingProperties.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/UsingProperties.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/UsingProperties.java diff --git a/src/java/examples/org/postgresql/pljava/example/UsingPropertiesAsResultSet.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/UsingPropertiesAsResultSet.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/UsingPropertiesAsResultSet.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/UsingPropertiesAsResultSet.java diff --git a/src/java/examples/org/postgresql/pljava/example/UsingPropertiesAsScalarSet.java b/pljava-examples/src/main/java/org/postgresql/pljava/example/UsingPropertiesAsScalarSet.java similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/UsingPropertiesAsScalarSet.java rename to pljava-examples/src/main/java/org/postgresql/pljava/example/UsingPropertiesAsScalarSet.java diff --git a/src/java/examples/org/postgresql/pljava/example/example.properties b/pljava-examples/src/main/java/org/postgresql/pljava/example/example.properties similarity index 100% rename from src/java/examples/org/postgresql/pljava/example/example.properties rename to pljava-examples/src/main/java/org/postgresql/pljava/example/example.properties diff --git a/src/java/examples/deployment/examples.manifest b/pljava-examples/src/main/resources/META-INF/MANIFEST.MF similarity index 73% rename from src/java/examples/deployment/examples.manifest rename to pljava-examples/src/main/resources/META-INF/MANIFEST.MF index 3719c32eb..db1b509a7 100644 --- a/src/java/examples/deployment/examples.manifest +++ b/pljava-examples/src/main/resources/META-INF/MANIFEST.MF @@ -1,4 +1,3 @@ -Manifest-Version: 1.0 Name: deployment/examples.ddr SQLJDeploymentDescriptor: TRUE diff --git a/src/java/examples/deployment/examples.ddr b/pljava-examples/src/main/resources/deployment/examples.ddr similarity index 100% rename from src/java/examples/deployment/examples.ddr rename to pljava-examples/src/main/resources/deployment/examples.ddr diff --git a/pljava/.gitignore b/pljava/.gitignore new file mode 100644 index 000000000..4e247eee2 --- /dev/null +++ b/pljava/.gitignore @@ -0,0 +1,4 @@ +/.settings +/target +/.classpath +/.project diff --git a/pljava/pom.xml b/pljava/pom.xml new file mode 100644 index 000000000..182ee7d25 --- /dev/null +++ b/pljava/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + org.postgresql + pljava.app + 0.0.1-SNAPSHOT + + pljava + pl/java implementation + Java stored procedure implementation for PostgreSQL + + + com.hellblazer + pljava-api + 0.0.1-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-shade-plugin + 1.4 + + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + + + + \ No newline at end of file diff --git a/src/java/pljava/org/postgresql/pljava/internal/AclId.java b/pljava/src/main/java/org/postgresql/pljava/internal/AclId.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/AclId.java rename to pljava/src/main/java/org/postgresql/pljava/internal/AclId.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/Backend.java b/pljava/src/main/java/org/postgresql/pljava/internal/Backend.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/Backend.java rename to pljava/src/main/java/org/postgresql/pljava/internal/Backend.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ELogFormatter.java b/pljava/src/main/java/org/postgresql/pljava/internal/ELogFormatter.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ELogFormatter.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ELogFormatter.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ELogHandler.java b/pljava/src/main/java/org/postgresql/pljava/internal/ELogHandler.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ELogHandler.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ELogHandler.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ErrorData.java b/pljava/src/main/java/org/postgresql/pljava/internal/ErrorData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ErrorData.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ErrorData.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ExecutionPlan.java b/pljava/src/main/java/org/postgresql/pljava/internal/ExecutionPlan.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ExecutionPlan.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ExecutionPlan.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/HeapTupleHeader.java b/pljava/src/main/java/org/postgresql/pljava/internal/HeapTupleHeader.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/HeapTupleHeader.java rename to pljava/src/main/java/org/postgresql/pljava/internal/HeapTupleHeader.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/JavaWrapper.java b/pljava/src/main/java/org/postgresql/pljava/internal/JavaWrapper.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/JavaWrapper.java rename to pljava/src/main/java/org/postgresql/pljava/internal/JavaWrapper.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/LargeObject.java b/pljava/src/main/java/org/postgresql/pljava/internal/LargeObject.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/LargeObject.java rename to pljava/src/main/java/org/postgresql/pljava/internal/LargeObject.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ObjectPoolImpl.java b/pljava/src/main/java/org/postgresql/pljava/internal/ObjectPoolImpl.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ObjectPoolImpl.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ObjectPoolImpl.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/Oid.java b/pljava/src/main/java/org/postgresql/pljava/internal/Oid.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/Oid.java rename to pljava/src/main/java/org/postgresql/pljava/internal/Oid.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/PgSavepoint.java b/pljava/src/main/java/org/postgresql/pljava/internal/PgSavepoint.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/PgSavepoint.java rename to pljava/src/main/java/org/postgresql/pljava/internal/PgSavepoint.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/Portal.java b/pljava/src/main/java/org/postgresql/pljava/internal/Portal.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/Portal.java rename to pljava/src/main/java/org/postgresql/pljava/internal/Portal.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/Relation.java b/pljava/src/main/java/org/postgresql/pljava/internal/Relation.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/Relation.java rename to pljava/src/main/java/org/postgresql/pljava/internal/Relation.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ResultSetPicker.java b/pljava/src/main/java/org/postgresql/pljava/internal/ResultSetPicker.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ResultSetPicker.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ResultSetPicker.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/SPI.java b/pljava/src/main/java/org/postgresql/pljava/internal/SPI.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/SPI.java rename to pljava/src/main/java/org/postgresql/pljava/internal/SPI.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/SPIException.java b/pljava/src/main/java/org/postgresql/pljava/internal/SPIException.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/SPIException.java rename to pljava/src/main/java/org/postgresql/pljava/internal/SPIException.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/ServerException.java b/pljava/src/main/java/org/postgresql/pljava/internal/ServerException.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/ServerException.java rename to pljava/src/main/java/org/postgresql/pljava/internal/ServerException.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/Session.java b/pljava/src/main/java/org/postgresql/pljava/internal/Session.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/Session.java rename to pljava/src/main/java/org/postgresql/pljava/internal/Session.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/SubXactListener.java b/pljava/src/main/java/org/postgresql/pljava/internal/SubXactListener.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/SubXactListener.java rename to pljava/src/main/java/org/postgresql/pljava/internal/SubXactListener.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/TransactionalMap.java b/pljava/src/main/java/org/postgresql/pljava/internal/TransactionalMap.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/TransactionalMap.java rename to pljava/src/main/java/org/postgresql/pljava/internal/TransactionalMap.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/TriggerData.java b/pljava/src/main/java/org/postgresql/pljava/internal/TriggerData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/TriggerData.java rename to pljava/src/main/java/org/postgresql/pljava/internal/TriggerData.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/Tuple.java b/pljava/src/main/java/org/postgresql/pljava/internal/Tuple.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/Tuple.java rename to pljava/src/main/java/org/postgresql/pljava/internal/Tuple.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/TupleDesc.java b/pljava/src/main/java/org/postgresql/pljava/internal/TupleDesc.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/TupleDesc.java rename to pljava/src/main/java/org/postgresql/pljava/internal/TupleDesc.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/TupleTable.java b/pljava/src/main/java/org/postgresql/pljava/internal/TupleTable.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/TupleTable.java rename to pljava/src/main/java/org/postgresql/pljava/internal/TupleTable.java diff --git a/src/java/pljava/org/postgresql/pljava/internal/XactListener.java b/pljava/src/main/java/org/postgresql/pljava/internal/XactListener.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/internal/XactListener.java rename to pljava/src/main/java/org/postgresql/pljava/internal/XactListener.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/AbstractResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/AbstractResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/AbstractResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/AbstractResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/AbstractResultSetMetaData.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/AbstractResultSetMetaData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/AbstractResultSetMetaData.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/AbstractResultSetMetaData.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/BlobValue.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/BlobValue.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/BlobValue.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/BlobValue.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/BuiltinFunctions.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/BuiltinFunctions.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/BuiltinFunctions.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/BuiltinFunctions.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/ClobValue.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/ClobValue.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/ClobValue.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/ClobValue.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/Invocation.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/Invocation.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/Invocation.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/Invocation.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/ObjectResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/ObjectResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/ObjectResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/ObjectResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/ReadOnlyResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/ReadOnlyResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/ReadOnlyResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/ReadOnlyResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/ResultSetBase.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/ResultSetBase.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/ResultSetBase.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/ResultSetBase.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/ResultSetField.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/ResultSetField.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/ResultSetField.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/ResultSetField.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIConnection.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIConnection.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIConnection.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIConnection.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIDatabaseMetaData.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIDatabaseMetaData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIDatabaseMetaData.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIDatabaseMetaData.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIDriver.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIDriver.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIDriver.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIDriver.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIParameterMetaData.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIParameterMetaData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIParameterMetaData.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIParameterMetaData.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIPreparedStatement.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIPreparedStatement.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIPreparedStatement.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIPreparedStatement.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIResultSetMetaData.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIResultSetMetaData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIResultSetMetaData.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIResultSetMetaData.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SPIStatement.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SPIStatement.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SPIStatement.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SPIStatement.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SQLInputFromChunk.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SQLInputFromChunk.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SQLInputFromChunk.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SQLInputFromChunk.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SQLInputFromTuple.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SQLInputFromTuple.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SQLInputFromTuple.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SQLInputFromTuple.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SQLOutputToChunk.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SQLOutputToChunk.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SQLOutputToChunk.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SQLOutputToChunk.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SQLOutputToTuple.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SQLOutputToTuple.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SQLOutputToTuple.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SQLOutputToTuple.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SQLUtils.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SQLUtils.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SQLUtils.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SQLUtils.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SingleRowReader.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SingleRowReader.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SingleRowReader.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SingleRowReader.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SingleRowResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SingleRowResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SingleRowResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SingleRowResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SingleRowWriter.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SingleRowWriter.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SingleRowWriter.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SingleRowWriter.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/StatementClosedException.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/StatementClosedException.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/StatementClosedException.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/StatementClosedException.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SyntheticResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SyntheticResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SyntheticResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SyntheticResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/SyntheticResultSetMetaData.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/SyntheticResultSetMetaData.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/SyntheticResultSetMetaData.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/SyntheticResultSetMetaData.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/TriggerResultSet.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/TriggerResultSet.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/TriggerResultSet.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/TriggerResultSet.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/TypeOid.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/TypeOid.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/TypeOid.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/TypeOid.java diff --git a/src/java/pljava/org/postgresql/pljava/jdbc/UnsupportedFeatureException.java b/pljava/src/main/java/org/postgresql/pljava/jdbc/UnsupportedFeatureException.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/jdbc/UnsupportedFeatureException.java rename to pljava/src/main/java/org/postgresql/pljava/jdbc/UnsupportedFeatureException.java diff --git a/src/java/pljava/org/postgresql/pljava/management/Commands.java b/pljava/src/main/java/org/postgresql/pljava/management/Commands.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/management/Commands.java rename to pljava/src/main/java/org/postgresql/pljava/management/Commands.java diff --git a/src/java/pljava/org/postgresql/pljava/management/SQLDeploymentDescriptor.java b/pljava/src/main/java/org/postgresql/pljava/management/SQLDeploymentDescriptor.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/management/SQLDeploymentDescriptor.java rename to pljava/src/main/java/org/postgresql/pljava/management/SQLDeploymentDescriptor.java diff --git a/src/java/pljava/org/postgresql/pljava/sqlj/EntryStreamHandler.java b/pljava/src/main/java/org/postgresql/pljava/sqlj/EntryStreamHandler.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/sqlj/EntryStreamHandler.java rename to pljava/src/main/java/org/postgresql/pljava/sqlj/EntryStreamHandler.java diff --git a/src/java/pljava/org/postgresql/pljava/sqlj/Loader.java b/pljava/src/main/java/org/postgresql/pljava/sqlj/Loader.java similarity index 100% rename from src/java/pljava/org/postgresql/pljava/sqlj/Loader.java rename to pljava/src/main/java/org/postgresql/pljava/sqlj/Loader.java diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..94c569af1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + org.postgresql + pljava.app + 0.0.1-SNAPSHOT + pom + PostgreSQL pl/java + Java stored procedures for PostgreSQL + + UTF-8 + + + pljava-api + pljava + pljava-deploy + pljava-ant + pljava-examples + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + ${project.build.sourceEncoding} + + + + + \ No newline at end of file diff --git a/src/java/deploy/META-INF/manifest.txt b/src/java/deploy/META-INF/manifest.txt deleted file mode 100644 index 78753d4f2..000000000 --- a/src/java/deploy/META-INF/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: org.postgresql.pljava.deploy.Deployer diff --git a/src/java/deploy/Makefile b/src/java/deploy/Makefile deleted file mode 100644 index 2235193e6..000000000 --- a/src/java/deploy/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) 2004, 2005, 2006 TADA AB - Taby Sweden -# Distributed under the terms shown in the file COPYRIGHT -# found in the root folder of this project or at -# http://eng.tada.se/osprojects/COPYRIGHT.html -# -# @author Thomas Hallgren -#------------------------------------------------------------------------- -NAME := deploy -JAVADOCTITLE := 'PL/Java deployer API Specification' - -include $(MODULEROOT)/Makefile.global - -all: $(JARFILE) - -$(JARFILE): .timestamp - $(JAR) cmf $(SRCDIR)/META-INF/manifest.txt $@ . diff --git a/src/java/examples/Makefile b/src/java/examples/Makefile deleted file mode 100644 index 4fcda09d8..000000000 --- a/src/java/examples/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) 2004, 2005 TADA AB - Taby Sweden -# Distributed under the terms shown in the file COPYRIGHT -# found in the root folder of this project or at -# http://eng.tada.se/osprojects/COPYRIGHT.html -# -# @author Thomas Hallgren -#------------------------------------------------------------------------- -NAME := examples -JAVADOCTITLE := 'PL/Java examples API Specification' -JAVAFLAGS := -classpath $(TARGETDIR)/classes/pljava - -include $(MODULEROOT)/Makefile.global - -all: $(JARFILE) - -$(JARFILE): .timestamp \ - $(SRCDIR)/deployment/examples.manifest \ - $(SRCDIR)/deployment/examples.ddr \ - $(SRCDIR)/org/postgresql/pljava/example/example.properties - $(JAR) cmf $(SRCDIR)/deployment/examples.manifest $@ . \ - -C $(SRCDIR) deployment/examples.ddr \ - -C $(SRCDIR) org/postgresql/pljava/example/example.properties diff --git a/src/java/pljava/Makefile b/src/java/pljava/Makefile deleted file mode 100644 index e6c1f185a..000000000 --- a/src/java/pljava/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) 2004, 2005 TADA AB - Taby Sweden -# Distributed under the terms shown in the file COPYRIGHT -# found in the root folder of this project or at -# http://eng.tada.se/osprojects/COPYRIGHT.html -# -# @author Thomas Hallgren -#------------------------------------------------------------------------- -NAME := pljava -JAVADOCTITLE := 'PL/Java v$(PLJAVA_MAJOR_VER).$(PLJAVA_MINOR_VER) API Specification' - -include $(MODULEROOT)/Makefile.global - -SRCDIR_USC := $(subst .,^,$(SRCDIR)) -mkclsrc = $(subst ^,.,$(subst .,/,$(1:%=$(SRCDIR_USC)/%^java))) -JAVAH := javah - -INTPKG := org.postgresql.pljava.internal -JDBCPKG := org.postgresql.pljava.jdbc - -JNI_CLASSES := \ - $(INTPKG).Backend \ - $(INTPKG).SPI \ - $(INTPKG).AclId \ - $(INTPKG).ErrorData \ - $(INTPKG).Oid \ - $(INTPKG).ExecutionPlan \ - $(INTPKG).JavaWrapper \ - $(INTPKG).LargeObject \ - $(INTPKG).PgSavepoint \ - $(INTPKG).Portal \ - $(INTPKG).Relation \ - $(INTPKG).Session \ - $(INTPKG).SubXactListener \ - $(INTPKG).TriggerData \ - $(INTPKG).Tuple \ - $(INTPKG).TupleDesc \ - $(INTPKG).XactListener \ - $(JDBCPKG).Invocation \ - $(JDBCPKG).SingleRowReader \ - $(JDBCPKG).SQLInputFromChunk \ - $(JDBCPKG).SQLOutputToChunk \ - $(JDBCPKG).SQLInputFromTuple \ - $(JDBCPKG).SQLOutputToTuple - -JNISRCS := $(call mkclsrc,$(JNI_CLASSES)) - -ifdef USE_GCJ -# We include both the pljava_jar.o and the pjlava.jar here although -# pljava doesn't need the latter. Most java compilers will need it -# in order to compile triggers and functions later. -# -JNIHDRS = $(patsubst %,$(JNIDIR)/%.h,$(subst .,_,$(JNI_CLASSES))) -mkcname = $(subst _,.,$(1:$(JNIDIR)/%.h=%)) - -all: $(OBJDIR)/$(NAME)_jar.o $(JARFILE) $(JNIDIR)/.timestamp - -$(OBJDIR)/$(NAME)_jar.o: .timestamp - @-mkdir -p $(@D) - @echo $(GCJ) -c -fpic -fjni -o $@ '' - @$(GCJ) -c -fpic -fjni -o $@ $(SRCS) - -# gcjh fails to clear its function name cache between files (see -# gcc bugzilla #17575) so we must do each file separately to -# avoid name ambiguities that causes names to be generated with -# parameter type info. -# -$(JNIHDRS): $(JNISRCS) - @-mkdir -p $(@D) - @gcjh -jni --classpath=. -d $(@D) $(call mkcname,$@) - -# gcjh generated headers don't define final constants (see gcc -# bugzilla #16843) so we must copy our own version of java.sql.Types. -# -$(JNIDIR)/.timestamp: $(JNIHDRS) - @-mkdir -p $(@D) - @cp $(PROJDIR)/fixes/gcj/java_sql_Types.h $(@D) - @touch $@ -else -all: $(JARFILE) $(JNIDIR)/.timestamp - -$(JNIDIR)/.timestamp: $(JNISRCS) - @-mkdir -p $(@D) - @echo javah -classpath . -d $(@D) '' - @javah -classpath . -d $(@D) $(JNI_CLASSES) java.sql.Types - @touch $@ - -endif - -$(JARFILE): .timestamp - $(JAR) cf $@ .