Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB30F767F for ; Sat, 13 Aug 2011 13:07:52 +0000 (UTC) Received: (qmail 68116 invoked by uid 500); 13 Aug 2011 13:07:52 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 68020 invoked by uid 500); 13 Aug 2011 13:07:51 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 68013 invoked by uid 99); 13 Aug 2011 13:07:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Aug 2011 13:07:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Aug 2011 13:07:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9B392238888F; Sat, 13 Aug 2011 13:07:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157376 - in /maven/sandbox/trunk/doxia/doxia-ide/eclipse: plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java pom.xml Date: Sat, 13 Aug 2011 13:07:30 -0000 To: commits@maven.apache.org From: vsiveton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110813130730.9B392238888F@eris.apache.org> Author: vsiveton Date: Sat Aug 13 13:07:30 2011 New Revision: 1157376 URL: http://svn.apache.org/viewvc?rev=1157376&view=rev Log: o bumped plugins o switched to 1.6 for latest eclipse (to be reviewed for old Eclipse dist) o specified javanature and command in the eclipse-plugin o added a to-eclipse to deploy in a given Eclipse installation o fixed build with the new Doxia api Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java?rev=1157376&r1=1157375&r2=1157376&view=diff ============================================================================== --- maven/sandbox/trunk/doxia/doxia-ide/eclipse/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java (original) +++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java Sat Aug 13 13:07:30 2011 @@ -21,18 +21,20 @@ package org.apache.maven.doxia.ide.eclip import java.io.FileNotFoundException; import java.io.FileReader; +import java.io.OutputStream; import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; +import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.maven.doxia.Converter; import org.apache.maven.doxia.ConverterException; import org.apache.maven.doxia.DefaultConverter; import org.apache.maven.doxia.UnsupportedFormatException; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.wrapper.InputReaderWrapper; -import org.apache.maven.doxia.wrapper.OutputWriterWrapper; +import org.apache.maven.doxia.wrapper.OutputStreamWrapper; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.eclipse.core.resources.IFile; @@ -121,12 +123,12 @@ public class DoxiaWrapper */ private static String convert( Reader reader, IFile file, String format ) { - Writer writer = new StringWriter(); + OutputStream out = new ByteArrayOutputStream(); Converter converter = new DefaultConverter(); try { InputReaderWrapper input = InputReaderWrapper.valueOf( reader, format, converter.getInputFormats() ); - OutputWriterWrapper output = OutputWriterWrapper.valueOf( writer, DEFAULT_OUTPUT, converter + OutputStreamWrapper output = OutputStreamWrapper.valueOf( out, format, file.getCharset(), converter .getOutputFormats() ); converter.convert( input, output ); @@ -222,7 +224,7 @@ public class DoxiaWrapper finally { IOUtil.close( reader ); - IOUtil.close( writer ); + IOUtil.close( out ); } try @@ -237,7 +239,7 @@ public class DoxiaWrapper return "CoreException: " + msgCe; } - return writer.toString(); + return out.toString(); } /** Modified: maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml?rev=1157376&r1=1157375&r2=1157376&view=diff ============================================================================== --- maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml (original) +++ maven/sandbox/trunk/doxia/doxia-ide/eclipse/pom.xml Sat Aug 13 13:07:30 2011 @@ -206,32 +206,55 @@ under the License. org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + org.apache.maven.plugins maven-clean-plugin - 2.2 + 2.4.1 org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + 2.3.2 - 1.5 - 1.5 + 1.6 + 1.6 org.apache.maven.plugins maven-jar-plugin - 2.2 + 2.3.1 org.apache.maven.plugins maven-dependency-plugin - 2.0 + 2.3 org.apache.maven.plugins maven-eclipse-plugin - 2.5.1 + 2.6 + + ${project.groupId}-${project.artifactId} + true + false + + org.eclipse.jdt.core.javabuilder + org.eclipse.pde.ManifestBuilder + org.eclipse.pde.SchemaBuilder + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + + org.eclipse.jdt.launching.JRE_CONTAINER + org.eclipse.pde.core.requiredPlugins + + org.apache.felix @@ -387,19 +410,119 @@ under the License. validate - + - + + + + run + + + + + + + + + to-eclipse + + validate + + + org.apache.maven.plugins + maven-antrun-plugin + + + validate + + + + + + + + + + + + Eclipse home: ${install.dir} + + + No custom Eclipse home defined, using default in Tmp dir + + + +The ${install.dir} doesn't exist. Please run the -Pdownload-eclipse first + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + org.apache.ant + ant-nodeps + 1.8.1 + + + ant-contrib + ant-contrib + 1.0b2 + + + ant + ant + + + +