Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5227] trunk
|
From: <ls...@us...> - 2009-04-06 15:03:29
|
Revision: 5227
http://jnode.svn.sourceforge.net/jnode/?rev=5227&view=rev
Author: lsantha
Date: 2009-04-06 15:03:21 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
Separating jnode specific code from classlib.
Modified Paths:
--------------
trunk/all/conf/openjdk-annotations.properties
trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
trunk/core/build.xml
trunk/core/core.iml
trunk/core/descriptors/org.jnode.vm.core.xml
trunk/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDthreads.java
trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java
trunk/gui/src/awt/org/jnode/awt/font/renderer/SummedAreaTable.java
trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VesaUtils.java
trunk/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java
trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java
trunk/shell/src/shell/org/jnode/shell/syntax/FileArgument.java
Modified: trunk/all/conf/openjdk-annotations.properties
===================================================================
--- trunk/all/conf/openjdk-annotations.properties 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/all/conf/openjdk-annotations.properties 2009-04-06 15:03:21 UTC (rev 5227)
@@ -5,10 +5,12 @@
# package/className.class=<annotations list separated by a ','>
# supported annotations : SharedStatics, MagicPermission
+gnu/java/awt/ClasspathToolkit=SharedStatics
java/awt/EventQueue.class=SharedStatics
java/awt/image/DataBuffer.class=SharedStatics
java/awt/KeyboardFocusManager.class=SharedStatics
java/awt/Toolkit.class=SharedStatics
+java/io/VMIOUtils.class=SharedStatics
java/lang/Thread.class=SharedStatics
java/lang/ThreadLocal.class=SharedStatics
java/lang/Throwable.class=MagicPermission
@@ -31,5 +33,5 @@
sun/awt/image/SunWritableRaster.class=SharedStatics
sun/java2d/Disposer.class=SharedStatics
sun/misc/SharedSecrets.class=SharedStatics
-sun/misc/Unsafe.class=SharedStatics
+sun/misc/Unsafe.class=SharedStatics,MagicPermission
sun/misc/VM.class=SharedStatics
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -33,8 +33,8 @@
import java.util.List;
import java.util.Properties;
import org.apache.tools.ant.BuildException;
-import org.jnode.vm.annotation.MagicPermission;
-import org.jnode.vm.annotation.SharedStatics;
+import org.jnode.annotation.MagicPermission;
+import org.jnode.annotation.SharedStatics;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassAdapter;
import org.objectweb.asm.ClassReader;
Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/core/build.xml 2009-04-06 15:03:21 UTC (rev 5227)
@@ -23,8 +23,6 @@
<pathelement location="${my-src.dir}/classpath/gnu"/>
<pathelement location="${my-src.dir}/classpath/java"/>
<pathelement location="${my-src.dir}/classpath/javax"/>
- <pathelement location="${my-src.dir}/classpath/ext"/>
- <pathelement location="${my-src.dir}/classpath/vm"/>
<pathelement location="${my-src.dir}/classpath/tools"/>
<pathelement location="${my-src.dir}/openjdk/java"/>
<pathelement location="${my-src.dir}/openjdk/javax"/>
@@ -32,8 +30,14 @@
<pathelement location="${my-src.dir}/openjdk/com"/>
<pathelement location="${my-src.dir}/openjdk/sun"/>
<pathelement location="${my-src.dir}/openjdk/svm"/>
- <pathelement location="${my-src.dir}/openjdk/vm"/>
+ <pathelement location="${my-src.dir}/icedtea"/>
+ <pathelement location="${my-src.dir}/classlib"/>
</path>
+ <path id="classpath-sources-vm">
+ <pathelement location="${my-src.dir}/classpath/ext"/>
+ <pathelement location="${my-src.dir}/classpath/vm"/>
+ <pathelement location="${my-src.dir}/openjdk/vm"/>
+ </path>
<path id="classpath-sources-corba">
<pathelement location="${my-src.dir}/openjdk/corba"/>
</path>
@@ -44,13 +48,12 @@
<pathelement location="${my-src.dir}/openjdk/langtools"/>
</path>
<path id="my-sources1">
- <path refid="classpath-sources"/>
+ <path refid="classpath-sources-vm"/>
<pathelement location="${my-src.dir}/core"/>
<pathelement location="${my-src.dir}/endorsed/nanoxml"/>
<pathelement location="${my-src.dir}/vmmagic"/>
<pathelement location="${my-src.dir}/mmtk-vm"/>
<pathelement location="${my-src.dir}/driver"/>
- <pathelement location="${my-src.dir}/icedtea"/>
<pathelement location="${my-src.dir}/test"/>
<pathelement location="${my-src.dir}/emu"/>
</path>
@@ -143,6 +146,14 @@
<pathelement location="${classpath-sources}" />
<pathelement location="${mx4j.jar}"/> <!-- should be in GNU Classpath since java 5.0 -->
</bootclasspath>
+ <src refid="classpath-sources" />
+ <classpath refid="my-cp"/>
+ </jnode.compile>
+ <jnode.compile>
+ <bootclasspath>
+ <pathelement location="${classpath-sources}" />
+ <pathelement location="${mx4j.jar}"/> <!-- should be in GNU Classpath since java 5.0 -->
+ </bootclasspath>
<src refid="my-sources" />
<classpath refid="my-cp"/>
</jnode.compile>
Modified: trunk/core/core.iml
===================================================================
--- trunk/core/core.iml 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/core/core.iml 2009-04-06 15:03:21 UTC (rev 5227)
@@ -5,6 +5,7 @@
<exclude-output />
<exclude-exploded />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/classlib" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/ext" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/gnu" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/java" isTestSource="false" />
Modified: trunk/core/descriptors/org.jnode.vm.core.xml
===================================================================
--- trunk/core/descriptors/org.jnode.vm.core.xml 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/core/descriptors/org.jnode.vm.core.xml 2009-04-06 15:03:21 UTC (rev 5227)
@@ -20,7 +20,7 @@
<export name="org.vmmagic.unboxed.*"/>
<export name="org.jnode.assembler.*"/>
<export name="org.jnode.vm.*"/>
- <export name="org.jnode.vm.annotation.*"/>
+ <export name="org.jnode.annotation.*"/>
<export name="org.jnode.vm.bytecode.*"/>
<export name="org.jnode.vm.classmgr.*"/>
<export name="org.jnode.vm.compiler.*"/>
Modified: trunk/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDthreads.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDthreads.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/fs/src/fs/org/jnode/fs/jifs/directories/JIFSDthreads.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -29,7 +29,7 @@
import org.jnode.fs.jifs.JIFSDirectory;
import org.jnode.fs.jifs.JIFSFile;
import org.jnode.fs.jifs.files.JIFSFthread;
-import org.jnode.vm.annotation.DoPrivileged;
+import org.jnode.annotation.DoPrivileged;
/**
Modified: trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -92,7 +92,7 @@
import org.jnode.driver.video.Surface;
import org.jnode.driver.video.UnknownConfigurationException;
import org.jnode.naming.InitialNaming;
-import org.jnode.vm.annotation.SharedStatics;
+import org.jnode.annotation.SharedStatics;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
import sun.awt.image.ToolkitImage;
Modified: trunk/gui/src/awt/org/jnode/awt/font/renderer/SummedAreaTable.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/renderer/SummedAreaTable.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/gui/src/awt/org/jnode/awt/font/renderer/SummedAreaTable.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -22,7 +22,7 @@
import java.util.BitSet;
import org.jnode.vm.Vm;
-import org.jnode.vm.annotation.Inline;
+import org.jnode.annotation.Inline;
/**
* @author Ewout Prangsma (ep...@us...)
Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -97,7 +97,7 @@
import javax.swing.plaf.metal.OceanTheme;
import org.jnode.awt.JNodeAwtContext;
import org.jnode.awt.JNodeToolkit;
-import org.jnode.vm.annotation.SharedStatics;
+import org.jnode.annotation.SharedStatics;
import sun.awt.AWTAutoShutdown;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VesaUtils.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VesaUtils.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VesaUtils.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -21,7 +21,7 @@
package org.jnode.driver.video.vesa;
import org.vmmagic.unboxed.Address;
-import org.jnode.vm.annotation.MagicPermission;
+import org.jnode.annotation.MagicPermission;
@MagicPermission
public class VesaUtils {
Modified: trunk/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java
===================================================================
--- trunk/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -40,7 +40,7 @@
import org.jnode.net.ethernet.EthernetConstants;
import org.jnode.util.Statistics;
import org.jnode.util.TimeoutException;
-import org.jnode.vm.annotation.SharedStatics;
+import org.jnode.annotation.SharedStatics;
/**
* @author epr
Modified: trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -33,7 +33,7 @@
import org.jnode.net.ProtocolAddress;
import org.jnode.net.Resolver;
import org.jnode.net.ipv4.IPv4Address;
-import org.jnode.vm.annotation.SharedStatics;
+import org.jnode.annotation.SharedStatics;
import org.xbill.DNS.ExtendedResolver;
import org.xbill.DNS.Lookup;
import org.xbill.DNS.Record;
Modified: trunk/shell/src/shell/org/jnode/shell/syntax/FileArgument.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/syntax/FileArgument.java 2009-04-06 14:55:27 UTC (rev 5226)
+++ trunk/shell/src/shell/org/jnode/shell/syntax/FileArgument.java 2009-04-06 15:03:21 UTC (rev 5227)
@@ -26,7 +26,7 @@
import org.jnode.driver.console.CompletionInfo;
import org.jnode.shell.CommandLine.Token;
-import org.jnode.vm.annotation.DoPrivileged;
+import org.jnode.annotation.DoPrivileged;
import sun.security.action.GetPropertyAction;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
