[Jnode-svn-commits] SF.net SVN: jnode:[4750] trunk

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

Revision: 4750
          http://jnode.svn.sourceforge.net/jnode/?rev=4750&view=rev
Author:   lsantha
Date:     2008-11-27 18:43:10 +0000 (Thu, 27 Nov 2008)

Log Message:
-----------
Created emu source tree in core and moved BasicNameSpace and DummyPluginDescriptor to it.

Modified Paths:
--------------
    trunk/core/build.xml
    trunk/core/core.iml
    trunk/distr/src/emu/org/jnode/emu/Emu.java
    trunk/distr/src/test/org/jnode/apps/jpartition/utils/device/DeviceUtils.java
    trunk/gui/src/test/org/jnode/test/gui/Emu.java
    trunk/shell/src/test/org/jnode/test/shell/Cassowary.java

Added Paths:
-----------
    trunk/core/src/emu/
    trunk/core/src/emu/org/
    trunk/core/src/emu/org/jnode/
    trunk/core/src/emu/org/jnode/emu/
    trunk/core/src/emu/org/jnode/emu/naming/
    trunk/core/src/emu/org/jnode/emu/naming/BasicNameSpace.java
    trunk/core/src/emu/org/jnode/emu/plugin/
    trunk/core/src/emu/org/jnode/emu/plugin/model/
    trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java

Removed Paths:
-------------
    trunk/core/src/core/org/jnode/naming/BasicNameSpace.java
    trunk/core/src/core/org/jnode/plugin/model/DummyPluginDescriptor.java

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/core/build.xml	2008-11-27 18:43:10 UTC (rev 4750)
@@ -47,6 +47,7 @@
 	<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>
   <path id="my-sources">
 	<path refid="my-sources1"/>

Modified: trunk/core/core.iml
===================================================================
--- trunk/core/core.iml	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/core/core.iml	2008-11-27 18:43:10 UTC (rev 4750)
@@ -13,6 +13,7 @@
       <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/emu" 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" />

Deleted: trunk/core/src/core/org/jnode/naming/BasicNameSpace.java
===================================================================
--- trunk/core/src/core/org/jnode/naming/BasicNameSpace.java	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/core/src/core/org/jnode/naming/BasicNameSpace.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -1,72 +0,0 @@
-/*
- * $Id: Label.java 4159 2008-05-30 16:15:41Z lsantha $
- *
- * JNode.org
- * Copyright (C) 2003-2006 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public 
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc., 
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-package org.jnode.naming;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
-/**
- * This implementation of NameSpace does not make use of Class.getVmClass() and
- * therefore can be used in JNode applications / test cases / frameworks designed 
- * to run on a classic Java VM.
- * 
- * @author cr...@jn...
- */
-public final class BasicNameSpace extends AbstractNameSpace {
-    protected final Map<Class<?>, Object> namespace = new HashMap<Class<?>, Object>();
-
-    public <T> void bind(Class<T> name, T service)
-        throws NamingException, NameAlreadyBoundException {
-        if (name == null) {
-            throw new IllegalArgumentException("name == null");
-        }
-        synchronized (namespace) {
-            if (namespace.containsKey(name)) {
-                throw new NameAlreadyBoundException(name.getName());
-            }
-            namespace.put(name, service);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T lookup(Class<T> name) throws NameNotFoundException {
-        synchronized (namespace) {
-            T res = (T) namespace.get(name);
-            if (res == null) {
-                throw new NameNotFoundException(name.getName());
-            }
-            return res;
-        }
-    }
-
-    public Set<Class<?>> nameSet() {
-        return namespace.keySet();
-    }
-
-    public void unbind(Class<?> name) {
-        namespace.remove(name);
-    }
-}

Deleted: trunk/core/src/core/org/jnode/plugin/model/DummyPluginDescriptor.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/DummyPluginDescriptor.java	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/core/src/core/org/jnode/plugin/model/DummyPluginDescriptor.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -1,133 +0,0 @@
-package org.jnode.plugin.model;
-
-import org.jnode.plugin.Extension;
-import org.jnode.plugin.ExtensionPoint;
-import org.jnode.plugin.Plugin;
-import org.jnode.plugin.PluginDescriptor;
-import org.jnode.plugin.PluginDescriptorListener;
-import org.jnode.plugin.PluginException;
-import org.jnode.plugin.PluginPrerequisite;
-import org.jnode.plugin.Runtime;
-
-public class DummyPluginDescriptor implements PluginDescriptor {
-
-    private boolean systemPlugin;
-
-    public DummyPluginDescriptor(boolean systemPlugin) {
-        this.systemPlugin = systemPlugin;
-    }
-
-    public void addListener(PluginDescriptorListener listener) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public boolean depends(String id) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public String getCustomPluginClassName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public ExtensionPoint getExtensionPoint(String extensionPointId) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public ExtensionPoint[] getExtensionPoints() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Extension[] getExtensions() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getId() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getLicenseName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getLicenseUrl() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Plugin getPlugin() throws PluginException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public ClassLoader getPluginClassLoader() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public PluginPrerequisite[] getPrerequisites() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public int getPriority() {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    public String getProviderName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getProviderUrl() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Runtime getRuntime() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getVersion() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public boolean hasCustomPluginClass() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public boolean isAutoStart() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public boolean isFragment() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public boolean isSystemPlugin() {
-        return systemPlugin;
-    }
-
-    public void removeListener(PluginDescriptorListener listener) {
-        // TODO Auto-generated method stub
-
-    }
-}

Copied: trunk/core/src/emu/org/jnode/emu/naming/BasicNameSpace.java (from rev 4749, trunk/core/src/core/org/jnode/naming/BasicNameSpace.java)
===================================================================
--- trunk/core/src/emu/org/jnode/emu/naming/BasicNameSpace.java	                        (rev 0)
+++ trunk/core/src/emu/org/jnode/emu/naming/BasicNameSpace.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -0,0 +1,73 @@
+/*
+ * $Id: Label.java 4159 2008-05-30 16:15:41Z lsantha $
+ *
+ * JNode.org
+ * Copyright (C) 2003-2006 JNode.org
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; If not, write to the Free Software Foundation, Inc., 
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package org.jnode.emu.naming;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import org.jnode.naming.AbstractNameSpace;
+
+/**
+ * This implementation of NameSpace does not make use of Class.getVmClass() and
+ * therefore can be used in JNode applications / test cases / frameworks designed 
+ * to run on a classic Java VM.
+ * 
+ * @author cr...@jn...
+ */
+public final class BasicNameSpace extends AbstractNameSpace {
+    protected final Map<Class<?>, Object> namespace = new HashMap<Class<?>, Object>();
+
+    public <T> void bind(Class<T> name, T service)
+        throws NamingException, NameAlreadyBoundException {
+        if (name == null) {
+            throw new IllegalArgumentException("name == null");
+        }
+        synchronized (namespace) {
+            if (namespace.containsKey(name)) {
+                throw new NameAlreadyBoundException(name.getName());
+            }
+            namespace.put(name, service);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T lookup(Class<T> name) throws NameNotFoundException {
+        synchronized (namespace) {
+            T res = (T) namespace.get(name);
+            if (res == null) {
+                throw new NameNotFoundException(name.getName());
+            }
+            return res;
+        }
+    }
+
+    public Set<Class<?>> nameSet() {
+        return namespace.keySet();
+    }
+
+    public void unbind(Class<?> name) {
+        namespace.remove(name);
+    }
+}

Copied: trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java (from rev 4749, trunk/core/src/core/org/jnode/plugin/model/DummyPluginDescriptor.java)
===================================================================
--- trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java	                        (rev 0)
+++ trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -0,0 +1,133 @@
+package org.jnode.emu.plugin.model;
+
+import org.jnode.plugin.Extension;
+import org.jnode.plugin.ExtensionPoint;
+import org.jnode.plugin.Plugin;
+import org.jnode.plugin.PluginDescriptor;
+import org.jnode.plugin.PluginDescriptorListener;
+import org.jnode.plugin.PluginException;
+import org.jnode.plugin.PluginPrerequisite;
+import org.jnode.plugin.Runtime;
+
+public class DummyPluginDescriptor implements PluginDescriptor {
+
+    private boolean systemPlugin;
+
+    public DummyPluginDescriptor(boolean systemPlugin) {
+        this.systemPlugin = systemPlugin;
+    }
+
+    public void addListener(PluginDescriptorListener listener) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public boolean depends(String id) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public String getCustomPluginClassName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public ExtensionPoint getExtensionPoint(String extensionPointId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public ExtensionPoint[] getExtensionPoints() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Extension[] getExtensions() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getId() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getLicenseName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getLicenseUrl() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Plugin getPlugin() throws PluginException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public ClassLoader getPluginClassLoader() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PluginPrerequisite[] getPrerequisites() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public int getPriority() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public String getProviderName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getProviderUrl() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Runtime getRuntime() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getVersion() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public boolean hasCustomPluginClass() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public boolean isAutoStart() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public boolean isFragment() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public boolean isSystemPlugin() {
+        return systemPlugin;
+    }
+
+    public void removeListener(PluginDescriptorListener listener) {
+        // TODO Auto-generated method stub
+
+    }
+}

Modified: trunk/distr/src/emu/org/jnode/emu/Emu.java
===================================================================
--- trunk/distr/src/emu/org/jnode/emu/Emu.java	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/distr/src/emu/org/jnode/emu/Emu.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -24,16 +24,10 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
 
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
-import org.jnode.naming.AbstractNameSpace;
-import org.jnode.naming.BasicNameSpace;
+import org.jnode.emu.naming.BasicNameSpace;
 import org.jnode.naming.InitialNaming;
 import org.jnode.nanoxml.XMLElement;
 import org.jnode.shell.ShellManager;

Modified: trunk/distr/src/test/org/jnode/apps/jpartition/utils/device/DeviceUtils.java
===================================================================
--- trunk/distr/src/test/org/jnode/apps/jpartition/utils/device/DeviceUtils.java	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/distr/src/test/org/jnode/apps/jpartition/utils/device/DeviceUtils.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -19,18 +19,11 @@
 import org.jnode.driver.bus.ide.IDEDevice;
 import org.jnode.fs.service.FileSystemService;
 import org.jnode.fs.service.def.FileSystemPlugin;
-import org.jnode.naming.BasicNameSpace;
+import org.jnode.emu.naming.BasicNameSpace;
+import org.jnode.emu.plugin.model.DummyPluginDescriptor;
 import org.jnode.naming.InitialNaming;
 import org.jnode.naming.NameSpace;
-import org.jnode.plugin.Extension;
-import org.jnode.plugin.ExtensionPoint;
-import org.jnode.plugin.Plugin;
 import org.jnode.plugin.PluginDescriptor;
-import org.jnode.plugin.PluginDescriptorListener;
-import org.jnode.plugin.PluginException;
-import org.jnode.plugin.PluginPrerequisite;
-import org.jnode.plugin.Runtime;
-import org.jnode.plugin.model.DummyPluginDescriptor;
 import org.jnode.test.fs.driver.stubs.StubDeviceManager;
 import org.jnode.util.OsUtils;
 

Modified: trunk/gui/src/test/org/jnode/test/gui/Emu.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/Emu.java	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/gui/src/test/org/jnode/test/gui/Emu.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -2,13 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
 import org.apache.log4j.Logger;
@@ -17,8 +12,7 @@
 import org.jnode.driver.DeviceFinder;
 import org.jnode.driver.DeviceToDriverMapper;
 import org.jnode.driver.DriverException;
-import org.jnode.naming.AbstractNameSpace;
-import org.jnode.naming.BasicNameSpace;
+import org.jnode.emu.naming.BasicNameSpace;
 import org.jnode.naming.InitialNaming;
 import org.jnode.plugin.Extension;
 import org.jnode.plugin.ExtensionPoint;

Modified: trunk/shell/src/test/org/jnode/test/shell/Cassowary.java
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/Cassowary.java	2008-11-26 22:25:38 UTC (rev 4749)
+++ trunk/shell/src/test/org/jnode/test/shell/Cassowary.java	2008-11-27 18:43:10 UTC (rev 4750)
@@ -20,17 +20,10 @@
  */
 package org.jnode.test.shell;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
 import org.apache.log4j.BasicConfigurator;
-import org.jnode.naming.AbstractNameSpace;
-import org.jnode.naming.BasicNameSpace;
+import org.jnode.emu.naming.BasicNameSpace;
 import org.jnode.naming.InitialNaming;
 import org.jnode.shell.ShellManager;
 import org.jnode.shell.alias.AliasManager;


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