From e2784547a4fb1d1afba10ac2549a2879a356ed8b Mon Sep 17 00:00:00 2001
From: rupalid <rtdesai@gmail.com>
Date: Thu, 15 Mar 2018 12:04:32 +0530
Subject: [PATCH] ZCS-4380 Removing zimbra jars from service/WEB-INF/lib (#557)

* ZCS-4380 Removing zimbra jars from service/WEB-INF/lib

* ZCS-4380 Replacing + in pkg name

* ZCS-4380 Replacing + in pkg name

* ZCS-4380 Adding common jars pkg

* ZCS-4380 Fixes as per review comments

* ZCS-4380 adding common and native to pkg

* ZCS-4380 Fixes as per code review

* ZCS-4380 Fixes as per code review
---
 build.xml        | 10 +++++++++-
 client/build.xml |  7 +++++++
 common/build.xml | 15 +++++++++++----
 native/build.xml |  7 +++++++
 pkg-builder.pl   | 27 ++++++++++++++++++++++++++-
 soap/build.xml   |  7 +++++++
 store/build.xml  | 10 +++++++---
 7 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index dd3e698d579..d5b838950c7 100644
--- a/build.xml
+++ b/build.xml
@@ -36,8 +36,16 @@
       <ant dir="./store"  target="test" inheritAll="true"/>
       <echo append="true" file="${test-results-file}" message="END&#xD;" />
    </target>
+  
+    <target name="dist">
+        <ant dir="./native"  target="dist" inheritAll="false"/>
+        <ant dir="./common"  target="dist" inheritAll="false"/>
+        <ant dir="./soap" target="dist" inheritAll="false"/>
+        <ant dir="./client" target="dist" inheritAll="false"/>
+        <ant dir="./store"  target="dist" inheritAll="false"/>
+      </target>
 
-   <target name="pkg" depends="clean-pkg,all">
+   <target name="pkg" depends="clean-pkg,all,dist">
       <exec dir="." executable="./pkg-builder.pl" failonerror="true"/>
    </target>
 
diff --git a/client/build.xml b/client/build.xml
index ff3fb647d5a..2c5a9f76139 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -65,4 +65,11 @@
       <param name="implementation.title" value="Zimbra Client"/>
     </antcall>
   </target>
+  
+  <target name="dist" depends="jar" description="Copies jar to dist dir">
+     <copy todir="${dist.dir}">
+       <fileset dir="${build.dir}" />
+       <globmapper from="zm-client-*.jar" to="zm-client.jar" />
+     </copy>
+   </target>
 </project>
diff --git a/common/build.xml b/common/build.xml
index 419105f880e..b08e9f1545b 100644
--- a/common/build.xml
+++ b/common/build.xml
@@ -1,12 +1,12 @@
 <project name="zm-common" default="jar">
 
   <import file="../build-common.xml"/>
-  
+
   <!-- Targets -->
   <target name="jar" depends="compile" description="Creates the jar file">
-      <antcall target="zimbra-jar">
-          <param name="implementation.title" value="Zimbra Common"/>
-      </antcall>
+    <antcall target="zimbra-jar">
+      <param name="implementation.title" value="Zimbra Common"/>
+    </antcall>
   </target>
 
   <!-- mailboxd will not start without zm-common library, so this target does not attempt to start it -->
@@ -32,4 +32,11 @@
     <antcall target="start-webserver"/>
   </target>
 
+  <target name="dist" depends="jar" description="Copies jar to dist dir">
+    <copy todir="${dist.dir}">
+      <fileset dir="${build.dir}" />
+      <globmapper from="zm-common-*.jar" to="zm-common.jar" />
+    </copy>
+  </target>
+
 </project>
diff --git a/native/build.xml b/native/build.xml
index 3dddb00bed9..849aa503a2d 100644
--- a/native/build.xml
+++ b/native/build.xml
@@ -50,4 +50,11 @@
    <target name="clean" description="Removes build files and undeploys extension">
            <delete dir="${build.dir}" />
    </target>
+  
+  <target name="dist" depends="jar" description="Copies jar to dist dir">
+    <copy todir="${dist.dir}">
+      <fileset dir="${build.dir}" />
+      <globmapper from="zm-native-*.jar" to="zm-native.jar" />
+    </copy>
+  </target>
 </project>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index c34cc1f395b..1d0c7612cb3 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -66,6 +66,7 @@ ($)
       hard_deps => [
          "zimbra-mbox-war",
          "zimbra-mbox-conf",
+         "zimbra-core-jar"
       ],
       soft_deps => [
          "zimbra-common-mbox-conf",
@@ -188,6 +189,18 @@ ($)
       file_list  => ['/opt/zimbra/*'],
       stage_fun  => sub { &stage_zimbra_common_mbox_docs(@_); },
    },
+   
+   "zimbra-core-jar" => {
+      summary    => "Zimbra Core Jars",
+      version    => "1.0.0",
+      revision   => 1,
+      hard_deps  => [],
+      soft_deps  => [],
+      other_deps => ["zimbra-core-components"],
+      replaces   => ["zimbra-core"],
+      file_list  => ['/opt/zimbra/*'],
+      stage_fun  => sub { &stage_zimbra_core_jars(@_); },
+   },
 );
 
 
@@ -437,6 +450,18 @@ ()
    return ["store/docs"];
 }
 
+sub stage_zimbra_core_jars()
+{
+   my $stage_base_dir = shift;
+
+   cpy_file( "store/build/dist/zm-store.jar",                    "$stage_base_dir/opt/zimbra/lib/jars/zimbrastore.jar");
+   cpy_file( "soap/build/dist/zm-soap.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/zimbrasoap.jar");
+   cpy_file( "client/build/dist/zm-client.jar",                  "$stage_base_dir/opt/zimbra/lib/jars/zimbraclient.jar");
+   cpy_file( "common/build/dist/zm-common.jar",                  "$stage_base_dir/opt/zimbra/lib/jars/zimbracommon.jar");
+   cpy_file( "native/build/dist/zm-native.jar",                  "$stage_base_dir/opt/zimbra/lib/jars/zimbranative.jar");
+   return ["."];
+}
+
 sub stage_zimbra_mbox_service(%)
 {
    my $stage_base_dir = shift;
@@ -460,7 +485,7 @@ ($)
 
    my $timestamp = git_timestamp_from_dirs( &$stage_fun($stage_base_dir) );
 
-   $pkg_info->{_version_ts} = $pkg_info->{version} . ( $timestamp ? ( "+" . $timestamp ) : "" );
+   $pkg_info->{_version_ts} = $pkg_info->{version} . ( $timestamp ? ( "." . $timestamp ) : "" );
 
    my @cmd = (
       "../zm-pkg-tool/pkg-build.pl",
diff --git a/soap/build.xml b/soap/build.xml
index c9d3a8ffb9e..bfcdb55897e 100644
--- a/soap/build.xml
+++ b/soap/build.xml
@@ -262,5 +262,12 @@
   <target name="deploy" depends="deploy-no-start">
     <antcall target="start-webserver"/>
   </target>
+  
+  <target name="dist" depends="jar" description="Copies jar to dist dir">
+       <copy todir="${dist.dir}">
+         <fileset dir="${build.dir}" />
+         <globmapper from="zm-soap-*.jar" to="zm-soap.jar" />
+       </copy>
+     </target>
 
 </project>
diff --git a/store/build.xml b/store/build.xml
index 318901bf2ab..e5268f4aeb3 100644
--- a/store/build.xml
+++ b/store/build.xml
@@ -314,11 +314,8 @@
   	<ivy:install organisation="javax.jws" module="jsr181-api" revision="2.2.6" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
         <ivy:install organisation="org.ehcache" module="ehcache" revision="3.1.2" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
   	<ivy:install organisation="javax.ws.rs" module="jsr311-api" revision="1.1.1" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
-  	<ivy:install organisation="zimbra" module="zm-soap" revision="latest.integration" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
-    <ivy:install organisation="zimbra" module="zm-client" revision="latest.integration" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
   	<war warfile="${warfile}" webxml="${war.web.xml}">
       <fileset dir="WebRoot"/>
-      <lib file="${build.dir}/${jar.file}"/>
       <lib dir="${build.tmp.dir}" includes="*.jar"/>
       <!-- /lib -->
       <classes dir="${config.dir}" includes="sieveConfig.xml"/>
@@ -416,4 +413,11 @@
       <fileset dir="data/unittest" includes="**"/>
     </copy>
   </target>
+  
+  <target name="dist" depends="jar" description="Copies jar to dist dir">
+       <copy todir="${dist.dir}">
+         <fileset dir="${build.dir}" />
+         <globmapper from="zm-store-*.jar" to="zm-store.jar" />
+       </copy>
+     </target>
 </project>