Author: gnodet
Date: Wed Feb 14 09:40:14 2007
New Revision: 507637

URL: http://svn.apache.org/viewvc?view=rev&rev=507637
Log:
SM-829: Incorrect file encoding of create jbi.xml

Added:
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/apache/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/apache/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/plugin/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/plugin/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/plugin/jbi/
      - copied from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/plugin/jbi/
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriterTest.java
      - copied unchanged from r507635, 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriterTest.java
Modified:
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceAssemblyDescriptorWriter.java
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriter.java
    
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiSharedLibraryDescriptorWriter.java

Modified: 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java?view=diff&rev=507637&r1=507636&r2=507637
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
 Wed Feb 14 09:40:14 2007
@@ -17,8 +17,8 @@
 package org.apache.servicemix.maven.plugin.jbi;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.List;
@@ -39,9 +39,9 @@
             String componentClassLoaderDelegation, String 
bootstrapClassLoaderDelegation, 
             List uris)
                        throws JbiPluginException {
-               FileWriter w;
+        PrintWriter w;
                try {
-                       w = new FileWriter(descriptor);
+                       w = new PrintWriter(descriptor, encoding);
                } catch (IOException ex) {
                        throw new JbiPluginException("Exception while opening 
file["
                                        + descriptor.getAbsolutePath() + "]", 
ex);

Modified: 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceAssemblyDescriptorWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceAssemblyDescriptorWriter.java?view=diff&rev=507637&r1=507636&r2=507637
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceAssemblyDescriptorWriter.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceAssemblyDescriptorWriter.java
 Wed Feb 14 09:40:14 2007
@@ -17,8 +17,8 @@
 package org.apache.servicemix.maven.plugin.jbi;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -44,9 +44,9 @@
 
        public void write(File descriptor, String name, String description,
                        List uris, List connections) throws JbiPluginException {
-               FileWriter w;
+        PrintWriter w;
                try {
-                       w = new FileWriter(descriptor);
+                       w = new PrintWriter(descriptor, encoding);
                } catch (IOException ex) {
                        throw new JbiPluginException("Exception while opening 
file["
                                        + descriptor.getAbsolutePath() + "]", 
ex);

Modified: 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriter.java?view=diff&rev=507637&r1=507636&r2=507637
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriter.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiServiceUnitDescriptorWriter.java
 Wed Feb 14 09:40:14 2007
@@ -17,8 +17,8 @@
 package org.apache.servicemix.maven.plugin.jbi;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.List;
@@ -43,9 +43,9 @@
 
        public void write(File descriptor, boolean bc, String name, String 
description,
                        List uris, List consumes, List provides) throws 
JbiPluginException {
-               FileWriter w;
+               PrintWriter w;
                try {
-                       w = new FileWriter(descriptor);
+                       w = new PrintWriter(descriptor, encoding);
                } catch (IOException ex) {
                        throw new JbiPluginException("Exception while opening 
file["
                                        + descriptor.getAbsolutePath() + "]", 
ex);

Modified: 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiSharedLibraryDescriptorWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiSharedLibraryDescriptorWriter.java?view=diff&rev=507637&r1=507636&r2=507637
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiSharedLibraryDescriptorWriter.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiSharedLibraryDescriptorWriter.java
 Wed Feb 14 09:40:14 2007
@@ -17,8 +17,8 @@
 package org.apache.servicemix.maven.plugin.jbi;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.List;
@@ -41,9 +41,9 @@
        public void write(File descriptor, String name, String description,
                        String version, String classLoaderDelegation, List uris)
                        throws JbiPluginException {
-               FileWriter w;
+        PrintWriter w;
                try {
-                       w = new FileWriter(descriptor);
+                       w = new PrintWriter(descriptor, encoding);
                } catch (IOException ex) {
                        throw new JbiPluginException("Exception while opening 
file["
                                        + descriptor.getAbsolutePath() + "]", 
ex);


Reply via email to