svn commit: r565096 - in /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional: ./ depend/ extension/ javah/ native2ascii/ net/ sos/ vss/

2007-08-12 Thread peterreilly
Author: peterreilly
Date: Sun Aug 12 11:15:29 2007
New Revision: 565096

URL: http://svn.apache.org/viewvc?view=rev&rev=565096
Log:
merge checkstyle

Modified:

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java

ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java?view=diff&rev=565096&r1=565095&r2=565096
==
--- 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
 (original)
+++ 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
 Sun Aug 12 11:15:29 2007
@@ -421,7 +421,7 @@
 /**
  * a tuple for the sort list.
  */
-private static class Tuple implements Comparable {
+private static final class Tuple implements Comparable {
 private String key;
 private String value;
 

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java?view=diff&rev=565096&r1=565095&r2=565096
==
--- 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
 (original)
+++ 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
 Sun Aug 12 11:15:29 2007
@@ -225,7 +225,7 @@
  * @param sf the spec file name to use.
  */
 public void setSpecFile(String sf) {
-if ((sf == null) || (sf.trim().length()==0)) {
+if ((sf == null) || (sf.trim().length() == 0)) {
 throw new BuildException("You must specify a spec file", 
getLocation());
 }
 this.specFile = sf;

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java?view=diff&rev=565096&r1=565095&r2=565096
==
--- 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
 (original)
+++ 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
 Sun Aug 12 11:15:29 2007
@@ -24,6 +24,7 @@
  *
  *
  */
+// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
 public class ClassFileUtils {
 
 /**

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java?view=diff&rev=565096&r1=565095&r2=565096
==
--- 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
 (original)
+++ 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
 Sun Aug 12 11:15:29 2007
@@ -34,7 +34,7 @@
  * A set of useful methods relating to extensions.
  *
  */
-public class ExtensionUtil {
+public final class ExtensionUtil {
 /**
  * Class is not meant to be instantiated.
  */

Modified: 
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/o

svn commit: r565095 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional: ./ depend/ extension/ javah/ native2ascii/ net/ sos/ vss/

2007-08-12 Thread peterreilly
Author: peterreilly
Date: Sun Aug 12 11:14:31 2007
New Revision: 565095

URL: http://svn.apache.org/viewvc?view=rev&rev=565095
Log:
checkstyle

Modified:

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java?view=diff&rev=565095&r1=565094&r2=565095
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
 Sun Aug 12 11:14:31 2007
@@ -421,7 +421,7 @@
 /**
  * a tuple for the sort list.
  */
-private static class Tuple implements Comparable {
+private static final class Tuple implements Comparable {
 private String key;
 private String value;
 

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java?view=diff&rev=565095&r1=565094&r2=565095
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java Sun 
Aug 12 11:14:31 2007
@@ -225,7 +225,7 @@
  * @param sf the spec file name to use.
  */
 public void setSpecFile(String sf) {
-if ((sf == null) || (sf.trim().length()==0)) {
+if ((sf == null) || (sf.trim().length() == 0)) {
 throw new BuildException("You must specify a spec file", 
getLocation());
 }
 this.specFile = sf;

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java?view=diff&rev=565095&r1=565094&r2=565095
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
 Sun Aug 12 11:14:31 2007
@@ -24,6 +24,7 @@
  *
  *
  */
+// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
 public class ClassFileUtils {
 
 /**

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java?view=diff&rev=565095&r1=565094&r2=565095
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
 Sun Aug 12 11:14:31 2007
@@ -34,7 +34,7 @@
  * A set of useful methods relating to extensions.
  *
  */
-public class ExtensionUtil {
+public final class ExtensionUtil {
 /**
  * Class is not meant to be instantiated.
  */

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java?view=diff&rev=565095&r1=565094&r2=565095
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/e

svn commit: r476574 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii: DefaultNative2Ascii.java KaffeNative2Ascii.java Native2AsciiAdapter.java Native2AsciiAdapterFacto

2006-11-18 Thread peterreilly
Author: peterreilly
Date: Sat Nov 18 10:05:16 2006
New Revision: 476574

URL: http://svn.apache.org/viewvc?view=rev&rev=476574
Log:
checkstyle

Modified:

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java?view=diff&rev=476574&r1=476573&r2=476574
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java
 Sat Nov 18 10:05:16 2006
@@ -31,11 +31,17 @@
  */
 public abstract class DefaultNative2Ascii implements Native2AsciiAdapter {
 
+/** No-arg constructor. */
 public DefaultNative2Ascii() {
 }
 
 /**
  * Splits the task into setting up the command line switches
+ * @param args the native 2 ascii arguments.
+ * @param srcFile the source file.
+ * @param destFile the destination file.
+ * @return run if the conversion was successful.
+ * @throws BuildException if there is a problem.
  * (delegated to [EMAIL PROTECTED] #setup setup}), adding the file names
  * (delegated to [EMAIL PROTECTED] #addFiles addFiles}) and running the 
tool
  * (delegated to [EMAIL PROTECTED] #run run}).
@@ -57,6 +63,7 @@
  * @param cmd Command line to add to
  * @param args provides the user-setting and access to Ant's
  * logging system.
+ * @throws BuildException if there was a problem.
  */
 protected void setup(Commandline cmd, Native2Ascii args)
 throws BuildException {
@@ -77,6 +84,7 @@
  * @param log provides access to Ant's logging system.
  * @param src the source file
  * @param dest the destination file
+ * @throws BuildException if there was a problem.
  */
 protected void addFiles(Commandline cmd, ProjectComponent log, File src,
 File dest) throws BuildException {
@@ -90,6 +98,7 @@
  * @param cmd Command line to execute
  * @param log provides access to Ant's logging system.
  * @return whether execution was successful
+ * @throws BuildException if there was a problem.
  */
 protected abstract boolean run(Commandline cmd, ProjectComponent log)
 throws BuildException;

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java?view=diff&rev=476574&r1=476573&r2=476574
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
 Sat Nov 18 10:05:16 2006
@@ -42,6 +42,7 @@
  */
 public static final String IMPLEMENTATION_NAME = "kaffe";
 
+/** [EMAIL PROTECTED] */
     protected void setup(Commandline cmd, Native2Ascii args)
 throws BuildException {
 if (args.getReverse()) {
@@ -50,6 +51,7 @@
 super.setup(cmd, args);
 }
 
+/** [EMAIL PROTECTED] */
 protected boolean run(Commandline cmd, ProjectComponent log)
 throws BuildException {
 ExecuteJava ej = new ExecuteJava();
@@ -77,9 +79,10 @@
 try {
 return Class.forName(N2A_CLASSNAMES[i]);
 } catch (ClassNotFoundException cnfe) {
+// Ignore
 }
 }
 return null;
 }
 
-}
\ No newline at end of file
+}

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java?view=diff&rev=476574&r1=476573&r2=476574
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskd

svn commit: r471554 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional: ./ dotnet/ extension/ javah/ junit/ native2ascii/ net/ script/ splash/ ssh/ starteam/ unix/

2006-11-05 Thread peterreilly
Author: peterreilly
Date: Sun Nov  5 14:50:17 2006
New Revision: 471554

URL: http://svn.apache.org/viewvc?view=rev&rev=471554
Log:
checkstyle

Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java

ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java?view=diff&rev=471554&r1=471553&r2=471554
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java 
Sun Nov  5 14:50:17 2006
@@ -353,7 +353,7 @@
 facade.setImplementation(JavahAdapterFactory.getDefault());
 } else {
 facade.setImplementation(impl);
-}
+}
 }
 
 /**
@@ -414,7 +414,7 @@
 classpath = classpath.concatSystemClasspath("ignore");
 }
 
-JavahAdapter ad = 
+JavahAdapter ad =
 JavahAdapterFactory.getAdapter(facade.getImplementation(),
this);
 if (!ad.compile(this)) {

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java?view=diff&rev=471554&r1=471553&r2=471554
==
--- 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
 Sun

DO NOT REPLY [Bug 23440] - imporove native2ascii task for opensource JVM

2005-03-16 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=23440


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
   Target Milestone|--- |1.6.3




--- Additional Comments From [EMAIL PROTECTED]  2005-03-16 16:46 ---
 supports Kaffe's and CLASSPATH's version now, more backends
can be added easily.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii KaffeNative2Ascii.java

2005-03-10 Thread bodewig
bodewig 2005/03/10 00:32:13

  Modified:src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
Tag: ANT_16_BRANCH KaffeNative2Ascii.java
  Log:
  merge
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.2   +31 -1 
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
  
  Index: KaffeNative2Ascii.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- KaffeNative2Ascii.java4 Feb 2005 08:13:47 -   1.1.2.1
  +++ KaffeNative2Ascii.java10 Mar 2005 08:32:13 -  1.1.2.2
  @@ -29,6 +29,13 @@
*/
   public final class KaffeNative2Ascii extends DefaultNative2Ascii {
   
  +// sorted by newest Kaffe version first
  +private static final String[] N2A_CLASSNAMES = new String[] {
  +"gnu.classpath.tools.native2ascii.Native2Ascii",
  +// pre Kaffe 1.1.5
  +"kaffe.tools.native2ascii.Native2Ascii",
  +};
  +
   /**
* Identifies this adapter.
*/
  @@ -45,10 +52,33 @@
   protected boolean run(Commandline cmd, ProjectComponent log)
   throws BuildException {
   ExecuteJava ej = new ExecuteJava();
  -cmd.setExecutable("kaffe.tools.native2ascii.Native2Ascii");
  +Class c = getN2aClass();
  +if (c == null) {
  +throw new BuildException("Couldn't load Kaffe's Native2Ascii"
  + + " class");
  +}
  +
  +cmd.setExecutable(c.getName());
   ej.setJavaCommand(cmd);
   ej.execute(log.getProject());
   // otherwise ExecuteJava has thrown an exception
   return true;
   }
  +
  +/**
  + * tries to load Kaffe Native2Ascii and falls back to the older
  + * class name if necessary.
  + *
  + * @return null if neither class can get loaded.
  + */
  +private static Class getN2aClass() {
  +for (int i = 0; i < N2A_CLASSNAMES.length; i++) {
  +try {
  +return Class.forName(N2A_CLASSNAMES[i]);
  +} catch (ClassNotFoundException cnfe) {
  +}
  +}
  +return null;
  +}
  +
   }
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii KaffeNative2Ascii.java

2005-03-10 Thread bodewig
bodewig 2005/03/10 00:31:54

  Modified:src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
KaffeNative2Ascii.java
  Log:
  Kaffe keeps moving things, adapt
  
  Revision  ChangesPath
  1.2   +31 -1 
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
  
  Index: KaffeNative2Ascii.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KaffeNative2Ascii.java31 Jan 2005 11:48:25 -  1.1
  +++ KaffeNative2Ascii.java10 Mar 2005 08:31:54 -  1.2
  @@ -29,6 +29,13 @@
*/
   public final class KaffeNative2Ascii extends DefaultNative2Ascii {
   
  +// sorted by newest Kaffe version first
  +private static final String[] N2A_CLASSNAMES = new String[] {
  +"gnu.classpath.tools.native2ascii.Native2Ascii",
  +// pre Kaffe 1.1.5
  +"kaffe.tools.native2ascii.Native2Ascii",
  +};
  +
   /**
* Identifies this adapter.
*/
  @@ -45,10 +52,33 @@
   protected boolean run(Commandline cmd, ProjectComponent log)
   throws BuildException {
   ExecuteJava ej = new ExecuteJava();
  -cmd.setExecutable("kaffe.tools.native2ascii.Native2Ascii");
  +Class c = getN2aClass();
  +if (c == null) {
  +throw new BuildException("Couldn't load Kaffe's Native2Ascii"
  + + " class");
  +}
  +
  +cmd.setExecutable(c.getName());
   ej.setJavaCommand(cmd);
   ej.execute(log.getProject());
   // otherwise ExecuteJava has thrown an exception
   return true;
   }
  +
  +/**
  + * tries to load Kaffe Native2Ascii and falls back to the older
  + * class name if necessary.
  + *
  + * @return null if neither class can get loaded.
  + */
  +private static Class getN2aClass() {
  +for (int i = 0; i < N2A_CLASSNAMES.length; i++) {
  +try {
  +return Class.forName(N2A_CLASSNAMES[i]);
  +} catch (ClassNotFoundException cnfe) {
  +}
  +}
  +return null;
  +}
  +
   }
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii DefaultNative2Ascii.java

2005-02-02 Thread bodewig
bodewig 2005/02/02 05:46:08

  Modified:.WHATSNEW
   docs/manual/OptionalTasks native2ascii.html
   src/main/org/apache/tools/ant/taskdefs/optional
Native2Ascii.java
   src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
DefaultNative2Ascii.java
  Log:
  Make native2ascii a full-blown facade task, add docs
  
  Revision  ChangesPath
  1.736 +2 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.735
  retrieving revision 1.736
  diff -u -r1.735 -r1.736
  --- WHATSNEW  28 Jan 2005 23:18:32 -  1.735
  +++ WHATSNEW  2 Feb 2005 13:46:08 -   1.736
  @@ -198,6 +198,8 @@
   
   * Added length task to get strings' and files' lengths.
   
  +*  now also supports Kaffe's version.
  +
   Fixed bugs:
   ---
   
  
  
  
  1.11  +61 -2 ant/docs/manual/OptionalTasks/native2ascii.html
  
  Index: native2ascii.html
  ===
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/native2ascii.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- native2ascii.html 19 Nov 2004 09:07:11 -  1.10
  +++ native2ascii.html 2 Feb 2005 13:46:08 -   1.11
  @@ -40,6 +40,15 @@
 and <patternset> elements.
   
   
  +It is possible to use different converters. This can be selected
  +  with the implementation attribute.
  +  Here are the choices:
  +
  +  default - the default converter (kaffe or sun) for the 
platform.
  +  sun (the standard converter of the JDK)
  +  kaffe (the standard converter of http://www.kaffe.org"; 
target="_top">Kaffe)
  +
  +
   
 
   Attribute
  @@ -49,7 +58,8 @@
 
   reverse
   Reverse the sense of the conversion,
  -  i.e. convert from ASCII to native
  +  i.e. convert from ASCII to native only supported by the
  +sun converter
   No
 
 
  @@ -105,8 +115,57 @@
 taken to be an exclude pattern
   No
 
  +  
  +implementation
  +The converter implementation to use.
  +  If this attribute is not set, the default converter for the
  +  current VM will be used.  (See the above list of valid converters.)
  +No
  +  
   
   
  +Parameters specified as nested elements
  +
  +arg
  +
  +You can specify additional command line arguments for the converter
  +with nested <arg> elements.  These elements are
  +specified like Command-line Arguments
  +but have an additional attribute that can be used to enable arguments
  +only if a given converter implementation will be used.
  +
  +
  +
  +  Attribute
  +  Description
  +  Required
  +
  +  
  +value
  +See
  +Command-line Arguments.
  +Exactly one of these.
  +  
  +  
  +line
  +  
  +  
  +file
  +  
  +  
  +path
  +  
  +  
  +implementation
  +Only pass the specified argument if the chosen converter
  +implementation matches the value of this attribute.  Legal values
  +are the same as those in the above list of valid compilers.)
  +No
  +  
  +
  +
   Examples
   
   
  @@ -133,6 +192,6 @@
   
 
   
  -Copyright © 2000-2002,2004 The Apache Software 
Foundation. All rights
  +Copyright © 2000-2002,2004-2005 The Apache Software 
Foundation. All rights
   Reserved.
   
  
  
  
  1.24  +44 -1 
ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Native2Ascii.java 31 Jan 2005 11:48:25 -  1.23
  +++ Native2Ascii.java 2 Feb 2005 13:46:08 -   1.24
  @@ -29,6 +29,8 @@
   import org.apache.tools.ant.util.FileNameMapper;
   import org.apache.tools.ant.util.IdentityMapper;
   import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.util.facade.FacadeTaskHelper;
  +import org.apache.tools.ant.util.facade.ImplementationSpecificArgument;
   
   /**
* Converts files from native encodings to ASCII.
  @@ -44,6 +46,11 @@
   private String extension = null;  // Extension of output files if 
different
   
   private Mapper mapper;
  +private FacadeTaskHelper facade = null;
  +
  +public Native2Ascii() {
  +facade = new 
FacadeTaskHelper(Native2AsciiAdapterFactory.getDefault());
  +}
   
   /**
* Flag the conversion to run in the reverse sense,
  @@ -115,6 +122,19 @@
   }
   
   /**
  + * Choos

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii SunNative2Ascii.java

2005-02-01 Thread bodewig
bodewig 2005/01/31 23:50:21

  Modified:.build.xml
   src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
SunNative2Ascii.java
  Log:
  Use refelection to completely decouple Native2Ascii from Sun's implementation
  
  Revision  ChangesPath
  1.452 +0 -1  ant/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/ant/build.xml,v
  retrieving revision 1.451
  retrieving revision 1.452
  diff -u -r1.451 -r1.452
  --- build.xml 31 Jan 2005 11:48:24 -  1.451
  +++ build.xml 1 Feb 2005 07:50:21 -   1.452
  @@ -163,7 +163,6 @@
 
   
 
  -  
   
 
   
  
  
  
  1.2   +20 -2 
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
  
  Index: SunNative2Ascii.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SunNative2Ascii.java  31 Jan 2005 11:48:25 -  1.1
  +++ SunNative2Ascii.java  1 Feb 2005 07:50:21 -   1.2
  @@ -16,6 +16,7 @@
*/
   package org.apache.tools.ant.taskdefs.optional.native2ascii;
   
  +import java.lang.reflect.Method;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.ProjectComponent;
   import org.apache.tools.ant.taskdefs.optional.Native2Ascii;
  @@ -43,7 +44,24 @@
   
   protected boolean run(Commandline cmd, ProjectComponent log)
   throws BuildException {
  -sun.tools.native2ascii.Main n2a = new sun.tools.native2ascii.Main();
  -return n2a.convert(cmd.getArguments());
  +try {
  +Class n2aMain = Class.forName("sun.tools.native2ascii.Main");
  +Class[] param = new Class[] {String[].class};
  +Method convert = n2aMain.getMethod("convert", param);
  +if (convert == null) {
  +throw new BuildException("Could not find convert() method in 
"
  + + "sun.tools.native2ascii.Main");
  +}
  +Object o = n2aMain.newInstance();
  +return ((Boolean) convert.invoke(o, 
  + new Object[] 
{cmd.getArguments()})
  +).booleanValue();
  +} catch (BuildException ex) {
  +//rethrow
  +throw ex;
  +} catch (Exception ex) {
  +//wrap
  +   throw new BuildException("Error starting Sun's native2ascii: ", 
ex);
  +}
   }
   }
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Kaffe and native2ascii

2005-01-31 Thread Stefan Bodewig
On Mon, 31 Jan 2005, Dominique Devienne <[EMAIL PROTECTED]> wrote:

> I have a prototype re-implementation of Javah that Dax and I worked
> on (well, mostly Dax ;-). Let me refresh my memory for it. It may be
> a good starting point.

I really only want to decouple the task from the Sun implementation,
much the same way I've done for native2ascii now or has been done for
rmic and javac before.  If you feel I'd be getting in the way of
extensibility, let me know.,

It may isolate us from changes in the JDK in some way as well, see the
oldjavah code in Javah.

For Kaffe it'll run the native kaffeh executable.

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: Kaffe and native2ascii

2005-01-31 Thread Dominique Devienne
> From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
> 
> On Mon, 31 Jan 2005, Dominique Devienne <[EMAIL PROTECTED]> wrote:
> 
> > I've seen the CVS log activity around native2ascii,
> > and was curious to what the problem with Kaffe is,
> 
> there is no sun.tools.native2ascii.Main in Kaffe.
> 
> > which from your commit messages are linked to Gump.
> 
> Yes.  We run Gump on Kaffe and whenever I see something that could be
> fixed via cooperation of Ant, I jump in 8-)

Ah ;-)

> Next up is javah, since Kaffe doesn't contain com.sun.tools.javah.Main
> either.

Eh, I have a prototype re-implementation of Javah that Dax and I worked
on (well, mostly Dax ;-). Let me refresh my memory for it. It may be a
good starting point. I recall it was faster that javah at the time ;-)
We wrote it because we had a remote interface hierarchy (as opposed to
stand-alone remote interfaces), which the SUN javah would make a proxy
for each, duplicating the inherited methods. We made the proxy inherit
from each other too, like the original remote itfs, and the generated
proxy classes were much smaller. --DD

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Kaffe and native2ascii

2005-01-31 Thread Stefan Bodewig
On Mon, 31 Jan 2005, Dominique Devienne <[EMAIL PROTECTED]> wrote:

> I've seen the CVS log activity around native2ascii,
> and was curious to what the problem with Kaffe is,

there is no sun.tools.native2ascii.Main in Kaffe.

> which from your commit messages are linked to Gump.

Yes.  We run Gump on Kaffe and whenever I see something that could be
fixed via cooperation of Ant, I jump in 8-)

I'm very careful to invoke the Kaffe classes via the command line
interface only, otherwise I might get Ant into GPL trouble.

Does anybody think ExecuteJava is good enough in abstracting away the
invocation or should I even go about forking a new VM?  Looking at the
KaffeRmic code, we may already be doing more than is OK, at least from
a paranoid point of view.

Next up is javah, since Kaffe doesn't contain com.sun.tools.javah.Main
either.

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Kaffe and native2ascii

2005-01-31 Thread Dominique Devienne
Hi Stefan,

I've seen the CVS log activity around native2ascii,
and was curious to what the problem with Kaffe is,
which from your commit messages are linked to Gump.

(Sorry, I jumped the Gump mailing list a while back).

Thanks, --DD

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/etc/testcases/taskdefs/optional/native2ascii/expected - New directory

2005-01-31 Thread bodewig
bodewig 2005/01/31 06:04:38

  ant/src/etc/testcases/taskdefs/optional/native2ascii/expected - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/etc/testcases/taskdefs/optional/native2ascii/input - New directory

2005-01-31 Thread bodewig
bodewig 2005/01/31 06:03:07

  ant/src/etc/testcases/taskdefs/optional/native2ascii/input - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/etc/testcases/taskdefs/optional/native2ascii - New directory

2005-01-31 Thread bodewig
bodewig 2005/01/31 06:03:00

  ant/src/etc/testcases/taskdefs/optional/native2ascii - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii DefaultNative2Ascii.java

2005-01-31 Thread bodewig
bodewig 2005/01/31 03:54:42

  Modified:src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
DefaultNative2Ascii.java
  Log:
  Fix @link
  
  Revision  ChangesPath
  1.2   +1 -1  
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java
  
  Index: DefaultNative2Ascii.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultNative2Ascii.java  31 Jan 2005 11:48:25 -  1.1
  +++ DefaultNative2Ascii.java  31 Jan 2005 11:54:41 -  1.2
  @@ -36,7 +36,7 @@
   /**
* Splits the task into setting up the command line switches
* (delegated to [EMAIL PROTECTED] #setup setup}), adding the file names
  - * (delegated to [EMAIL PROTECTED] addFiles addFiles}) and running the 
tool
  + * (delegated to [EMAIL PROTECTED] #addFiles addFiles}) and running the 
tool
* (delegated to [EMAIL PROTECTED] #run run}).
*/
   public final boolean convert(Native2Ascii args, File srcFile,
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii DefaultNative2Ascii.java KaffeNative2Ascii.java Native2AsciiAdapterFactory.java SunNative2Ascii.java Native2AsciiAdapter.java

2005-01-31 Thread bodewig
bodewig 2005/01/31 03:48:25

  Modified:.build.xml
   src/main/org/apache/tools/ant/taskdefs/optional
Native2Ascii.java
   src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
Native2AsciiAdapter.java
  Added:   src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
DefaultNative2Ascii.java KaffeNative2Ascii.java
Native2AsciiAdapterFactory.java
SunNative2Ascii.java
  Log:
  Support Kaffe in native2ascii, make it a full facade task later
  
  Revision  ChangesPath
  1.451 +1 -2  ant/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/ant/build.xml,v
  retrieving revision 1.450
  retrieving revision 1.451
  diff -u -r1.450 -r1.451
  --- build.xml 28 Jan 2005 20:11:48 -  1.450
  +++ build.xml 31 Jan 2005 11:48:24 -  1.451
  @@ -162,9 +162,8 @@
  Kaffe for example -->
 
   
  -  
 
  -  
  +  
   
 
   
  
  
  
  1.23  +26 -20
ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Native2Ascii.java 6 Dec 2004 19:27:13 -   1.22
  +++ Native2Ascii.java 31 Jan 2005 11:48:25 -  1.23
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2000-2004 The Apache Software Foundation
  + * Copyright  2000-2005 The Apache Software Foundation
*
*  Licensed under the Apache License, Version 2.0 (the "License");
*  you may not use this file except in compliance with the License.
  @@ -22,6 +22,8 @@
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  +import 
org.apache.tools.ant.taskdefs.optional.native2ascii.Native2AsciiAdapter;
  +import 
org.apache.tools.ant.taskdefs.optional.native2ascii.Native2AsciiAdapterFactory;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Mapper;
   import org.apache.tools.ant.util.FileNameMapper;
  @@ -55,6 +57,15 @@
   }
   
   /**
  + * The value of the reverse attribute.
  + *
  + * @since Ant 1.6.3
  + */
  +public boolean getReverse() {
  +return reverse;
  +}
  +
  +/**
* Set the encoding to translate to/from.
* If unset, the default encoding for the JVM is used.
*
  @@ -66,6 +77,15 @@
   }
   
   /**
  + * The value of the reverse attribute.
  + *
  + * @since Ant 1.6.3
  + */
  +public String getEncoding() {
  +return encoding;
  +}
  +
  +/**
* Set the source directory in which to find files to convert.
*
* @param srcDir directory to find input file in.
  @@ -181,29 +201,15 @@
* @param srcName name of the input file.
* @param destName name of the input file.
*/
  -private void convert(String srcName, String destName) throws 
BuildException {
  -
  -Commandline cmd = new Commandline();  // Command line to run
  +private void convert(String srcName, String destName) 
  +throws BuildException {
   File srcFile; // File to convert
   File destFile;// where to put the results
   
  -// Set up the basic args (this could be done once, but
  -// it's cleaner here)
  -if (reverse) {
  -cmd.createArgument().setValue("-reverse");
  -}
  -
  -if (encoding != null) {
  -cmd.createArgument().setValue("-encoding");
  -cmd.createArgument().setValue(encoding);
  -}
  -
   // Build the full file names
   srcFile = new File(srcDir, srcName);
   destFile = new File(destDir, destName);
   
  -cmd.createArgument().setFile(srcFile);
  -cmd.createArgument().setFile(destFile);
   // Make sure we're not about to clobber something
   if (srcFile.equals(destFile)) {
   throw new BuildException("file " + srcFile
  @@ -223,9 +229,9 @@
   }
   
   log("converting " + srcName, Project.MSG_VERBOSE);
  -sun.tools.native2ascii.Main n2a
  -= new sun.tools.native2ascii.Main();
  -if (!n2a.convert(cmd.getArguments())) {
  +Native2AsciiAdapter ad = 
  +Native2AsciiAdapterFactory.getAdapter(null, this);
  +if (!ad.convert(this, srcFile, destFile)) {
   throw new BuildException("conversion failed");
   }
   }
  

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii Native2AsciiAdapter.java

2005-01-28 Thread bodewig
bodewig 2005/01/28 08:51:10

  Modified:src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
Native2AsciiAdapter.java
  Log:
  typo
  
  Revision  ChangesPath
  1.2   +1 -1  
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
  
  Index: Native2AsciiAdapter.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Native2AsciiAdapter.java  28 Jan 2005 16:49:34 -  1.1
  +++ Native2AsciiAdapter.java  28 Jan 2005 16:51:10 -  1.2
  @@ -17,7 +17,7 @@
   package org.apache.tools.ant.taskdef.optional.native2ascii;
   
   import java.io.File;
  -import org.apache.tools.ant.taskdef.optional.Native2Ascii;
  +import org.apache.tools.ant.taskdefs.optional.Native2Ascii;
   
   public interface Native2AsciiAdapter {
   boolean convert(Native2Ascii args, File srcFile, File destFile);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii Native2AsciiAdapter.java

2005-01-28 Thread bodewig
bodewig 2005/01/28 08:49:34

  Added:   src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
Native2AsciiAdapter.java
  Log:
  First step towards a facade implementation of native2ascii, will support Sun 
and Kaffe versions
  
  Revision  ChangesPath
  1.1  
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
  
  Index: Native2AsciiAdapter.java
  ===
  /*
   * Copyright  2005 The Apache Software Foundation
   *
   *  Licensed under the Apache License, Version 2.0 (the "License");
   *  you may not use this file except in compliance with the License.
   *  You may obtain a copy of the License at
   *
   *  http://www.apache.org/licenses/LICENSE-2.0
   *
   *  Unless required by applicable law or agreed to in writing, software
   *  distributed under the License is distributed on an "AS IS" BASIS,
   *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   *  See the License for the specific language governing permissions and
   *  limitations under the License.
   *
   */
  package org.apache.tools.ant.taskdef.optional.native2ascii;
  
  import java.io.File;
  import org.apache.tools.ant.taskdef.optional.Native2Ascii;
  
  public interface Native2AsciiAdapter {
  boolean convert(Native2Ascii args, File srcFile, File destFile);
  }
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii - New directory

2005-01-28 Thread bodewig
bodewig 2005/01/28 08:47:24

  ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii - New 
directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



native2ascii

2004-05-11 Thread Tarik El Berrak
Hi 

i'm using ant under eclipse and i want to use native2ascii task to convert some 
files but it doesn' work.
this is what i write































thanks for help


DO NOT REPLY [Bug 23568] - native2ascii task malfunction with property in encoding attribute

2003-10-13 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568

native2ascii task malfunction with property in encoding attribute

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID



--- Additional Comments From [EMAIL PROTECTED]  2003-10-13 08:13 ---
I tried it again and I have to say, that problem was somewhere else. First -
accidently wrong name of property, second - my IDE. I was using ant for initial
compilation and then IDE for incremental ones, but it "compiled" (=copied) also
properties files, and that was the reason, why it started to work on one system
(no IDE usage) but confused me on the second.
I marked bug as invalid, I hope that it is for these kind of "bugs".
Sorry for your time... and thanks for ant itself ;-)

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23568] - native2ascii task malfunction with property in encoding attribute

2003-10-10 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568

native2ascii task malfunction with property in encoding attribute





--- Additional Comments From [EMAIL PROTECTED]  2003-10-10 10:53 ---
So if property evaluation is no problem, what is the problem?

the encoding you specify will be passed literally as value for the -encoding
argument to sun.tools.native2ascii.Main#convert - which may be different from
passing it in on the command line.

Do you have an example of  producing a different result than the
Sun tool when you specify the same value for the encoding attribute?

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23568] - native2ascii task malfunction with property in encoding attribute

2003-10-06 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568

native2ascii task malfunction with property in encoding attribute





--- Additional Comments From [EMAIL PROTECTED]  2003-10-06 15:26 ---
When I sent this I was thinking about property name... so I tried "encoding". I
really don't know, what is involved in this task, because I had found few of
behaviours:
- "ISO-8859-2" written directly - works when I have no locales set (in linux)
- "ISO-8859-2" directly - does not work - destination file is also Latin 2 - on
account where I have set sk_SK locales
- "ISO8859_2" (canonical name for java.io) works perfectly on both
(Well I know, that this canonical form should be used, but native2ascii is
accepting both and the form of java.nio.* (ISO-8859-2) is closer to ISO name, so
I like it. :-)) I iterated to "ISO8859_2" without property, but I'm not happy,
that it does not work like Sun's tool.

file.encoding was really a bad name for property and like I said... it works in
different ways on different system (maybe unix locales was involved). \ufffd was
produced only with this property name. Property evaluation is no problem 
actually.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23568] - native2ascii task malfunction with property in encoding attribute

2003-10-06 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568

native2ascii task malfunction with property in encoding attribute





--- Additional Comments From [EMAIL PROTECTED]  2003-10-06 13:23 ---
Does it work if you use a different name for your property?

file.encoding is a system property.  As such it has been set before Ant really
starts.  As Ant properties are immutable, you cannot change its value (but 
should
get a warning).

I guess you always see you platform's defualt encoding being used, that's why 
you
think it fails.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23568] New: - native2ascii task malfunction with property in encoding attribute

2003-10-02 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23568

native2ascii task malfunction with property in encoding attribute

   Summary: native2ascii task malfunction with property in encoding
attribute
   Product: Ant
   Version: 1.5.4
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: Minor
  Priority: Other
 Component: Core tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If I use native2ascii task with encoding defined by property, it does not work
properly - build.xml snippet follows:





Every eastern letter is escapted as \ufffd what is actualy wrong. But (in
desperation) when I tried the same with ISO-8859-2 written in encoding attribute
directly - it works properly the same way original Sun's native2ascii works. (I
had to use this just because of this bug.)

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23440] - imporove native2ascii task for opensource JVM

2003-09-30 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23440>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23440

imporove native2ascii task for opensource JVM

[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|Normal  |Enhancement

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23440] - imporove native2ascii task for opensource JVM

2003-09-26 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23440>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23440

imporove native2ascii task for opensource JVM





--- Additional Comments From [EMAIL PROTECTED]  2003-09-26 17:41 ---
In ant 1.6 and ant 1.7 there is an escapeunicode filter which is doing the same
as  the native2ascii task. Maybe the best would be to refactor the native2ascii
task around .
This would be a change for ant 1.7.
Cheers, 
Antoine

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23440] New: - imporove native2ascii task for opensource JVM

2003-09-26 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23440>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23440

imporove native2ascii task for opensource JVM

   Summary: imporove native2ascii task for opensource JVM
   Product: Ant
   Version: 1.7Alpha (nightly)
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Optional Tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Hi ant,

Current native2ascii task call just SUN's native2ascii. This is big restrict for
Open Source JavaVM like JikesRVM,Kaffe,GCJ,etc...
I wrote patch for remove dependency from SUN's native2ascii. This patch help
better support for opensource JVM. The patch is here:

http://yamaguch.sytes.net/~tora/tmp/ant-native2ascii.patch

Could you commit it?


regargs,

Takashi Okamoto

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 10497] - Provide native2ascii as a FilterReader

2003-03-14 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10497>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10497

Provide native2ascii as a FilterReader

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
   Target Milestone|--- |1.6



--- Additional Comments From [EMAIL PROTECTED]  2003-03-14 15:20 ---
 has been added, it might get renamed later, but you should give 
it
a try with a nightly build of 2003-03-15 or later.