Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [4167] trunk
|
From: <ls...@us...> - 2008-05-31 12:45:11
|
Revision: 4167
http://jnode.svn.sourceforge.net/jnode/?rev=4167&view=rev
Author: lsantha
Date: 2008-05-31 05:45:06 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Moved nanoxml to endrosed sources.
Modified Paths:
--------------
trunk/all/build.xml
trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
trunk/builder/src/builder/org/jnode/build/PluginList.java
trunk/builder/src/builder/org/jnode/build/PluginTask.java
trunk/core/core.iml
trunk/core/descriptors/nanoxml.xml
trunk/core/src/test/org/jnode/test/NanoXmlTest.java
trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java
Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/all/build.xml 2008-05-31 12:45:06 UTC (rev 4167)
@@ -443,7 +443,7 @@
<pathelement location="${root.dir}/core/src/openjdk/org"/>
<pathelement location="${root.dir}/core/src/openjdk/sun"/>
<pathelement location="${root.dir}/core/src/openjdk/vm"/>
- <pathelement location="${root.dir}/core/src/nanoxml"/>
+ <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/>
<pathelement location="${root.dir}/core/src/core"/>
<pathelement location="${root.dir}/core/src/vmmagic"/>
<pathelement location="${root.dir}/core/src/driver"/>
@@ -468,7 +468,7 @@
<pathelement location="${root.dir}/core/src/classpath/vm"/>
<pathelement location="${root.dir}/core/src/openjdk/sun"/>
<pathelement location="${root.dir}/core/src/openjdk/vm"/>
- <pathelement location="${root.dir}/core/src/nanoxml"/>
+ <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/>
</sourcepath>
<package name="org.mmtk.*"/>
<package name="org.jnode.vm.memmgr.mmtk.*"/>
@@ -496,7 +496,7 @@
<pathelement location="${root.dir}/core/src/core"/>
<pathelement location="${root.dir}/core/src/driver"/>
<pathelement location="${root.dir}/core/src/mmtk-vm"/>
- <pathelement location="${root.dir}/core/src/nanoxml"/>
+ <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/>
<pathelement location="${root.dir}/core/src/test"/>
<pathelement location="${root.dir}/core/src/vmmagic"/>
<pathelement location="${root.dir}/distr/src/install"/>
Modified: trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java 2008-05-31 12:45:06 UTC (rev 4167)
@@ -27,8 +27,8 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.LinkedList;
-import nanoxml.XMLElement;
-import nanoxml.XMLParseException;
+import org.jnode.nanoxml.XMLElement;
+import org.jnode.nanoxml.XMLParseException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Jar;
Modified: trunk/builder/src/builder/org/jnode/build/PluginList.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/PluginList.java 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/builder/src/builder/org/jnode/build/PluginList.java 2008-05-31 12:45:06 UTC (rev 4167)
@@ -33,7 +33,7 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import nanoxml.XMLElement;
+import org.jnode.nanoxml.XMLElement;
import org.apache.tools.ant.taskdefs.Manifest;
import org.apache.tools.ant.taskdefs.ManifestException;
import org.jnode.plugin.PluginException;
Modified: trunk/builder/src/builder/org/jnode/build/PluginTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/PluginTask.java 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/builder/src/builder/org/jnode/build/PluginTask.java 2008-05-31 12:45:06 UTC (rev 4167)
@@ -32,8 +32,8 @@
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import nanoxml.XMLElement;
-import nanoxml.XMLParseException;
+import org.jnode.nanoxml.XMLElement;
+import org.jnode.nanoxml.XMLParseException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.taskdefs.Jar;
Modified: trunk/core/core.iml
===================================================================
--- trunk/core/core.iml 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/core/core.iml 2008-05-31 12:45:06 UTC (rev 4167)
@@ -13,9 +13,9 @@
<sourceFolder url="file://$MODULE_DIR$/src/classpath/vm" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/core" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" />
+ <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/nanoxml" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/com" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/openjdk/javax" isTestSource="false" />
Modified: trunk/core/descriptors/nanoxml.xml
===================================================================
--- trunk/core/descriptors/nanoxml.xml 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/core/descriptors/nanoxml.xml 2008-05-31 12:45:06 UTC (rev 4167)
@@ -10,7 +10,7 @@
<runtime>
<library name="jnode-core.jar">
- <export name="nanoxml.*"/>
+ <export name="org.jnode.nanoxml.*"/>
</library>
</runtime>
Modified: trunk/core/src/test/org/jnode/test/NanoXmlTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/NanoXmlTest.java 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/core/src/test/org/jnode/test/NanoXmlTest.java 2008-05-31 12:45:06 UTC (rev 4167)
@@ -24,7 +24,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.util.Hashtable;
-import nanoxml.XMLElement;
+import org.jnode.nanoxml.XMLElement;
/**
* @author Ewout Prangsma (ep...@us...)
Modified: trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java 2008-05-31 12:43:00 UTC (rev 4166)
+++ trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java 2008-05-31 12:45:06 UTC (rev 4167)
@@ -33,7 +33,7 @@
import java.util.List;
import java.util.Map;
-import nanoxml.XMLElement;
+import org.jnode.nanoxml.XMLElement;
import org.apache.log4j.Logger;
import org.jnode.net.ipv4.IPv4Address;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|