From 563b11ce9461e35af37cb8fe65f6b63bcc6c42cc Mon Sep 17 00:00:00 2001
From: Mohammad Rezaei <mohammad.rezaei@gs.com>
Date: Tue, 13 Sep 2016 16:37:09 -0400
Subject: [PATCH] prepare ossrh release

---
 .gitignore                                    |   5 +-
 build/build.xml                               | 368 ++++++++++++++----
 build/pom-templates/pom-mithragen.xml         |  43 --
 build/pom-templates/pom-reladomo-gen-util.xml |  66 ++++
 .../pom-templates/pom-reladomo-test-util.xml  |  66 ++++
 .../{pom-mithra.xml => pom-reladomo.xml}      |  47 ++-
 build/pom-templates/pom-reladomogen.xml       |  61 +++
 build/reladomolib.spec                        |   2 +-
 build/sign-release.bat                        |  18 +
 .../TestMithraRuntimeConfigVerifier.java      |   6 -
 .../java/com/gs/fw/JarVersionCreator.java     |   0
 11 files changed, 537 insertions(+), 145 deletions(-)
 delete mode 100644 build/pom-templates/pom-mithragen.xml
 create mode 100644 build/pom-templates/pom-reladomo-gen-util.xml
 create mode 100644 build/pom-templates/pom-reladomo-test-util.xml
 rename build/pom-templates/{pom-mithra.xml => pom-reladomo.xml} (52%)
 create mode 100644 build/pom-templates/pom-reladomogen.xml
 create mode 100644 build/sign-release.bat
 rename {reladomo => reladomogen}/src/main/java/com/gs/fw/JarVersionCreator.java (100%)

diff --git a/.gitignore b/.gitignore
index 518863e9..cd698f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,7 @@ reladomogen/target/**
 reladomogenutil/target/**
 reladomogs/target/**
 reladomogsi/target/**
-reladomoui/target/**
\ No newline at end of file
+reladomoui/target/**
+.idea/**
+reladomo.iml
+target/**
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index 90c8813a..2fadb580 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -14,7 +14,7 @@
   under the License.
   -->
 
-<project name="mithra" default="all" xmlns:jacoco="antlib:org.jacoco.ant">
+<project name="reladomo" default="all" xmlns:jacoco="antlib:org.jacoco.ant">
     <property environment="env"/>
     <property name="jdk.home" value="${env.JDK_HOME}"/>
     <property name="root" value="${env.RELADOMO_HOME}"/>
@@ -43,6 +43,10 @@
 
     <import file="${root}/build/reladomo-config.xml"/>
 
+    <fileset dir="${root}/build/lib" id="fileset.build.lib">
+        <include name="**/*.jar"/>
+    </fileset>
+
     <fileset dir="${root}/lib/test" id="fileset.lib.test">
         <include name="**/*.jar"/>
     </fileset>
@@ -152,6 +156,7 @@
     <taskdef name="xsd2bean-gen" classname="com.gs.fw.common.freyaxml.generator.ant.FreyaAntTask" loaderRef="freyaXmlGenerator"/>
 
     <target name="clean-reladomo" >
+        <delete quiet="true" dir="${root}/target"/>
         <delete quiet="true" dir="${root}/reladomo/target"/>
         <delete quiet="true" dir="${root}/reladomogen/target"/>
         <delete quiet="true" dir="${root}/reladomoui/target"/>
@@ -183,6 +188,7 @@
 
     <target name="init-reladomo" depends="determine-jdk, sanity-check-build">
         <tstamp/>
+        <mkdir dir="${root}/target"/>
         <mkdir dir="${root}/reladomo/target"/>
         <mkdir dir="${root}/reladomo/target/depend"/>
         <mkdir dir="${root}/reladomo/target/classes"/>
@@ -197,7 +203,9 @@
         <mkdir dir="${root}/reladomo/target/docbook-lib"/>
         <mkdir dir="${root}/reladomo/target/javadoc"/>
         <mkdir dir="${root}/reladomo/target/xsddoc"/>
+        <mkdir dir="${root}/reladomo/target/test-util-javadoc"/>
         <mkdir dir="${root}/reladomogen/target"/>
+        <mkdir dir="${root}/reladomogen/target/javadoc"/>
         <mkdir dir="${root}/reladomogen/target/classes"/>
         <mkdir dir="${root}/reladomogen/target/depend"/>
         <mkdir dir="${root}/reladomogenutil/target"/>
@@ -513,6 +521,21 @@
         </reladomo-graphgen>
     </target>
 
+    <target name="reladomogen-javadoc">
+        <javadoc packagenames="com.gs.fw.common.mithra.generator"
+                 sourcepath="${root}/reladomogen/src/main/java"
+                 defaultexcludes="yes"
+                 access="public"
+                 destdir="${root}/reladomogen/target/javadoc"
+                 use="true"
+                 windowtitle="Reladomo Generator User API"
+                 version="yes"
+                 Verbose="true">
+            <classpath>
+                <path refid="reladomogen.classpath"/>
+            </classpath>
+        </javadoc>
+    </target>
     <!-- ************************** /reladomogen **********************************-->
     <!-- ************************** reladomo **********************************-->
 
@@ -585,7 +608,6 @@
             includeAntRuntime="false">
             <src path="${root}/reladomo/src/main/java"/>
             <src path="${root}/reladomo/target/generated-src"/>
-            <exclude name="com/gs/fw/Jar*.java"/>
             <compilerarg line="-Xlint:-unchecked -Xlint:-deprecation -XDignore.symbol.file"/>
             <classpath>
                 <path refid="reladomo.compile.classpath"/>
@@ -613,6 +635,21 @@
         </javac>
     </target>
 
+    <target name="reladomo-test-util-javadoc">
+        <javadoc packagenames="com.gs.fw.common.mithra.test"
+                 sourcepath="${root}/reladomo/src/test-util/java"
+                 defaultexcludes="yes"
+                 access="public"
+                 destdir="${root}/reladomo/target/test-util-javadoc"
+                 use="true"
+                 windowtitle="Reladomo Test Utils User API"
+                 version="yes"
+                 Verbose="true">
+            <classpath>
+                <path refid="reladomo.test.compile.classpath"/>
+            </classpath>
+        </javadoc>
+    </target>
     <!-- ************************** /reladomo **********************************-->
     <!-- ************************** reladomo test **********************************-->
     <target name="generate-reladomo-test-classes" depends="compile-reladomo-generator">
@@ -805,7 +842,7 @@
            sourcepath="${root}/reladomo/src/main/java;${root}/reladomo/target/generatedsrc"
            defaultexcludes="yes"
            access="public"
-           destdir="${root}/reladomo/target/javvadoc"
+           destdir="${root}/reladomo/target/javadoc"
            use="true"
            windowtitle="Reladomo User API"
            version="yes"
@@ -930,7 +967,7 @@
 
     <target name="reladomo-docbook" depends="reladomo-doc-generate-html, reladomo-doc-generate-pdf"/>
 
-    <target name="generate-reladomo-docs" depends="reladomo-xsddoc, reladomo-javadoc, reladomo-docbook"/>
+    <target name="generate-reladomo-docs" depends="reladomo-xsddoc, reladomo-javadoc, reladomo-docbook, reladomo-slides"/>
 
     <property name="docbook.slides.customization.dir" value="${root}/reladomo/src/doc/docbook/presentations/customization"/>
     <property name="docbook.slides.stylesheet" value="${docbook.slides.customization.dir}/html.xsl"/>
@@ -1081,6 +1118,26 @@
         </javac>
     </target>
 
+    <target name="reladomo-gen-util-javadoc">
+        <javadoc packagenames="com.gs.fw.common.mithra,com.gs.fw.common.mithra.generator.dbgenerator.*, com.gs.fw.common.mithra.generator.objectxmlgenerator.*"
+                 sourcepath="${root}/reladomogenutil/src/main/java"
+                 defaultexcludes="yes"
+                 access="public"
+                 destdir="${root}/reladomogenutil/target/javadoc"
+                 use="true"
+                 windowtitle="Reladomo Generator Utilities"
+                 version="yes"
+                 Verbose="true">
+            <classpath>
+                <path refid="reladomogen.classpath"/>
+                <path refid="reladomo.compile.classpath"/>
+                <pathelement location="${root}/reladomo/target/classes"/>
+                <pathelement location="${root}/reladomogenutil/target/classes"/>
+                <fileset refid="fileset.build.lib"/>
+            </classpath>
+        </javadoc>
+    </target>
+
     <target name="compile-reladomo-genutil-test" depends="compile-reladomo-test">
         <dependset>
             <srcfileset dir="${root}/reladomogenutil/src/test/java"/>
@@ -1108,7 +1165,7 @@
         </javac>
     </target>
 
-    <target name="generate-reladomo-db" depends="compile-reladomo-genutil">
+    <target name="generate-reladomo-db-test" depends="compile-reladomo-genutil">
         <taskdef name="reladomo-gen-db" classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" loaderRef="mithraGeneratorDb">
            <classpath refid="reladomo.run.test.classpath"/>
         </taskdef>
@@ -1148,36 +1205,59 @@
     <!-- ************************** /reladomogenutil **********************************-->
 
     <!-- ************************** release opensource ***********************************-->
-    <target name="jar-mithragen" depends="compile-reladomo-generator">
-        <jar jarfile="${mithra.jars.dir}/mithragen-${reladomo.version}.jar" index="true">
-            <fileset dir="${mithra.home}/xml/mithra">
+    <macrodef name="generate-pom">
+        <attribute name="module" description="The name of module"/>
+        <sequential>
+            <copy file="${root}/build/pom-templates/pom-@{module}.xml"
+                  toFile="${root}/target/@{module}-${reladomo.version}.pom">
+            </copy>
+            <replace casesensitive="true" dir="${root}/target" includes="@{module}-${reladomo.version}.pom">
+                <replacefilter token="@reladomo.version@" value="${reladomo.version}"/>
+            </replace>
+        </sequential>
+    </macrodef>
+
+    <target name="jar-reladomogen" depends="compile-reladomo-generator">
+        <jar jarfile="${root}/target/reladomogen-${reladomo.version}.jar" index="true">
+            <fileset dir="${root}/reladomogen/src/main/xsd">
                 <include name="mithraobject.xsd"/>
             </fileset>
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/**/*.class"/>
-                <include name="com/gs/fw/common/mithra/templates/**/*.class"/>
-            </fileset>
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/**/*.properties"/>
-            </fileset>
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/**/*.tmpl.*"/>
-            </fileset>
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/*.md5"/>
-            </fileset>
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/**/*.ser"/>
-            </fileset>
+            <fileset dir="${root}/reladomogen/target/classes"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
+
+    <target name="jar-reladomogen-src" depends="compile-reladomo-generator">
+        <jar jarfile="${root}/target/reladomogen-${reladomo.version}-sources.jar" index="true">
+            <fileset dir="${root}/reladomogen/src/main/xsd"/>
+            <fileset dir="${root}/reladomogen/src/main/templates"/>
+            <fileset dir="${root}/reladomogen/src/main/java"/>
+            <fileset dir="${root}/reladomogen/target/generated-src"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
+
+    <target name="jar-reladomogen-javadoc" depends="reladomogen-javadoc">
+        <jar jarfile="${root}/target/reladomogen-${reladomo.version}-javadoc.jar" index="true">
+            <fileset dir="${root}/reladomogen/target/javadoc"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
         </jar>
     </target>
 
+    <target name="gen-reladomogen-pom" depends="init-reladomo">
+        <generate-pom module="reladomogen"/>
+    </target>
+
+    <target name="prep-reladomogen" depends="gen-reladomogen-pom, jar-reladomogen, jar-reladomogen-src, jar-reladomogen-javadoc"/>
+
     <target name="jar-reladomo" depends="compile-reladomo">
         <taskdef name="jar-with-version" classname="com.gs.fw.JarVersionCreator" loaderRef="jarVersionChecker">
             <classpath>
-                <pathelement location="${root}/reladomo/target/classes"/>
+                <pathelement location="${root}/reladomogen/target/classes"/>
             </classpath>
-
         </taskdef>
 
         <jar-with-version jarfile="${root}/target/reladomo-${reladomo.version}.jar" index="true" applicationName="reladomo" version="${reladomo.version}">
@@ -1187,6 +1267,8 @@
             <fileset dir="${root}/reladomo/target/classes">
                 <include name="**/*"/>
             </fileset>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
         </jar-with-version>
     </target>
 
@@ -1198,87 +1280,207 @@
             <fileset dir="${root}/reladomo/target/generated-src">
                 <include name="**/*.java"/>
             </fileset>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
         </jar>
     </target>
 
+    <target name="jar-reladomo-javadoc" depends="reladomo-javadoc, reladomo-docbook, reladomo-slides, reladomo-xsddoc">
+        <jar jarfile="${root}/target/reladomo-${reladomo.version}-javadoc.jar" index="true">
+            <fileset dir="${root}/reladomo/target/javadoc"/>
+            <fileset dir="${root}/reladomo/target/docbook"/>
+            <fileset dir="${root}/reladomo/target/xsddoc"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
+
+    <target name="gen-reladomo-pom" depends="init-reladomo">
+        <generate-pom module="reladomo"/>
+    </target>
+
+    <target name="prep-reladomo" depends="gen-reladomo-pom, jar-reladomo, jar-reladomo-src, jar-reladomo-javadoc"/>
 
-    <target name="jar-reladomo-test-util" depends="compile-reladomo-test">
+    <target name="jar-reladomo-test-util" depends="compile-reladomo-test-util">
         <jar jarfile="${root}/target/reladomo-test-util-${reladomo.version}.jar" index="true">
             <fileset dir="${root}/reladomo/target/test-util-classes">
                 <include name="**/*"/>
             </fileset>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
         </jar>
     </target>
 
+    <target name="jar-reladomo-test-util-src" depends="init-reladomo">
+        <jar jarfile="${root}/target/reladomo-test-util-${reladomo.version}-sources.jar" index="true">
+            <fileset dir="${root}/reladomo/src/test-util/java"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
 
+    <target name="jar-reladomo-test-util-javadoc" depends="reladomo-test-util-javadoc">
+        <jar jarfile="${root}/target/reladomo-test-util-${reladomo.version}-javadoc.jar" index="true">
+            <fileset dir="${root}/reladomo/target/test-util-javadoc"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
 
-    <target name="jar-all-mithra" depends="jar-reladomo, jar-mithraui, jar-mithragendb,jar-mithragenxml, jar-mithragen, jar-reladomo-test-util"/>
-    <target name="jar-all" depends="jar-all-mithra"/> <!-- alias for master build -->
-    <target name="war-all-mithra"/>
-    <target name="pom-all" depends="init-reladomo">
-        <generate-pom module="mithra"/>
-        <generate-pom module="mithragen"/>
-        <generate-pom module="mithragendb"/>
-        <generate-pom module="mithragenxml"/>
-        <generate-pom module="mithratestresource"/>
-        <generate-pom module="mithragsi"/>
-        <generate-pom module="mithraui"/>
-        <generate-pom module="mithramiddletier"/>
+    <target name="gen-reladomo-test-util-pom" depends="init-reladomo">
+        <generate-pom module="reladomo-test-util"/>
     </target>
 
-    <macrodef name="generate-pom">
-        <attribute name="module" description="The name of module"/>
-        <sequential>
-            <copy file="${mithra.pom-template.dir}/pom-@{module}.xml"
-                  tofile="${mithra.jars.dir}/pom-@{module}-${reladomo.version}${snapshot}.xml"
-                  overwrite="true"/>
-            <replace file="${mithra.jars.dir}/pom-@{module}-${reladomo.version}${snapshot}.xml">
-                <replacefilter token="@reladomo.version@"       value="${reladomo.version}${snapshot}"/>
-
-                <replacefilter token="@antjar.version@"           value="${antjar.version}"/>
-                <replacefilter token="@gs-collections.version@"   value="${gs-collections.version}"/>
-                <replacefilter token="@derby.version@"            value="${derby.version}"/>
-                <replacefilter token="@gsintegrator-api.version@" value="${gsintegrator-api.version}"/>
-                <replacefilter token="@gwt.version@"              value="${gwt.version}"/>
-                <replacefilter token="@h2.version@"               value="${h2.version}"/>
-                <replacefilter token="@log4j.version@"            value="${log4j.version}"/>
-                <replacefilter token="@jndijdbc.version@"         value="${jndijdbc.version}"/>
-                <replacefilter token="@slf4j.version@"            value="${slf4j.version}"/>
-            </replace>
-        </sequential>
-    </macrodef>
+    <target name="prep-reladomo-test-util" depends="gen-reladomo-test-util-pom, jar-reladomo-test-util, jar-reladomo-test-util-src, jar-reladomo-test-util-javadoc"/>
 
-    <target name="zip-reladomodoc" depends="reladomo-unzip-docbook, reladomo-docbook">
+    <target name="jar-reladomo-gen-util" depends="compile-reladomo-genutil">
+        <jar jarfile="${root}/target/reladomo-gen-util-${reladomo.version}.jar" index="true">
+            <fileset dir="${root}/reladomogenutil/target/classes"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
 
-        <delete file="${root}/target/reladomo-docs-${reladomo.version}.zip" failonerror="false"/>
+    <target name="jar-reladomo-gen-util-src" depends="init-reladomo">
+        <jar jarfile="${root}/target/reladomo-gen-util-${reladomo.version}-sources.jar" index="true">
+            <fileset dir="${root}/reladomogenutil/src/main/java"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
 
-        <!-- Copy documentation -->
-        <mkdir dir="${mithra.jars.dir}/mithradoc"/>
+    <target name="jar-reladomo-gen-util-javadoc" depends="reladomo-gen-util-javadoc">
+        <jar jarfile="${root}/target/reladomo-gen-util-${reladomo.version}-javadoc.jar" index="true">
+            <fileset dir="${root}/reladomogenutil/target/javadoc"/>
+            <zipfileset prefix="META-INF" file="${root}/NOTICE.txt"/>
+            <zipfileset prefix="META-INF" file="${root}/LICENSE.txt"/>
+        </jar>
+    </target>
 
-        <copy todir="${mithra.jars.dir}/mithradoc">
-            <fileset dir="${mithra.home}/build/mithra/doc" includes="**/*"/>
-        </copy>
+    <target name="gen-reladomo-gen-util-pom" depends="init-reladomo">
+        <generate-pom module="reladomo-gen-util"/>
+    </target>
 
-        <zip destfile="${root}/target/reladomo-docs-${reladomo.version}.zip">
-            <zipfileset dir="${root}/reladomo/target/docbook" includes="**/*"/>
-            <zipfileset dir="${root}/reladomo/target/javadoc" includes="**/*"/>
-            <zipfileset dir="${root}/reladomo/target/xsddoc" includes="**/*"/>
-        </zip>
+    <target name="prep-reladomo-gen-util" depends="gen-reladomo-gen-util-pom, jar-reladomo-gen-util, jar-reladomo-gen-util-src, jar-reladomo-gen-util-javadoc"/>
 
-    </target>
+    <target name="prep-release" depends="prep-reladomo, prep-reladomogen, prep-reladomo-gen-util, prep-reladomo-test-util"/>
 
-    <target name="jar-mithragendb" depends="compile-reladomo-genutil">
-        <jar jarfile="${mithra.jars.dir}/mithragendb-${reladomo.version}.jar" index="true">
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/dbgenerator/*.class"/>
+    <target name="bundle-release" >
+        <delete quiet="true" file="${root}/target/bundle-${reladomo.version}.jar"/>
+        <dependset>
+            <srcfileset dir="${root}/target">
+                <include name="reladomo-${reladomo.version}.pom"/>
+                <include name="reladomo-${reladomo.version}.jar"/>
+                <include name="reladomo-${reladomo.version}-sources.jar"/>
+                <include name="reladomo-${reladomo.version}-javadoc.jar"/>
+                <include name="reladomogen-${reladomo.version}.pom"/>
+                <include name="reladomogen-${reladomo.version}.jar"/>
+                <include name="reladomogen-${reladomo.version}-sources.jar"/>
+                <include name="reladomogen-${reladomo.version}-javadoc.jar"/>
+                <include name="reladomo-gen-util-${reladomo.version}.pom"/>
+                <include name="reladomo-gen-util-${reladomo.version}.jar"/>
+                <include name="reladomo-gen-util-${reladomo.version}-sources.jar"/>
+                <include name="reladomo-gen-util-${reladomo.version}-javadoc.jar"/>
+                <include name="reladomo-test-util-${reladomo.version}.pom"/>
+                <include name="reladomo-test-util-${reladomo.version}.jar"/>
+                <include name="reladomo-test-util-${reladomo.version}-sources.jar"/>
+                <include name="reladomo-test-util-${reladomo.version}-javadoc.jar"/>
+            </srcfileset>
+            <targetfileset dir="${root}/target" includes="*.asc"/>
+        </dependset>
+        <fail message="Release files are missing.">
+            <condition>
+                <not>
+                    <resourcecount count="32">
+                        <fileset dir="${root}/target">
+                            <include name="reladomo-${reladomo.version}.pom"/>
+                            <include name="reladomo-${reladomo.version}.jar"/>
+                            <include name="reladomo-${reladomo.version}-sources.jar"/>
+                            <include name="reladomo-${reladomo.version}-javadoc.jar"/>
+                            <include name="reladomogen-${reladomo.version}.pom"/>
+                            <include name="reladomogen-${reladomo.version}.jar"/>
+                            <include name="reladomogen-${reladomo.version}-sources.jar"/>
+                            <include name="reladomogen-${reladomo.version}-javadoc.jar"/>
+                            <include name="reladomo-gen-util-${reladomo.version}.pom"/>
+                            <include name="reladomo-gen-util-${reladomo.version}.jar"/>
+                            <include name="reladomo-gen-util-${reladomo.version}-sources.jar"/>
+                            <include name="reladomo-gen-util-${reladomo.version}-javadoc.jar"/>
+                            <include name="reladomo-test-util-${reladomo.version}.pom"/>
+                            <include name="reladomo-test-util-${reladomo.version}.jar"/>
+                            <include name="reladomo-test-util-${reladomo.version}-sources.jar"/>
+                            <include name="reladomo-test-util-${reladomo.version}-javadoc.jar"/>
+
+                            <include name="reladomo-${reladomo.version}.pom.asc"/>
+                            <include name="reladomo-${reladomo.version}.jar.asc"/>
+                            <include name="reladomo-${reladomo.version}-sources.jar.asc"/>
+                            <include name="reladomo-${reladomo.version}-javadoc.jar.asc"/>
+                            <include name="reladomogen-${reladomo.version}.pom.asc"/>
+                            <include name="reladomogen-${reladomo.version}.jar.asc"/>
+                            <include name="reladomogen-${reladomo.version}-sources.jar.asc"/>
+                            <include name="reladomogen-${reladomo.version}-javadoc.jar.asc"/>
+                            <include name="reladomo-gen-util-${reladomo.version}.pom.asc"/>
+                            <include name="reladomo-gen-util-${reladomo.version}.jar.asc"/>
+                            <include name="reladomo-gen-util-${reladomo.version}-sources.jar.asc"/>
+                            <include name="reladomo-gen-util-${reladomo.version}-javadoc.jar.asc"/>
+                            <include name="reladomo-test-util-${reladomo.version}.pom.asc"/>
+                            <include name="reladomo-test-util-${reladomo.version}.jar.asc"/>
+                            <include name="reladomo-test-util-${reladomo.version}-sources.jar.asc"/>
+                            <include name="reladomo-test-util-${reladomo.version}-javadoc.jar.asc"/>
+                        </fileset>
+                    </resourcecount>
+                </not>
+            </condition>
+        </fail>
+        <jar jarfile="${root}/target/bundle-reladomo-${reladomo.version}.jar" index="false">
+            <fileset dir="${root}/target">
+                <include name="reladomo-${reladomo.version}.pom"/>
+                <include name="reladomo-${reladomo.version}.jar"/>
+                <include name="reladomo-${reladomo.version}-sources.jar"/>
+                <include name="reladomo-${reladomo.version}-javadoc.jar"/>
+
+                <include name="reladomo-${reladomo.version}.pom.asc"/>
+                <include name="reladomo-${reladomo.version}.jar.asc"/>
+                <include name="reladomo-${reladomo.version}-sources.jar.asc"/>
+                <include name="reladomo-${reladomo.version}-javadoc.jar.asc"/>
             </fileset>
         </jar>
-    </target>
-
-    <target name="jar-mithragenxml" depends="compile-reladomo-genutil">
-        <jar jarfile="${mithra.jars.dir}/genmithraxml-${reladomo.version}.jar" index="true">
-            <fileset dir="${mithra.classes.dir}">
-                <include name="com/gs/fw/common/mithra/generator/objectxmlgenerator/*.class"/>
+        <jar jarfile="${root}/target/bundle-reladomogen-${reladomo.version}.jar" index="false">
+            <fileset dir="${root}/target">
+                <include name="reladomogen-${reladomo.version}.pom"/>
+                <include name="reladomogen-${reladomo.version}.jar"/>
+                <include name="reladomogen-${reladomo.version}-sources.jar"/>
+                <include name="reladomogen-${reladomo.version}-javadoc.jar"/>
+
+                <include name="reladomogen-${reladomo.version}.pom.asc"/>
+                <include name="reladomogen-${reladomo.version}.jar.asc"/>
+                <include name="reladomogen-${reladomo.version}-sources.jar.asc"/>
+                <include name="reladomogen-${reladomo.version}-javadoc.jar.asc"/>
+            </fileset>
+        </jar>
+        <jar jarfile="${root}/target/bundle-reladomo-gen-util-${reladomo.version}.jar" index="false">
+            <fileset dir="${root}/target">
+                <include name="reladomo-gen-util-${reladomo.version}.pom"/>
+                <include name="reladomo-gen-util-${reladomo.version}.jar"/>
+                <include name="reladomo-gen-util-${reladomo.version}-sources.jar"/>
+                <include name="reladomo-gen-util-${reladomo.version}-javadoc.jar"/>
+
+                <include name="reladomo-gen-util-${reladomo.version}.pom.asc"/>
+                <include name="reladomo-gen-util-${reladomo.version}.jar.asc"/>
+                <include name="reladomo-gen-util-${reladomo.version}-sources.jar.asc"/>
+                <include name="reladomo-gen-util-${reladomo.version}-javadoc.jar.asc"/>
+            </fileset>
+        </jar>
+        <jar jarfile="${root}/target/bundle-reladomo-test-util-${reladomo.version}.jar" index="false">
+            <fileset dir="${root}/target">
+                <include name="reladomo-test-util-${reladomo.version}.pom"/>
+                <include name="reladomo-test-util-${reladomo.version}.jar"/>
+                <include name="reladomo-test-util-${reladomo.version}-sources.jar"/>
+                <include name="reladomo-test-util-${reladomo.version}-javadoc.jar"/>
+
+                <include name="reladomo-test-util-${reladomo.version}.pom.asc"/>
+                <include name="reladomo-test-util-${reladomo.version}.jar.asc"/>
+                <include name="reladomo-test-util-${reladomo.version}-sources.jar.asc"/>
+                <include name="reladomo-test-util-${reladomo.version}-javadoc.jar.asc"/>
             </fileset>
         </jar>
     </target>
diff --git a/build/pom-templates/pom-mithragen.xml b/build/pom-templates/pom-mithragen.xml
deleted file mode 100644
index 0cb978d7..00000000
--- a/build/pom-templates/pom-mithragen.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Copyright 2016 Goldman Sachs.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.gs.mithra</groupId>
-    <artifactId>mithragen</artifactId>
-    <version>@mithra.version@</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.gs.mithra</groupId>
-            <artifactId>mithra</artifactId>
-            <version>@mithra.version@</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>@antjar.version@</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/build/pom-templates/pom-reladomo-gen-util.xml b/build/pom-templates/pom-reladomo-gen-util.xml
new file mode 100644
index 00000000..44f41e44
--- /dev/null
+++ b/build/pom-templates/pom-reladomo-gen-util.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright 2016 Goldman Sachs.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.goldmansachs.reladomo</groupId>
+    <artifactId>reladomo-gen-util</artifactId>
+    <version>@reladomo.version@</version>
+    <packaging>bundle</packaging>
+
+    <name>Reladomo Generator Utilities</name>
+    <description>Reladomo generator utilities for creating for round trip ddl/xml generation.</description>
+    <url>https://github.com/goldmansachs/reladomo</url>
+
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Mohammad Rezaei</name>
+            <email>mohammad.rezaei@gs.com</email>
+            <organization>Goldman Sachs</organization>
+        </developer>
+    </developers>
+
+    <scm>
+        <url>https://github.com/goldmansachs/reladomo</url>
+        <connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
+        <developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.goldmansachs.reladomo</groupId>
+            <artifactId>reladomo</artifactId>
+            <version>@reladomo.version@</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.goldmansachs.reladomo</groupId>
+            <artifactId>reladomogen</artifactId>
+            <version>@reladomo.version@</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/build/pom-templates/pom-reladomo-test-util.xml b/build/pom-templates/pom-reladomo-test-util.xml
new file mode 100644
index 00000000..6a0ad850
--- /dev/null
+++ b/build/pom-templates/pom-reladomo-test-util.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright 2016 Goldman Sachs.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.goldmansachs.reladomo</groupId>
+    <artifactId>reladomo-test-util</artifactId>
+    <version>@reladomo.version@</version>
+    <packaging>bundle</packaging>
+
+    <name>Reladomo Test Utilities</name>
+    <description>Reladomo test utilities faciliate writing tests for projects using Reladomo.</description>
+    <url>https://github.com/goldmansachs/reladomo</url>
+
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Mohammad Rezaei</name>
+            <email>mohammad.rezaei@gs.com</email>
+            <organization>Goldman Sachs</organization>
+        </developer>
+    </developers>
+
+    <scm>
+        <url>https://github.com/goldmansachs/reladomo</url>
+        <connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
+        <developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.goldmansachs.reladomo</groupId>
+            <artifactId>reladomo</artifactId>
+            <version>@reladomo.version@</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.3.169</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/build/pom-templates/pom-mithra.xml b/build/pom-templates/pom-reladomo.xml
similarity index 52%
rename from build/pom-templates/pom-mithra.xml
rename to build/pom-templates/pom-reladomo.xml
index a41e399d..c5551b05 100644
--- a/build/pom-templates/pom-mithra.xml
+++ b/build/pom-templates/pom-reladomo.xml
@@ -20,41 +20,66 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.gs.mithra</groupId>
-    <artifactId>mithra</artifactId>
-    <version>@mithra.version@</version>
-    <packaging>jar</packaging>
+    <groupId>com.goldmansachs.reladomo</groupId>
+    <artifactId>reladomo</artifactId>
+    <version>@reladomo.version@</version>
+    <packaging>bundle</packaging>
+
+    <name>Reladomo</name>
+    <description>Reladomo is an object-relational mapping framework.</description>
+    <url>https://github.com/goldmansachs/reladomo</url>
+
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Mohammad Rezaei</name>
+            <email>mohammad.rezaei@gs.com</email>
+            <organization>Goldman Sachs</organization>
+        </developer>
+    </developers>
+
+    <scm>
+        <url>https://github.com/goldmansachs/reladomo</url>
+        <connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
+        <developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
+    </scm>
 
     <dependencies>
 
         <dependency>
             <groupId>com.goldmansachs</groupId>
             <artifactId>gs-collections-api</artifactId>
-            <version>@gs-collections.version@</version>
+            <version>5.1.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.goldmansachs</groupId>
             <artifactId>gs-collections</artifactId>
-            <version>@gs-collections.version@</version>
+            <version>5.1.0</version>
         </dependency>
 
         <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.2</version>
+            <version>2.9.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>@slf4j.version@</version>
+            <version>1.7.21</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/build/pom-templates/pom-reladomogen.xml b/build/pom-templates/pom-reladomogen.xml
new file mode 100644
index 00000000..fb19a275
--- /dev/null
+++ b/build/pom-templates/pom-reladomogen.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright 2016 Goldman Sachs.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.goldmansachs.reladomo</groupId>
+    <artifactId>reladomogen</artifactId>
+    <version>@reladomo.version@</version>
+    <packaging>bundle</packaging>
+
+    <name>Reladomo Generator</name>
+    <description>Reladomo generator is responsible for generating abstract classes used by Reladomo objects.</description>
+    <url>https://github.com/goldmansachs/reladomo</url>
+
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Mohammad Rezaei</name>
+            <email>mohammad.rezaei@gs.com</email>
+            <organization>Goldman Sachs</organization>
+        </developer>
+    </developers>
+
+    <scm>
+        <url>https://github.com/goldmansachs/reladomo</url>
+        <connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
+        <developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.9.6</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/build/reladomolib.spec b/build/reladomolib.spec
index 282c4db3..49e95eb5 100644
--- a/build/reladomolib.spec
+++ b/build/reladomolib.spec
@@ -5,9 +5,9 @@ central,com.goldmansachs,gs-collections,5.1.0,jar,lib/compile,07114C5349C816EA64
 central,joda-time,joda-time,2.9.4,jar,lib/compile,1C295B462F16702EBE720BBB08F62E1BA80DA41B
 central,org.apache.geronimo.specs,geronimo-jta_1.1_spec,1.1.1,jar,lib/compile,AABAB3165B8EA936B9360ABBF448459C0D04A5A4
 central,org.slf4j,slf4j-api,1.7.21,jar,lib/compile,139535A69A4239DB087DE9BAB0BEE568BF8E0B70
-central,log4j,log4j,1.2.17,jar,lib/compile,5AF35056B4D257E4B64B9E8069C0746E8B08629F
 
 # test libs:
+central,log4j,log4j,1.2.17,jar,lib/test,5AF35056B4D257E4B64B9E8069C0746E8B08629F
 central,org.slf4j,slf4j-log4j12,1.7.21,jar,lib/test,7238B064D1ABA20DA2AC03217D700D91E02460FA
 central,org.slf4j,jcl-over-slf4j,1.7.21,jar,lib/test,331B564A3A42F002A0004B039C1C430DA89062CD
 central,org.apache.geronimo.specs,geronimo-jms_1.1_spec,1.1.1,jar,lib/test,C872B46C601D8DC03633288B81269F9E42762CEA
diff --git a/build/sign-release.bat b/build/sign-release.bat
new file mode 100644
index 00000000..156460bb
--- /dev/null
+++ b/build/sign-release.bat
@@ -0,0 +1,18 @@
+setlocal
+cd ../target
+gpg -ab reladomo-16.0.0-javadoc.jar
+gpg -ab reladomo-16.0.0-sources.jar
+gpg -ab reladomo-16.0.0.jar
+gpg -ab reladomo-16.0.0.pom
+gpg -ab reladomo-gen-util-16.0.0-javadoc.jar
+gpg -ab reladomo-gen-util-16.0.0-sources.jar
+gpg -ab reladomo-gen-util-16.0.0.jar
+gpg -ab reladomo-gen-util-16.0.0.pom
+gpg -ab reladomo-test-util-16.0.0-javadoc.jar
+gpg -ab reladomo-test-util-16.0.0-sources.jar
+gpg -ab reladomo-test-util-16.0.0.jar
+gpg -ab reladomo-test-util-16.0.0.pom
+gpg -ab reladomogen-16.0.0-javadoc.jar
+gpg -ab reladomogen-16.0.0-sources.jar
+gpg -ab reladomogen-16.0.0.jar
+gpg -ab reladomogen-16.0.0.pom
diff --git a/reladomo/src/test/java/com/gs/fw/common/mithra/test/mithraTestResource/TestMithraRuntimeConfigVerifier.java b/reladomo/src/test/java/com/gs/fw/common/mithra/test/mithraTestResource/TestMithraRuntimeConfigVerifier.java
index ad549cb8..debdc89b 100644
--- a/reladomo/src/test/java/com/gs/fw/common/mithra/test/mithraTestResource/TestMithraRuntimeConfigVerifier.java
+++ b/reladomo/src/test/java/com/gs/fw/common/mithra/test/mithraTestResource/TestMithraRuntimeConfigVerifier.java
@@ -46,10 +46,4 @@ public void testClient() throws Exception
         MithraRuntimeConfigVerifier verifier = new MithraRuntimeConfigVerifier("reladomo/src/test/resources/MithraConfigClientCache.xml");
         verifier.verifyClasses();
     }
-
-    public void testGsIntegrator() throws Exception
-    {
-        MithraRuntimeConfigVerifier verifier = new MithraRuntimeConfigVerifier("reladomo/src/test/resources/MithraConfigGsIntegrator.xml");
-        verifier.verifyClasses();
-    }
 }
diff --git a/reladomo/src/main/java/com/gs/fw/JarVersionCreator.java b/reladomogen/src/main/java/com/gs/fw/JarVersionCreator.java
similarity index 100%
rename from reladomo/src/main/java/com/gs/fw/JarVersionCreator.java
rename to reladomogen/src/main/java/com/gs/fw/JarVersionCreator.java