You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Vamsavardhana Reddy <c1...@gmail.com> on 2006/12/14 13:54:28 UTC
Re: svn commit: r487197 - /geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
Should this fix go into branches\1.2?
Vamsi
On 12/14/06, dain@apache.org <da...@apache.org> wrote:
>
> Author: dain
> Date: Thu Dec 14 04:48:26 2006
> New Revision: 487197
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=487197
> Log:
> Enum is a reserved java 5 keyword
>
> Modified:
>
> geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
>
> Modified:
> geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java?view=diff&rev=487197&r1=487196&r2=487197
>
> ==============================================================================
> ---
> geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
> (original)
> +++
> geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
> Thu Dec 14 04:48:26 2006
> @@ -120,9 +120,9 @@
> try {
> ZipFile zipFile = new ZipFile(archive);
>
> - Enumeration enum = zipFile.entries();
> - while (enum.hasMoreElements()) {
> - ZipEntry entry = (ZipEntry)enum.nextElement();
> + Enumeration enumX = zipFile.entries();
> + while (enumX.hasMoreElements()) {
> + ZipEntry entry = (ZipEntry)enumX.nextElement();
> if (entry.getName().endsWith("bin/server.jar")) {
> File file = new File(installDirectory, entry.getName
> ());
> dir = file.getParentFile().getParentFile();
>
>
>
Re: svn commit: r487197 - /geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
Posted by Dain Sundstrom <da...@iq80.com>.
Yes. Was too tired to apply it last night. I'll do it now.
-dain
On Dec 14, 2006, at 4:54 AM, Vamsavardhana Reddy wrote:
> Should this fix go into branches\1.2?
>
> Vamsi
>
> On 12/14/06, dain@apache.org <da...@apache.org> wrote: Author: dain
> Date: Thu Dec 14 04:48:26 2006
> New Revision: 487197
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=487197
> Log:
> Enum is a reserved java 5 keyword
>
> Modified:
> geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-
> plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/
> server/InstallerMojoSupport.java
>
> Modified: geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-
> maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/
> geronimo/server/InstallerMojoSupport.java
> URL: http://svn.apache.org/viewvc/geronimo/server/tags/1.2.0-beta/
> maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/
> geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java?
> view=diff&rev=487197&r1=487196&r2=487197
> ======================================================================
> ========
> --- geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-
> plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/
> server/InstallerMojoSupport.java (original)
> +++ geronimo/server/tags/1.2.0-beta/maven-plugins/geronimo-maven-
> plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/
> server/InstallerMojoSupport.java Thu Dec 14 04:48:26 2006
> @@ -120,9 +120,9 @@
> try {
> ZipFile zipFile = new ZipFile(archive);
>
> - Enumeration enum = zipFile.entries();
> - while (enum.hasMoreElements()) {
> - ZipEntry entry = (ZipEntry)enum.nextElement();
> + Enumeration enumX = zipFile.entries();
> + while (enumX.hasMoreElements()) {
> + ZipEntry entry = (ZipEntry)enumX.nextElement();
> if (entry.getName().endsWith("bin/server.jar")) {
> File file = new File(installDirectory,
> entry.getName());
> dir = file.getParentFile().getParentFile();
>
>
>