Index: test/java/fr/jayasoft/ivy/xml/updated.xml =================================================================== --- test/java/fr/jayasoft/ivy/xml/updated.xml (revision 608) +++ test/java/fr/jayasoft/ivy/xml/updated.xml (working copy) @@ -1,6 +1,8 @@ - - - + + + + + Index: test/java/fr/jayasoft/ivy/xml/test-update.xml =================================================================== --- test/java/fr/jayasoft/ivy/xml/test-update.xml (revision 608) +++ test/java/fr/jayasoft/ivy/xml/test-update.xml (working copy) @@ -1,6 +1,8 @@ + + - + + + + + + + Index: src/java/fr/jayasoft/ivy/Ivy.java =================================================================== --- src/java/fr/jayasoft/ivy/Ivy.java (revision 608) +++ src/java/fr/jayasoft/ivy/Ivy.java (working copy) @@ -2198,9 +2198,9 @@ md.setResolvedModuleRevisionId(ModuleRevisionId.newInstance(mrid, revision)); md.setResolvedPublicationDate(pubdate); } catch (MalformedURLException e) { - throw new RuntimeException("malformed url obtained for file "+ivyFile); + throw new RuntimeException("malformed url obtained for file "+ivyFile , e); } catch (ParseException e) { - throw new IllegalStateException("bad ivy file in cache for "+mrid+": please clean and resolve again"); + throw new RuntimeException("bad ivy file in cache for "+mrid+": please clean and resolve again" , e); } // 2) parse resolvedRevisions From properties file @@ -2248,7 +2248,7 @@ new File(publishedIvy), resolvedDependencies, status, revision, pubdate, null, true); } catch (SAXException ex) { - throw new IllegalStateException("bad ivy file in cache for "+mrid+": please clean and resolve again"); + throw new RuntimeException("bad ivy file in cache for "+mrid+": please clean and resolve again" , ex); } Message.verbose("\tdeliver done ("+(System.currentTimeMillis()-start)+"ms)"); Index: src/java/fr/jayasoft/ivy/xml/XmlModuleDescriptorWriter.java =================================================================== --- src/java/fr/jayasoft/ivy/xml/XmlModuleDescriptorWriter.java (revision 608) +++ src/java/fr/jayasoft/ivy/xml/XmlModuleDescriptorWriter.java (working copy) @@ -8,6 +8,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.Arrays; import java.util.Collection; @@ -30,8 +31,9 @@ if (output.getParentFile() != null) { output.getParentFile().mkdirs(); } - PrintWriter out = new PrintWriter(new FileOutputStream(output)); + PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(output) , "UTF-8")); try { + out.println(""); out.println(""); out.println("\t instead of > - private Stack _context = new Stack(); - public void startElement(String uri, String localName, - String qName, Attributes attributes) - throws SAXException { - if (_justOpen != null) { - out.print(">"); - } - _context.push(qName); - if ("info".equals(qName)) { - _organisation = substitute(ivy, attributes.getValue("organisation")); - out.print("\n\t\t"); - } else { - _first = false; - } - out.print("<"+qName); - for (int i=0; i instead of > + private Stack _context = new Stack(); + public void startElement(String uri, String localName, + String qName, Attributes attributes) + throws SAXException { + inHeader = false; + if (_justOpen != null) { + out.print(">"); + } + _context.push(qName); + if ("info".equals(qName)) { + _organisation = substitute(ivy, attributes.getValue("organisation")); + out.print("\n\t\t"); } else { - out.print(" rev=\""+systemMid.getRevision()+"\""); + _first = false; } - } else if ("org".equals(attName)) { - out.print(" org=\""+systemMid.getOrganisation()+"\""); - } else if ("name".equals(attName)) { - out.print(" name=\""+systemMid.getName()+"\""); - } else if ("branch".equals(attName)) { - out.print(" branch=\""+systemMid.getBranch()+"\""); - } else { - out.print(" "+attName+"=\""+substitute(ivy, attributes.getValue(attName))+"\""); + out.print("<"+qName); + for (int i=0; i"); - _justOpen = null; - } - for (int i = start; i < start + length; i++) { - out.print(ch[i]); - } + // add default conf mapping if needed + if (_defaultConfMapping != null && attributes.getValue("defaultconfmapping") == null) { + out.print(" defaultconfmapping=\""+_defaultConfMapping+"\""); } - - public void endElement(String uri, String localName, - String qName) throws SAXException { - if (qName.equals(_justOpen)) { - out.print("/>"); - } else { - out.print(""); - } - _justOpen = null; - _context.pop(); + // add confmappingoverride if needed + if (_confMappingOverride != null && attributes.getValue("confmappingoverride") == null) { + out.print(" confmappingoverride=\""+_confMappingOverride.toString()+"\""); } - - public void endDocument() throws SAXException { - out.print(LINE_SEPARATOR); - out.flush(); - out.close(); + } else { + // copy + out.print("<"+qName); + for (int i=0; i"); + _justOpen = null; + } + for (int i = start; i < start + length; i++) { + out.print(ch[i]); + } + } - public void comment(char[] ch, int start, int length) throws SAXException { - StringBuffer comment = new StringBuffer(); - comment.append(ch, start, length); - out.print(""); - } + public void endElement(String uri, String localName, + String qName) throws SAXException { + if (qName.equals(_justOpen)) { + out.print("/>"); + } else { + out.print(""); + } + _justOpen = null; + _context.pop(); + } - public void endEntity(String name) throws SAXException { - } + public void endDocument() throws SAXException { + out.print(LINE_SEPARATOR); + out.flush(); + out.close(); + } + + public void warning(SAXParseException e) throws SAXException { + throw e; + } + public void error(SAXParseException e) throws SAXException { + throw e; + } + public void fatalError(SAXParseException e) throws SAXException { + throw e; + } + + + public void endCDATA() throws SAXException { + } - public void startEntity(String name) throws SAXException { - } + public void endDTD() throws SAXException { + } - public void startDTD(String name, String publicId, String systemId) throws SAXException { - } - }); + public void startCDATA() throws SAXException { + } + + public void comment(char[] ch, int start, int length) throws SAXException { + if (!inHeader) { + StringBuffer comment = new StringBuffer(); + comment.append(ch, start, length); + out.print(""); + } + } + + public void endEntity(String name) throws SAXException { + } + + public void startEntity(String name) throws SAXException { + } + + public void startDTD(String name, String publicId, String systemId) throws SAXException { + } + + } + + public static void update(final Ivy ivy, InputStream inStream, OutputStream outStream, final Map resolvedRevisions, final String status, + final String revision, final Date pubdate, final Namespace ns, final boolean replaceInclude) + throws IOException, SAXException { + final PrintWriter out = new PrintWriter(new OutputStreamWriter(outStream , "UTF-8")); + final BufferedInputStream in = new BufferedInputStream(inStream); + + in.mark(10000); // assume the header is never larger than 10000 bytes. + copyHeader(in, out); + in.reset(); // reposition the stream at the beginning + + try { + UpdaterHandler updaterHandler = new UpdaterHandler(ivy,out,resolvedRevisions,status,revision,pubdate,ns,replaceInclude); + XMLHelper.parse(in, null, updaterHandler, updaterHandler); } catch (ParserConfigurationException e) { IllegalStateException ise = new IllegalStateException("impossible to update Ivy files: parser problem"); ise.initCause(e); @@ -319,20 +352,27 @@ * In fact, copies everything before is also replaced by + * if it was present. + * * @param in * @param out * @throws IOException */ private static void copyHeader(InputStream in, PrintWriter out) throws IOException { - StringBuffer buf = new StringBuffer(); BufferedReader r = new BufferedReader(new InputStreamReader(in)); - for (String line = r.readLine(); line != null; line = r.readLine()) { + String line = r.readLine(); + if (line!=null && line.startsWith(""); + line = line.substring(line.indexOf(">")+1 , line.length()); + } + for (; line != null; line = r.readLine()) { int index = line.indexOf("