MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

maven: manifest serialization/deserialization to/from xml fix

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-04-16 15:46:54 +03:00
parent 7e5720d460
commit 4438cf9bce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
+1 -2
View File
@@ -59,8 +59,7 @@ public class MavenCommonArtifactRootCopyingHandlerProvider extends ArtifactRootC
projectConfiguration.moduleConfigurations.get(getModuleName(artifact.getName()));
if (moduleResourceConfiguration != null && moduleResourceConfiguration.manifest != null) {
try {
final String manifest = new String(Base64.decode(moduleResourceConfiguration.manifest));
FileUtil.writeToFile(root, manifest);
FileUtil.writeToFile(root, Base64.decode(moduleResourceConfiguration.manifest));
}
catch (IOException e) {
LOG.debug(e);
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
+3 -2
View File
@@ -14,6 +14,7 @@ import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -227,8 +228,8 @@ public class MavenResourceCompilerConfigurationGenerator {
try {
manifest.write(outputStream);
MavenDomProjectModel domModel = MavenDomUtil.getMavenDomProjectModel(module.getProject(), mavenProject.getFile());
final String resolvedText = MavenPropertyResolver.resolve(outputStream.toString("UTF8"), domModel);
resourceConfig.manifest = Base64.encode(resolvedText.getBytes("UTF8"));
final String resolvedText = MavenPropertyResolver.resolve(outputStream.toString(CharsetToolkit.UTF8), domModel);
resourceConfig.manifest = Base64.encode(resolvedText.getBytes(CharsetToolkit.UTF8));
}
finally {
StreamUtil.closeStream(outputStream);