Return-Path: 
 <harmony-commits-return-908-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org
Received: (qmail 95899 invoked from network); 17 Feb 2006 07:03:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 Feb 2006 07:03:28 -0000
Received: (qmail 15770 invoked by uid 500); 17 Feb 2006 07:03:28 -0000
Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org
Received: (qmail 15697 invoked by uid 500); 17 Feb 2006 07:03:27 -0000
Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:harmony-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:harmony-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:harmony-commits@incubator.apache.org>
List-Id: <harmony-commits.incubator.apache.org>
Reply-To: harmony-dev@incubator.apache.org
Delivered-To: mailing list harmony-commits@incubator.apache.org
Received: (qmail 15686 invoked by uid 99); 17 Feb 2006 07:03:27 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2006 23:03:27 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 16 Feb 2006 23:03:26 -0800
Received: (qmail 95654 invoked by uid 65534); 17 Feb 2006 07:03:06 -0000
Message-ID: <20060217070306.95653.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r378450 -
 /incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Date: Fri, 17 Feb 2006 07:03:06 -0000
To: harmony-commits@incubator.apache.org
From: geirm@apache.org
X-Mailer: svnmailer-1.0.6
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: geirm
Date: Thu Feb 16 23:03:04 2006
New Revision: 378450

URL: http://svn.apache.org/viewcvs?rev=378450&view=rev
Log:
mods to support the switch from security -> security2


Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=378450&r1=378449&r2=378450&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Feb 16 23:03:04 2006
@@ -122,7 +122,7 @@
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
 
-        <!-- Create x-net (javax.net from security2) jar -->
+        <!-- Create x-nets jar -->
         <jar destfile="${components.output}/x-net.jar" manifest="x-net/META-INF/MANIFEST.MF">
             <fileset dir="${build.output}"
                 includesfile="${components.patternsets}/x-net.txt"
@@ -174,8 +174,8 @@
             <src path="luni/src/main/java" />
             <src path="nio/src/main/java" />
             <src path="nio_char/src/main/java" />
-            <src path="security2/src/common/javasrc" />
-            <src path="security2/src/windows/javasrc" />
+            <src path="security/src/common/javasrc" />
+            <src path="security/src/windows/javasrc" />
 
             <src path="x-net/src/main/java/" />
 
@@ -211,15 +211,6 @@
             <fileset dir="nio_char/src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
-<!--  gmj : HACK :
-            <fileset dir="security/src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
--->
-
-            <fileset dir="security/src">
-                <exclude name="**/*.java" />
-            </fileset>
 
             <fileset dir="security/src">
                 <exclude name="**/*.java" />
@@ -274,18 +265,9 @@
             </fileset>
         </copy>
 
-<!--  gmj : HACK : - use from security2
-
-        <copy todir="${target.output}/jre/lib/security" overwrite="yes">
-            <fileset dir="${depends.files}">
-                <include name="java.policy" />
-                <include name="java.security" />
-            </fileset>
-        </copy>
- -->
     	
         <copy todir="${target.output}/jre/lib/security" overwrite="yes">
-            <fileset dir="../modules/security2/src/java.home/lib/security/">
+            <fileset dir="../modules/security/src/java.home/lib/security/">
                 <include name="drl.policy" />
                 <include name="java.security" />
             </fileset>