Return-Path: 
 <scm-return-37941-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 79145 invoked from network); 13 Aug 2009 15:02:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 13 Aug 2009 15:02:29 -0000
Received: (qmail 90046 invoked by uid 500); 13 Aug 2009 15:02:36 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 89998 invoked by uid 500); 13 Aug 2009 15:02:35 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 89974 invoked by uid 99); 13 Aug 2009 15:02:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Aug 2009 15:02:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 13 Aug 2009 15:02:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 911C62388882; Thu, 13 Aug 2009 15:02:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r803916 - in /geronimo/server/trunk: plugins/pom.xml
 pom.xml
Date: Thu, 13 Aug 2009 15:02:07 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090813150207.911C62388882@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Thu Aug 13 15:02:07 2009
New Revision: 803916

URL: http://svn.apache.org/viewvc?rev=803916&view=rev
Log:
GERONIMO-4763  Another try at running the native2ascii plugin on all platforms.  Thanks to SHawn Jiang for the patch

Modified:
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=803916&r1=803915&r2=803916&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Aug 13 15:02:07 2009
@@ -151,5 +151,36 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles> 
+        <profile>
+            <id>ibmjdk</id>
+            <!-- see GERONIMO-4763.  Apparently the tools.jar needs to be specifically referenced on ibm jdks -->
+            <activation>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>native2ascii-maven-plugin</artifactId>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>com.sun</groupId>
+                                    <artifactId>tools</artifactId>
+                                    <!--the real JDK version could be 1.5 or 1.6-->
+                                    <version>1.5.0</version>
+                                    <scope>system</scope>
+                                    <optional>true</optional>
+                                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles> 
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=803916&r1=803915&r2=803916&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 13 15:02:07 2009
@@ -2374,37 +2374,7 @@
                 <module>assemblies</module>
             </modules>
         </profile>
-
-        <profile>
-            <id>ibmjdk</id>
-            <!-- see GERONIMO-4763.  Apparently the tools.jar needs to be specifically referenced on ibm jdks -->
-            <activation>
-                <file>
-                    <exists>${java.home}/../lib/tools.jar</exists>
-                </file>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>native2ascii-maven-plugin</artifactId>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>com.sun</groupId>
-                                    <artifactId>tools</artifactId>
-                                    <!--the real JDK version could be 1.5 or 1.6-->
-                                    <version>1.5.0</version>
-                                    <scope>system</scope>
-                                    <optional>true</optional>
-                                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                                </dependency>
-                            </dependencies>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
+     
     </profiles>
 
 </project>