add runmode suffix to sub package file names

Author: stefanseifert

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java

@@ -351,9 +351,7 @@ private File processContentPackage(File contentPackageFile, ContentPackageFile p
         Enumeration<? extends ZipEntry> zipInEntries = zipFileIn.entries();
         while (zipInEntries.hasMoreElements()) {
           ZipEntry zipInEntry = zipInEntries.nextElement();
-          ZipEntry zipOutEntry = new ZipEntry(zipInEntry.getName());
           if (!zipInEntry.isDirectory()) {
-            zipOut.putNextEntry(zipOutEntry);
             try (InputStream is = zipFileIn.getInputStream(zipInEntry)) {
 
               // if entry is properties.xml, update dependency information
@@ -364,17 +362,26 @@ private File processContentPackage(File contentPackageFile, ContentPackageFile p
                 if (autoDependenciesMode != AutoDependenciesMode.OFF) {
                   dependenciesString = updateDependencies(props, previousPkg, environmentRunMode, allPackagesFromFileSets);
                 }
+
+                ZipEntry zipOutEntry = new ZipEntry(zipInEntry.getName());
+                zipOut.putNextEntry(zipOutEntry);
                 props.storeToXML(zipOut, null);
               }
 
               // process sub-packages as well: add runmode suffix and update dependencies
               else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "zip")) {
-                File tempSubPackageFile = File.createTempFile("subpkg", ".zip");
+                String path = FilenameUtils.getPath(zipInEntry.getName());
+                String basename = FilenameUtils.getBaseName(zipInEntry.getName());
+                String runModeSuffix = buildRunModeSuffix(pkg, environmentRunMode);
+
+                File tempSubPackageFile = File.createTempFile("subpkg-" + basename + runModeSuffix, ".zip");
                 try (FileOutputStream subPackageFos = new FileOutputStream(tempSubPackageFile)) {
                   IOUtils.copy(is, subPackageFos);
                 }
                 File resultSubPackageFile = processContentPackage(tempSubPackageFile, pkg, previousPkg, environmentRunMode, allPackagesFromFileSets);
                 try (FileInputStream subPackageFis = new FileInputStream(resultSubPackageFile)) {
+                  ZipEntry zipOutEntry = new ZipEntry(path + basename + runModeSuffix + ".zip");
+                  zipOut.putNextEntry(zipOutEntry);
                   IOUtils.copy(subPackageFis, zipOut);
                 }
                 finally {
@@ -384,6 +391,8 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
 
               // otherwise transfer the binary data 1:1
               else {
+                ZipEntry zipOutEntry = new ZipEntry(zipInEntry.getName());
+                zipOut.putNextEntry(zipOutEntry);
                 IOUtils.copy(is, zipOut);
               }
             }

tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java

@@ -138,7 +138,7 @@ void testBuild(Set<String> cloudManagerTarget, List<String> runmodeSuffixes) thr
       assertNameDependencies(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
           "accesscontroltool-package" + runmodeSuffix);
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0.zip",
+          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix);
@@ -215,7 +215,7 @@ void testBuild_IMMUTABLE_MUTABLE_COMBINED(Set<String> cloudManagerTarget, List<S
           "accesscontroltool-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.content" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0.zip",
+          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.content" + runmodeSuffix + ":4.10.0");
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
@@ -294,7 +294,7 @@ void testBuild_IMMUTABLE_MUTABLE_SEPARATE(Set<String> cloudManagerTarget, List<S
           "accesscontroltool-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0.zip",
+          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
@@ -371,7 +371,7 @@ void testBuild_IMMUTABLE_ONLY(Set<String> cloudManagerTarget, List<String> runmo
           "accesscontroltool-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0.zip",
+          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",