fixed jdk and policy file setup

software/zimbra/buildout.cfg

@@ -35,7 +35,8 @@ parts =
   slapos-cookbook
   directories
   jdk
-  jdk-policy
+  jdk-sources
+  jdk-sources-policy
   ant
   autoconf
   automake
@@ -71,8 +72,6 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 web-dirname = 7u13-b20
 filename = jdk-7u13-linux-x64.tar.gz
 policy-filename = UnlimitedJCEPolicyJDK7.zip
-zimbra-filename = jdk1.7.0_13.tgz
-zimbra-target = ${zimbra-sources:location}/ThirdPartyBuilds/x86_64/java
 stop-on-error = True
 update = true
 command =
@@ -80,8 +79,6 @@ command =
     wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" \
         "http://download.oracle.com/otn-pub/java/jdk/${:web-dirname}/${:filename}" \
         -O ${:location}/${:filename}
-    mkdir -p ${:zimbra-target}
-    cp ${:location}/${:filename} ${:zimbra-target}/${:zimbra-filename}
     wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" \
         http://download.oracle.com/otn-pub/java/jce/7/${:policy-filename} \
         -O ${:location}/${:policy-filename}
@@ -94,11 +91,22 @@ url = ${jdk-download:location}/${jdk-download:filename}
 strip-top-level-dir = True
 
 
-[jdk-policy]
-# Uncompress the downloaded JDK
+[jdk-sources]
+# copy the jdk tarball inside the build tree
+recipe = plone.recipe.command
+zimbra-target = ${zimbra-sources:location}/ThirdPartyBuilds/x86_64/java
+zimbra-filename = jdk1.7.0_13.tgz
+update-command = ${:command}
+command =
+    mkdir -p ${:zimbra-target}
+    cp ${jdk-download:location}/${jdk-download:filename} ${:zimbra-target}/${:zimbra-filename}
+
+
+[jdk-sources-policy]
+# copy the java policy inside the build tree
 recipe = hexagonit.recipe.download
 url = ${jdk-download:location}/${jdk-download:policy-filename}
-destination = ${jdk-download:zimbra-target}/jce
+destination = ${jdk-sources:zimbra-target}/jce
 strip-top-level-dir = True