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

[<hag...@us...>]

Revision: 3788
          http://jnode.svn.sourceforge.net/jnode/?rev=3788&view=rev
Author:   hagar-wize
Date:     2008-02-13 07:40:20 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
a little step on the way to have derby running

Modified Paths:
--------------
    trunk/all/build.xml
    trunk/distr/descriptors/derby.xml
    trunk/distr/src/apps/org/jnode/apps/derby/DerbyCommand.java

Added Paths:
-----------
    trunk/distr/lib/derbytools.jar

Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml	2008-02-13 14:54:42 UTC (rev 3787)
+++ trunk/all/build.xml	2008-02-13 15:40:20 UTC (rev 3788)
@@ -60,6 +60,7 @@
     <property name="servlet.jar" value="${root.dir}/distr/lib/servlet-api-2.5-6.1.5.jar" />
     <property name="derby.jar" value="${root.dir}/distr/lib/derby.jar" />
     <property name="derbynet.jar" value="${root.dir}/distr/lib/derbynet.jar" />
+    <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" />
 
     <!-- libraries needed to run tests -->
     <property name="jmock-cglib.jar" value="${root.dir}/core/lib/jmock-cglib-1.0.1.jar"/>
@@ -123,6 +124,7 @@
         <pathelement location="${mauve.jar}"/>
         <pathelement location="${derby.jar}"/>
         <pathelement location="${derbynet.jar}"/>
+        <pathelement location="${derbytools.jar}"/>
     </path>
 
     <path id="cp-jnode">
@@ -250,6 +252,7 @@
             <libalias name="servlet.jar" alias="${servlet.jar}"/>
             <libalias name="derby.jar" alias="${derby.jar}"/>
             <libalias name="derbynet.jar" alias="${derbynet.jar}"/>
+            <libalias name="derbytools.jar" alias="${derbytools.jar}"/>
 
             <descriptors dir="${descriptors.dir}/">
                 <include name="*.xml"/>

Modified: trunk/distr/descriptors/derby.xml
===================================================================
--- trunk/distr/descriptors/derby.xml	2008-02-13 14:54:42 UTC (rev 3787)
+++ trunk/distr/descriptors/derby.xml	2008-02-13 15:40:20 UTC (rev 3788)
@@ -20,9 +20,16 @@
     <library name="derbynet.jar">
       <export name="org.apache.derby.drda.*"/>
       <export name="org.apache.derby.impl.drda.*"/>
-      <export name="org.apache.derby.impl.info.net.prpperties"/>
+      <export name="org.apache.derby.info.net*"/>
       <export name="org.apache.derby.loc.drda.*"/>
     </library>
+    <library name="derbytools.jar">
+      <export name="org.apache.derby.tools.*"/>
+      <export name="org.apache.derby.impl.tools.*"/>
+      <export name="org.apache.derby.iapi.reference.*"/>
+      <export name="org.apache.derby.info.tools*"/>
+      <export name="org.apache.derby.loc.toolsmessages*"/>
+    </library>
     <library name="jnode-distr.jar">
       <export name="org.jnode.apps.derby.*"/>
     </library>
@@ -34,6 +41,8 @@
 
   <extension point="org.jnode.security.permissions">
     <permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
+    <permission class="java.net.SocketPermission" name="*:1527" actions="accept,connect,listen"/>
+    <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/>
   </extension>
 
 </plugin>

Added: trunk/distr/lib/derbytools.jar
===================================================================
(Binary files differ)


Property changes on: trunk/distr/lib/derbytools.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/distr/src/apps/org/jnode/apps/derby/DerbyCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/derby/DerbyCommand.java	2008-02-13 14:54:42 UTC (rev 3787)
+++ trunk/distr/src/apps/org/jnode/apps/derby/DerbyCommand.java	2008-02-13 15:40:20 UTC (rev 3788)
@@ -5,6 +5,7 @@
 
 
 import org.apache.derby.drda.NetworkServerControl;
+import org.apache.derby.impl.drda.NetworkServerControlImpl;
 
 import org.jnode.shell.AbstractCommand;
 import org.jnode.shell.CommandLine;
@@ -19,6 +20,8 @@
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.io.File;
+import java.io.PrintWriter;
+import java.util.Date;
 
 /**
  * Command for handling Derby server.
@@ -42,6 +45,30 @@
     new DerbyCommand().execute(args);
   }
 
+  final void find(long fixedDate)
+  {
+    long d0;
+    int  d1, d2, d3, d4;
+    int  n400, n100, n4, n1;
+    int  year;
+
+    if (fixedDate > 0) {
+    d0 = fixedDate - 1;
+
+        n400 = (int)(d0 / 146097);
+
+        d1 = (int)(d0 % 146097);
+        n100 = d1 / 36524;
+        d2 = d1 % 36524;
+        n4 = d2 / 1461;
+        d3 = d2 % 1461;
+        n1 = d3 / 365;
+        d4 = (d3 % 365) + 1;
+
+      System.out.println(n400);
+    }
+  }
+
   public void execute(CommandLine commandLine, InputStream in, PrintStream out, PrintStream err) throws Exception {
     ParsedArguments arguments = HELP_INFO.parse(commandLine);
     File home_dir = ARG_HOME.getFile(arguments);
@@ -52,6 +79,19 @@
       port = ARG_PORT.getInteger(arguments);
     }
 
-    NetworkServerControl.main(new String[]{command});
+    NetworkServerControlImpl server = new NetworkServerControlImpl();
+
+    try {
+      int server_command = server.parseArgs( new String[]{command} );
+      PrintWriter printWriter = new PrintWriter(out);
+      server.setLogWriter(printWriter);
+      server.start(printWriter);
+    } catch (Exception e) {
+      e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+    }
+
+//    server.executeWork(server_command);
+
+//    NetworkServerControl.main(new String[]{command});
   }
 }
\ No newline at end of file


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