[Jnode-svn-commits] SF.net SVN: jnode:[5274] trunk/core

[<ls...@us...>]

Revision: 5274
          http://jnode.svn.sourceforge.net/jnode/?rev=5274&view=rev
Author:   lsantha
Date:     2009-04-15 08:15:46 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
Removing classlib fom jnode.

Modified Paths:
--------------
    trunk/core/build.xml
    trunk/core/core.iml

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2009-04-15 08:11:24 UTC (rev 5273)
+++ trunk/core/build.xml	2009-04-15 08:15:46 UTC (rev 5274)
@@ -113,12 +113,6 @@
       <fileset dir="${my-src.dir}/classpath/java" includes="**/*.properties"/>
       <fileset dir="${my-src.dir}/classpath/vm" includes="**/*.security"/>
       <fileset dir="${my-src.dir}/classpath/tools" includes="**/*.jav"/>
-      <fileset dir="${my-src.dir}/openjdk/java" includes="**/*.jav"/>
-      <fileset dir="${my-src.dir}/openjdk/javax" includes="**/*.jav"/>
-      <fileset dir="${my-src.dir}/openjdk/org" includes="**/*.jav"/>
-      <fileset dir="${my-src.dir}/openjdk/com" includes="**/*.jav"/>
-      <fileset dir="${my-src.dir}/openjdk/sun" includes="**/*.jav"/>
-      <fileset dir="${my-src.dir}/openjdk/svm" includes="**/*.jav"/>
       <fileset dir="${my-src.dir}/openjdk/vm" includes="**/*.jav"/>
     </copy>
     <ExpandTest classname="PrimitiveIntTest" type="int"/>
@@ -176,16 +170,7 @@
 	    <fileset dir="${my-src.dir}/classpath/ext" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/classpath/vm" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/classpath/tools" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/java" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/javax" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/org" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/com" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/sun" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/svm" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/openjdk/vm" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/corba" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/jaxws" excludes="${my-non-resources}"/>
-	    <fileset dir="${my-src.dir}/openjdk/langtools" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/icedtea" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/core" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/endorsed/nanoxml" excludes="${my-non-resources}"/>

Modified: trunk/core/core.iml
===================================================================
--- trunk/core/core.iml	2009-04-15 08:11:24 UTC (rev 5273)
+++ trunk/core/core.iml	2009-04-15 08:15:46 UTC (rev 5274)
@@ -18,15 +18,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/endorsed/nanoxml" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/icedtea" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/mmtk-vm" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/com" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/corba" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/javax" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/jaxws" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/langtools" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/org" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/sun" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/openjdk/svm" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/openjdk/vm" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/template" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
@@ -67,7 +58,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/junit.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jmock-1.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -76,7 +67,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jmock-1.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jmock-cglib-1.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -85,7 +76,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jmock-cglib-1.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/cglib-2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -94,16 +85,16 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/cglib-2.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/junit-4.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/junit-4.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../all/lib/classlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.