From ecfe82c04a58d2a684fa892ba0f4276f5a2fac29 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 16 Apr 2015 15:19:12 +0300
Subject: [PATCH] maven: manifest serialization/deserialization to/from xml fix

---
 .../MavenCommonArtifactRootCopyingHandlerProvider.java        | 4 ++--
 .../project/MavenResourceCompilerConfigurationGenerator.java  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
index 477e6cf6811d..65973a4856f4 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
@@ -18,6 +18,7 @@ package org.jetbrains.jps.maven.compiler;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.Base64;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.builders.storage.BuildDataPaths;
@@ -58,8 +59,7 @@ public class MavenCommonArtifactRootCopyingHandlerProvider extends ArtifactRootC
         projectConfiguration.moduleConfigurations.get(getModuleName(artifact.getName()));
       if (moduleResourceConfiguration != null && moduleResourceConfiguration.manifest != null) {
         try {
-          final String manifest =
-            StringUtil.unescapeXml(moduleResourceConfiguration.manifest).replaceAll("\n\r|\n|\r", "\r\n") + "\r\n\r\n";
+          final String manifest = new String(Base64.decode(moduleResourceConfiguration.manifest));
           FileUtil.writeToFile(root, manifest);
         }
         catch (IOException e) {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
index fb2855319089..85b1cb0aa4e7 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Base64;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Document;
@@ -227,7 +228,7 @@ public class MavenResourceCompilerConfigurationGenerator {
         manifest.write(outputStream);
         MavenDomProjectModel domModel = MavenDomUtil.getMavenDomProjectModel(module.getProject(), mavenProject.getFile());
         final String resolvedText = MavenPropertyResolver.resolve(outputStream.toString("UTF8"), domModel);
-        resourceConfig.manifest = StringUtil.escapeXml(resolvedText);
+        resourceConfig.manifest = Base64.encode(resolvedText.getBytes("UTF8"));
       }
       finally {
         StreamUtil.closeStream(outputStream);