updates for nightly build
diff --git a/antbuild.xml b/antbuild.xml
new file mode 100644
index 0000000..ab0a0e5
--- /dev/null
+++ b/antbuild.xml
@@ -0,0 +1,312 @@
+<!--/*******************************************************************************
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+* which accompanies this distribution.
+* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+* and the Eclipse Distribution License is available at
+* http://www.eclipse.org/org/documents/edl-v10.php.
+*
+* Ant naming conventions:
+* - regardless of the actual OS platform,'/' is the directory separator
+* (Ant will convert as appropriate).
+* - multi-word properties use periods '.'
+* - properties ending in .jar define jarfile names only (no path)
+* - properties ending in .lib are fully qualified jars (path and filename)
+* - properties ending in .dir are directory paths
+* - properties ending in .path are path refid names (classpath fragments)
+* - multi-word targets use hyphens '-'
+* - targets beginning with test- are reserved for high level test targets,
+* and are used in test results parsing
+* - targets typically use the form <action>-<object>-<type> (ie. package-bundle-zip)
+* - multi-word macros use underscores '_'
+* - multi-word macro attributes are concatinated
+* e.g. 'runpathref'
+* - multi-word tasks (taskdef) names are concatinated
+* e.g. 'validateconnection'
+* - OS environment variables are in ALLCAPS and have 'env' as a prefix
+* e.g. ${env.XXX}.
+* - Ant properties are lower case.
+*
+* Contributors:
+* egwin - initial implementation.
+#******************************************************************************/-->
+<!-- =============================================================================
+* General Comments
+* This buildfile contains:
+* - calls to the component builds to clean, compile, package and test thier bits
+* - calls to initiate component tests
+* - targets to generate the eclipselink tools installer
+* - targets to generate the javadocs
+* Used standalone it can generate Developer Builds of the entire product or subsets
+* of the product.
+*================================================================================= -->
+<!-- This ant project includes the following tasks:
+ - build (default) : compiles all components and tests
+ - clean : removes all build generated files
+ - build-distribution : compiles and packages all jars, javadocs, installer
+ - build-javadocs : generates Javadocs
+ - package-installer-zip : builds installer
+ - test-srg : runs all Short ReGression test suites
+ - test-lrg : runs all Long ReGression test suites
+
+ It may require some configuration of the build.properties to run.
+ -->
+<project name="eclipselink.tools.temp" default="build" basedir=".">
+
+ <target name="build" depends="init, build-tools, build-tools-test" description="Default ant target, compiles all components and tests"/>
+ <target name="clean" depends="init, clean-tools, clean-tools-test" description="Cleans all build generated files."/>
+ <target name="build-distribution" depends="clean, build, build-javadocs, package-installer-zip" description="Builds all jars, generates javadoc, and builds installer."/>
+ <target name="test-srg" depends="init, test-tools-srg" description="Run the SRG test suites"/>
+ <target name="test-lrg" depends="init, test-tools" description="Run the LRG test suites"/>
+
+<!-- ================================================================================= -->
+<!-- =========================== AutoBuild Targets ================================= -->
+ <target name="set-defaults">
+ <property name="branch" value="master"/>
+
+ <condition property="git.exec" value="${env.GIT_EXEC}">
+ <isset property="env.GIT_EXEC"/>
+ </condition>
+ <property name="git.exec" value="/usr/bin/git"/>
+ <property name="build.deps.dir" value="${extensions.depend.dir}"/>
+ <property name="junit.dir" value="${build.deps.dir}/junit"/>
+ <property name="build.tool.root" value="${build.location}"/>
+ <property file="${build.tool.root}/db-${branch}.properties"/>
+ </target>
+
+ <target name="get-git-hash" unless="git.hash" depends="set-defaults">
+ <!-- get git.hash NOTE: if get fails defaulted to "NA" -->
+ <exec outputproperty="git.hash"
+ failonerror="false"
+ failifexecutionfails="false"
+ errorproperty="githash.failed"
+ logError="true"
+ executable="${git.exec}">
+ <arg value="log"/>
+ <arg value="-1"/>
+ <arg value="--format=%h"/>
+ </exec>
+ <property name="git.hash" value="NA"/>
+ </target>
+
+<!-- ================================================================================= -->
+<!-- =========================== Init Targets ====================================== -->
+ <target name="init">
+ <dirname property="tools.build.location_temp" file="${ant.file.eclipselink.tools.temp}"/>
+ <pathconvert targetos="unix" property="tools.build.location">
+ <path>
+ <pathelement location="${tools.build.location_temp}"/>
+ </path>
+ </pathconvert>
+ <echo message="tools.build.location = '${tools.build.location}'"/>
+ <echo message="java.class.path = '${java.class.path}'"/>
+ <!-- Allows a user to overide certain user specific properties. -->
+ <echo message="user.home = '${user.home}'"/>
+ <echo message="Loading user properties from: '${user.home}/build.properties'"/>
+
+ <!-- overrides, and helper variables -->
+ <property file="${user.home}/build.properties"/>
+ <condition property="extensions.depend.dir" value="${tools.build.location}/../extension.lib.external"
+ else="${tools.build.location}">
+ <available file="${tools.build.location}/../extension.lib.external" type="dir"/>
+ </condition>
+ <echo message="extensions.depend.dir= '${extensions.depend.dir}'"/>
+ <property name="tools.root" value="${tools.build.location}/tools"/>
+ <property name="tools.mvn.parent" value="${tools.root}/org.eclipse.persistence.tools.parent"/>
+ <property name="tools.prefix" value="eclipselink-tools"/>
+
+ <!-- Versioning -->
+ <!-- These variables are set in Hudson. A manual build gets defaults -->
+ <property name="git.hash" value="NA"/>
+ <tstamp>
+ <format property="build.date" pattern="yyyyMMdd"/>
+ <format property="build.time" pattern="HHmm"/>
+ </tstamp>
+ <property name="build.type" value="SNAPSHOT"/>
+ <property name="svn.revision" value="NA"/>
+ <condition property="version.qualifier" value="qualifier"
+ else="v${build.date}-${git.hash}">
+ <equals arg1="${git.hash}" arg2="NA"/>
+ </condition>
+ <property name="release.version" value="2.5.0"/>
+ <property name="version.string" value="${release.version}.${version.qualifier}"/>
+ <property name="release.designation" value="EclipseLink DeveloperBuild"/>
+
+ <!-- Javadoc properties -->
+ <property name="javadoc.title" value="EclipseLink Tools ${release.version}, build '${version.qualifier}' API Reference"/>
+ <property name="javadoc.dir" value="${tools.build.location}/tools/target/javadoc"/>
+ <path id="javadoc.path">
+ <pathelement path="${some.jar}"/>
+ </path>
+ </target>
+
+ <!-- Needed for Maven/Tycho builds -->
+ <target name="check-maven" description="Verify the Maven tool is installed and configured">
+ <condition property="M2_HOME" value="${env.M2_HOME}"
+ else="D:/apache-maven-3.0.4">
+ <isset property="env.M2_HOME"/>
+ </condition>
+ <echo message="Maven install (M2_HOME) set to: '${M2_HOME}'"/>
+ <available file="${M2_HOME}/bin/mvn" property="use.maven"/>
+ <fail message="Maven 3 not found. Build won't run if Maven 3 not installed and M2_HOME properly set!." unless="use.maven"/>
+ </target>
+
+<!-- ================================================================================= -->
+<!-- =========================== Clean Targets ===================================== -->
+ <target name="clean-tools" depends="check-maven" description="Clean the maven built runtime projects">
+ <java dir="${tools.mvn.parent}" fork="true" failonerror="true" classname="org.codehaus.plexus.classworlds.launcher.Launcher">
+ <jvmarg value="-Dclassworlds.conf=${M2_HOME}/bin/m2.conf"/>
+ <jvmarg value="-Dmaven.home=${M2_HOME}"/>
+ <jvmarg value="-Dbuild.qualifier=${version.qualifier}"/>
+ <arg value="clean"/>
+ <classpath>
+ <fileset dir="${M2_HOME}/boot">
+ <include name="plexus-classworlds-*.jar"/>
+ </fileset>
+ </classpath>
+ </java>
+ <echo message="Deleting: '${tools.root}/target/**/*'"/>
+ <delete failonerror="false">
+ <fileset dir="${tools.root}/target">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <echo message="Deleting old archives: '${tools.build.location}/${tools.prefix}*.zip'"/>
+ <delete failonerror="false">
+ <fileset dir="${tools.build.location}">
+ <include name="${tools.prefix}*.zip"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="clean-tools-test" description="Clean the testing projects">
+ <echo message="clean-tools-test"/>
+ <!-- ant antfile="antbuild.xml" dir="" target="clean"/>
+ <delete file="${eclipselink.tst.src.prefix}${eclipselink.zip.suffix}" failonerror="false"/ -->
+ </target>
+
+<!-- ================================================================================= -->
+<!-- =========================== Build Targets ===================================== -->
+ <!-- Compiles all runtime components (excluding Tests, Oracle extensions). -->
+ <target name="build-tools" depends="check-maven">
+ <echo message="Launching Maven build with the following parameters:"/>
+ <echo message=" -Dclassworlds.conf=${M2_HOME}/bin/m2.conf"/>
+ <echo message=" -Dmaven.home=${M2_HOME}"/>
+ <echo message=" -Dbuild.qualifier=${version.qualifier}"/>
+ <echo message=" -DforceContextQualifier=${version.qualifier}"/>
+ <echo message=" verify"/>
+ <java dir="${tools.mvn.parent}" fork="true" failonerror="true" classname="org.codehaus.plexus.classworlds.launcher.Launcher">
+ <jvmarg value="-Dclassworlds.conf=${M2_HOME}/bin/m2.conf"/>
+ <jvmarg value="-Dmaven.home=${M2_HOME}"/>
+ <jvmarg value="-Dbuild.qualifier=${version.qualifier}"/>
+ <jvmarg value="-DforceContextQualifier=${version.qualifier}"/>
+ <!-- arg value="-X"/ -->
+ <arg value="verify"/>
+ <classpath>
+ <fileset dir="${M2_HOME}/boot">
+ <include name="plexus-classworlds-*.jar"/>
+ </fileset>
+ </classpath>
+ </java>
+ </target>
+
+ <!-- Compiles tests (excluding workbench, dbws-util and Oracle extensions). -->
+ <target name="build-tools-test">
+ <echo message="build-tools-test"/>
+ <!-- ant antfile="antbuild.xml" dir="${eclipselink.core.test}" target="build"/ -->
+ </target>
+
+<!-- ================================================================================= -->
+<!-- =========================== Javadoc Targets =================================== -->
+ <target name="build-javadocs">
+ <!-- the following property needs to be here because the "qualifier" is generated at runtime -->
+ <mkdir dir="${javadoc.dir}"/>
+ <delete dir="${javadoc.dir}" failonerror="false"/>
+ <javadoc
+ maxmemory="384m"
+ Verbose="false"
+ packagenames="org.eclipse.persistence.**"
+ destdir="${javadoc.dir}"
+ useexternalfile="yes"
+ additionalparam="-breakiterator -quiet"
+ windowtitle="${javadoc.title}"
+ >
+ <classpath>
+ <path refid="javadoc.path"/>
+ </classpath>
+ <tag name ="author" enabled="true" description="Author:" />
+ <tag name ="since" scope="all" description="Since:" />
+ <tag name ="SBGen" scope="all" description="SBGen:" />
+ <tag name ="bug" enabled="true" description="Related Bugs:" />
+ <doctitle><![CDATA[${javadoc.title}]]></doctitle>
+ <header><![CDATA[${javadoc.title}]]></header>
+
+ <!-- *** EclipseLink modules *** -->
+ <fileset dir="${tools.build.location}/tools/org.eclipse.persistence.tools.gen/src" defaultexcludes="yes">
+ <include name="org/eclipse/persistence/tools/**/*.java"/>
+ <exclude name="org/eclipse/persistence/tools/internal/**/*.java"/>
+ </fileset>
+ <fileset dir="${tools.build.location}/tools/org.eclipse.persistence.tools.gen.db/src" defaultexcludes="yes">
+ <include name="org/eclipse/persistence/tools/**/*.java"/>
+ <exclude name="org/eclipse/persistence/tools/internal/**/*.java"/>
+ </fileset>
+ <fileset dir="${tools.build.location}/tools/org.eclipse.persistence.tools.mapping/src" defaultexcludes="yes">
+ <include name="org/eclipse/persistence/tools/**/*.java"/>
+ <exclude name="org/eclipse/persistence/tools/internal/**/*.java"/>
+ </fileset>
+ <fileset dir="${tools.build.location}/tools/org.eclipse.persistence.tools.utility/src" defaultexcludes="yes">
+ <include name="org/eclipse/persistence/tools/**/*.java"/>
+ <exclude name="org/eclipse/persistence/tools/internal/**/*.java"/>
+ </fileset>
+ </javadoc>
+ </target>
+
+<!-- ================================================================================= -->
+<!-- =========================== Package Targets =================================== -->
+ <!-- Packages javadoc into a zip. -->
+ <target name="package-javadoc-zip" depends="build-javadocs" description="build EclipseLink javadoc zip">
+ <delete file="${tools.prefix}-javadoc-${version.string}.zip" failonerror="false"/>
+ <zip destfile="${tools.prefix}-javadoc-${version.string}.zip">
+ <!-- miscellaneous files -->
+ <zipfileset dir="${javadocs.dir}/"/>
+ </zip>
+ </target>
+
+ <!-- Packages the installer zip. -->
+ <target name="package-installer-zip" description="build EclipseLink Tools Installer zip">
+ <delete file="${tools.prefix}-${version.string}.zip" failonerror="false"/>
+ <zip destfile="${tools.prefix}-${version.string}.zip">
+ <!-- miscellaneous files -->
+ <zipfileset dir="${tools.mvn.parent}/resource">
+ <include name="*.html"/>
+ </zipfileset>
+ <zipfileset dir=".">
+ <include name="eclipselink-tools-javadoc-${version.string}.zip"/>
+ </zipfileset>
+ <!-- Library bundles -->
+ <zipfileset dir="${tools.root}/target">
+ <include name="*.jar"/>
+ <exclude name="*.test*"/>
+ <exclude name="*.parent*"/>
+ </zipfileset>
+ <!-- Testing bundles -->
+ <zipfileset dir="${tools.root}/target" prefix="testing">
+ <include name="*.test*"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+<!-- ================================================================================= -->
+<!-- =========================== Test Targets ====================================== -->
+ <!-- Run core LRG. -->
+ <target name="test-tools" description="run the LRG tests">
+ <echo message="test-tools (LRG run)"/>
+ <!-- ant antfile="antbuild.xml" dir="${eclipselink.core.test}" target="test"/ -->
+ </target>
+ <!-- Run core SRG. -->
+ <target name="test-tools-srg" description="run the SRG tests">
+ <echo message="test-tools-srg (SRG run)"/>
+ <!-- ant antfile="antbuild.xml" dir="${eclipselink.core.test}" target="test-srg"/ -->
+ </target>
+
+</project>
diff --git a/tools/org.eclipse.persistence.tools.parent/pom.xml b/tools/org.eclipse.persistence.tools.parent/pom.xml
index 5a76120..524ebfa 100644
--- a/tools/org.eclipse.persistence.tools.parent/pom.xml
+++ b/tools/org.eclipse.persistence.tools.parent/pom.xml
@@ -41,6 +41,7 @@
<module>../org.eclipse.persistence.tools.gen</module>
<module>../org.eclipse.persistence.tools.gen.db</module>
<module>../org.eclipse.persistence.tools.mapping</module>
+ <!-- module>../org.eclipse.persistence.tools.utility.tests</module -->
</modules>
<profiles>
diff --git a/tools/org.eclipse.persistence.tools.utility.tests/.settings/org.eclipse.jdt.core.prefs b/tools/org.eclipse.persistence.tools.utility.tests/.settings/org.eclipse.jdt.core.prefs
index 0321586..8000cd6 100644
--- a/tools/org.eclipse.persistence.tools.utility.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tools/org.eclipse.persistence.tools.utility.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,11 @@
-#Tue Mar 08 12:06:57 EST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
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=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tools/org.eclipse.persistence.tools.utility.tests/META-INF/MANIFEST.MF b/tools/org.eclipse.persistence.tools.utility.tests/META-INF/MANIFEST.MF
index 965c232..abf04fe 100644
--- a/tools/org.eclipse.persistence.tools.utility.tests/META-INF/MANIFEST.MF
+++ b/tools/org.eclipse.persistence.tools.utility.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.common.utility..tests
+Bundle-SymbolicName: org.eclipse.persistence.tools.utility.tests
Bundle-Version: 2.5.0.qualifier
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.6
Require-Bundle: org.eclipse.persistence.tools.utility;bundle-version="[2.5.0,2.6.0)",
org.junit;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.persistence.tools.utility.tests.internal;x-internal:=true,
@@ -17,3 +15,5 @@
org.eclipse.persistence.tools.utility.tests.internal.model.listener;x-internal:=true,
org.eclipse.persistence.tools.utility.tests.internal.node;x-internal:=true,
org.eclipse.persistence.tools.utility.tests.internal.synchronizers;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tools/org.eclipse.persistence.tools.utility.tests/build.properties b/tools/org.eclipse.persistence.tools.utility.tests/build.properties
new file mode 100644
index 0000000..ec21824
--- /dev/null
+++ b/tools/org.eclipse.persistence.tools.utility.tests/build.properties
@@ -0,0 +1,4 @@
+bin.includes = .,\
+ META-INF/
+source.. = src/,\
+ resource/
diff --git a/tools/org.eclipse.persistence.tools.utility.tests/pom.xml b/tools/org.eclipse.persistence.tools.utility.tests/pom.xml
new file mode 100644
index 0000000..3eb6520
--- /dev/null
+++ b/tools/org.eclipse.persistence.tools.utility.tests/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>EclipseLink Tools Utility Tests</name>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.tools.utility.tests</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <artifactId>org.eclipse.persistence.tools.parent</artifactId>
+ <groupId>org.eclipse.persistence</groupId>
+ <version>2.5.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.persistence.tools.parent/pom.xml</relativePath>
+ </parent>
+
+</project>
