1.1 --- a/javacvs/build.xml	Fri Jun 06 13:48:01 2003 +0000
     1.2 +++ b/javacvs/build.xml	Fri Jun 06 15:28:57 2003 +0000
     1.3 @@ -28,14 +28,12 @@
     1.4          <pathelement location="libsrc"/>
     1.5          <pathelement location="../vcscore/netbeans/modules/autoload/vcscore.jar"/>
     1.6          <pathelement location="../diff/netbeans/modules/diff.jar"/>
     1.7 -        <fileset dir="../core/external">
     1.8 +        <fileset dir="../libs/external">
     1.9            <include name="regexp*.jar"/>
    1.10 -          <include name="xml-api*.jar" />
    1.11          </fileset>
    1.12  	<pathelement location="../openide/openide-13javac-workaround.jar"/>
    1.13          <pathelement location="../openide/netbeans/lib/openide.jar"/>
    1.14          <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
    1.15 -<!--        <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!- XXX -->
    1.16        </classpath>
    1.17      </javac>
    1.18      </target>
    1.19 @@ -90,7 +88,7 @@
    1.20         <pathelement location="../openide/netbeans/lib/openide-fs.jar"/>
    1.21         <pathelement location="../openide/netbeans/lib/openide-util.jar"/>
    1.22         <pathelement location="../openide/openide-13javac-workaround.jar"/>
    1.23 -        <fileset dir="../core/external">
    1.24 +        <fileset dir="../libs/external">
    1.25            <include name="regexp*.jar"/>
    1.26          </fileset>
    1.27        </classpath>
    1.28 @@ -99,7 +97,7 @@
    1.29        <classpath>
    1.30         <pathelement location="libsrc"/>
    1.31         <pathelement location="../vcscore/src/"/>
    1.32 -        <fileset dir="../core/external">
    1.33 +        <fileset dir="../libs/external">
    1.34            <include name="regexp*.jar"/>
    1.35          </fileset>
    1.36         <pathelement location="../openide/netbeans/lib/openide-fs.jar"/>
    1.37 @@ -179,7 +177,7 @@
    1.38          <pathelement location="libsrc"/>
    1.39          <pathelement location="../vcscore/netbeans/modules/autoload/vcscore.jar"/>
    1.40          <pathelement location="../diff/netbeans/modules/diff.jar"/>
    1.41 -        <fileset dir="../core/external">
    1.42 +        <fileset dir="../libs/external">
    1.43            <include name="regexp*.jar"/>
    1.44          </fileset>
    1.45  	<pathelement location="../openide/openide-13javac-workaround.jar"/>

     2.1 --- a/javacvs/changelog/build.xml	Fri Jun 06 13:48:01 2003 +0000
     2.2 +++ b/javacvs/changelog/build.xml	Fri Jun 06 15:28:57 2003 +0000
     2.3 @@ -8,7 +8,7 @@
     2.4  http://www.sun.com/
     2.5  
     2.6  The Original Code is NetBeans. The Initial Developer of the Original
     2.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
     2.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     2.9  Microsystems, Inc. All Rights Reserved.
    2.10  -->
    2.11  <project basedir="." default="netbeans" name="changelog">
    2.12 @@ -27,7 +27,7 @@
    2.13          <pathelement location="../../vcscore/netbeans/modules/autoload/vcscore.jar"/>
    2.14          <pathelement location="../../javacvs/netbeans/modules/javacvs.jar"/>
    2.15          <pathelement location="../../javacvs/netbeans/modules/ext/cvslib.jar"/>
    2.16 -        <fileset dir="../../core/external">
    2.17 +        <fileset dir="../../libs/external">
    2.18            <include name="regexp*.jar"/>
    2.19          </fileset>
    2.20  	<pathelement location="../../openide/openide-13javac-workaround.jar"/>

     3.1 --- a/vcscvs/build.xml	Fri Jun 06 13:48:01 2003 +0000
     3.2 +++ b/vcscvs/build.xml	Fri Jun 06 15:28:57 2003 +0000
     3.3 @@ -8,7 +8,7 @@
     3.4  http://www.sun.com/
     3.5  
     3.6  The Original Code is NetBeans. The Initial Developer of the Original
     3.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
     3.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     3.9  Microsystems, Inc. All Rights Reserved.
    3.10  -->
    3.11  
    3.12 @@ -30,7 +30,7 @@
    3.13  	<pathelement location="../openide/openide-13javac-workaround.jar"/>
    3.14          <pathelement location="../openide/netbeans/lib/openide.jar"/>
    3.15          <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
    3.16 -        <fileset dir="../core/external">
    3.17 +        <fileset dir="../libs/external">
    3.18            <include name="regexp*.jar"/>
    3.19          </fileset>
    3.20        </classpath>
    3.21 @@ -103,7 +103,7 @@
    3.22          <fileset dir="../openide/netbeans/lib">
    3.23            <include name="openide*.jar" />
    3.24          </fileset>
    3.25 -        <fileset dir="../core/external">
    3.26 +        <fileset dir="../libs/external">
    3.27            <include name="regexp*.jar"/>
    3.28          </fileset>
    3.29        </classpath>

     4.1 --- a/vcscvs/compat/build.xml	Fri Jun 06 13:48:01 2003 +0000
     4.2 +++ b/vcscvs/compat/build.xml	Fri Jun 06 15:28:57 2003 +0000
     4.3 @@ -8,7 +8,7 @@
     4.4  http://www.sun.com/
     4.5  
     4.6  The Original Code is NetBeans. The Initial Developer of the Original
     4.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
     4.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     4.9  Microsystems, Inc. All Rights Reserved.
    4.10  -->
    4.11  
    4.12 @@ -32,7 +32,7 @@
    4.13          <fileset dir="../../openide/netbeans/lib">
    4.14            <include name="openide*.jar" />
    4.15          </fileset>
    4.16 -        <fileset dir="../../core/external">
    4.17 +        <fileset dir="../../libs/external">
    4.18            <include name="regexp*.jar" />
    4.19          </fileset>
    4.20        </classpath>
    4.21 @@ -105,7 +105,7 @@
    4.22          <fileset dir="../../openide/netbeans/lib">
    4.23            <include name="openide*.jar" />
    4.24          </fileset>
    4.25 -        <fileset dir="../../core/external">
    4.26 +        <fileset dir="../../libs/external">
    4.27            <include name="regexp*.jar" />
    4.28          </fileset>
    4.29        </classpath>