[Mulgara-svn] r402 - in branches/nw-interface/src/jar/query/java/org/mulgara/query: . command

pag at mulgara.org pag at mulgara.org
Thu Sep 6 20:11:22 UTC 2007


Author: pag
Date: 2007-09-06 15:11:22 -0500 (Thu, 06 Sep 2007)
New Revision: 402

Added:
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Backup.java
Removed:
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Backup.java
Modified:
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ApplyRules.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/BooleanSetCommand.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Command.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Commit.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/CreateGraph.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/DataTx.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Deletion.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/DropGraph.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ExecuteScript.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Help.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Insertion.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Load.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/LocalCommand.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Modification.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/NullOp.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Quit.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Restore.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Rollback.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ServerCommand.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetAutoCommit.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetCommand.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetTime.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetUser.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/command/TransactionCommand.java
Log:
Renamed from ast to operation

Copied: branches/nw-interface/src/jar/query/java/org/mulgara/query/command (from rev 389, branches/nw-interface/src/jar/query/java/org/mulgara/query/ast)

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ApplyRules.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/ApplyRules.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ApplyRules.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 import java.rmi.RemoteException;

Deleted: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Backup.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Backup.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Backup.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,81 +0,0 @@
-/**
- * The contents of this file are subject to the Open Software License
- * Version 3.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.opensource.org/licenses/osl-3.0.txt
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- */
-package org.mulgara.query.ast;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.log4j.Logger;
-import org.mulgara.connection.Connection;
-import org.mulgara.itql.TqlInterpreter;
-
-/**
- * Represents a command to back data up from a model.
- *
- * @created Aug 19, 2007
- * @author Paul Gearon
- * @copyright &copy; 2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
- * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
- */
-public class Backup extends DataTx {
-
-  /** The logger */
-  static final Logger logger = Logger.getLogger(Backup.class.getName());
-
-  /** The URI for the server. */
-  private URI serverUri;
-
-  /**
-   * Creates a new Backup command.
-   * @param source The data to back up.  May be a server or just a single graph.
-   * @param destination The location where to back the data up.
-   *        Only file URLs supported at the moment.
-   */
-  public Backup(URI source, URI destination) {
-    super(source, destination);
-    calcServerUri(source);
-  }
-
-  /**
-   * @return The URI of the destination graph.
-   */
-  public URI getServerURI() throws UnsupportedOperationException {
-    return serverUri;
-  }
-
-  public Object execute(Connection conn) throws Exception {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  
-  /**
-   * Sets the server URI for this server operation.
-   * @param uri The URI to determine the server URI from.
-   */
-  private void calcServerUri(URI uri) {
-    assert serverUri != null;
-    // check if backing up a graph or a server
-    String fragment = uri.getFragment();
-    if (fragment == null) {
-      if (logger.isDebugEnabled()) logger.debug("Backup for server: " + uri);
-      serverUri = uri;
-    } else {
-      String serverUriString = uri.toString().replaceAll("#" + fragment, "");
-      try {
-        serverUri = new URI(serverUriString);
-      } catch (URISyntaxException e) {
-        throw new Error("Unable to truncate a fragment from a valid URI");
-      }
-    }
-  }
-}

Copied: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Backup.java (from rev 399, branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Backup.java)
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Backup.java	2007-09-05 20:11:46 UTC (rev 399)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Backup.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -0,0 +1,154 @@
+/*
+ * The contents of this file are subject to the Open Software License
+ * Version 3.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.opensource.org/licenses/osl-3.0.txt
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ */
+package org.mulgara.query.operation;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.rmi.NoSuchObjectException;
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+
+import org.apache.log4j.Logger;
+import org.mulgara.connection.Connection;
+import org.mulgara.query.QueryException;
+
+import edu.emory.mathcs.util.remote.io.RemoteOutputStream;
+import edu.emory.mathcs.util.remote.io.server.impl.RemoteOutputStreamSrvImpl;
+
+/**
+ * Represents a command to back data up from a model.
+ *
+ * @created Aug 19, 2007
+ * @author Paul Gearon
+ * @copyright &copy; 2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
+ * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
+ */
+public class Backup extends DataTx {
+  
+  private static final String FILE = "file";
+
+  /** The logger */
+  static final Logger logger = Logger.getLogger(Backup.class.getName());
+
+  /** The URI for the server. */
+  private URI serverUri;
+
+  /**
+   * Creates a new Backup command.
+   * @param source The data to back up.  May be a server or just a single graph.
+   * @param destination The location where to back the data up.
+   *        Only file URLs supported at the moment.
+   */
+  public Backup(URI source, URI destination) {
+    super(source, destination);
+    if (!destination.getScheme().equals(FILE)) throw new IllegalArgumentException("Backups must be sent to a file");
+    calcServerUri(source);
+  }
+
+  /**
+   * @return The URI of the destination graph.
+   */
+  public URI getServerURI() throws UnsupportedOperationException {
+    return serverUri;
+  }
+
+
+  /**
+   * Perform a backup on a server.
+   * @param conn The connection to talk to the server on.
+   * @return Nothing.
+   * @throws QueryException There was an error asking the server to perform the backup.
+   * @throws MalformedURLException The destination is not a valid file.
+   */
+  public Object execute(Connection conn) throws QueryException, MalformedURLException {
+    FileOutputStream fileOutputStream = null;
+    String destinationFile = this.getDestination().toURL().getPath();
+    try {
+      fileOutputStream = new FileOutputStream(destinationFile);
+    } catch (FileNotFoundException ex) {
+      throw new QueryException("File " + destinationFile + " cannot be created for backup. ", ex);
+    }
+
+    backup(conn, serverUri, fileOutputStream);
+
+    return null;
+  }
+
+
+  /**
+   * Public interface to perform a backup into an output stream.
+   * This is callable directly, without an AST interface.
+   * @param conn The connection to a server to be backed up.
+   * @param source The URI describing the graph on the server to back up.
+   * @param outputStream The output which will receive the data to be backed up.
+   * @throws QueryException There was an error asking the server to perform the backup.
+   */
+  public static void backup(Connection conn, URI source, OutputStream outputStream) throws QueryException {
+    // open and wrap the outputstream
+    RemoteOutputStreamSrvImpl srv = new RemoteOutputStreamSrvImpl(outputStream);
+
+    // prepare it for exporting
+    try {
+      UnicastRemoteObject.exportObject(srv);
+    } catch (RemoteException rex) {
+      throw new QueryException("Unable to backup "+ source + " to an output stream", rex);
+    }
+
+    outputStream = new RemoteOutputStream(srv);
+
+    // perform the backup
+    try {
+      conn.getSession().backup(source, outputStream);
+    } finally {
+      // cleanup the output
+      if (outputStream != null) {
+        try {
+          outputStream.close();
+        } catch (IOException ioe ) {};
+      }
+      // cleanup the RMI for the output stream
+      if (srv != null) {
+        try {
+          UnicastRemoteObject.unexportObject(srv, false);
+        } catch (NoSuchObjectException ex) {};
+      }
+    }
+  }
+
+
+  /**
+   * Sets the server URI for this server operation.
+   * @param uri The URI to determine the server URI from.
+   */
+  private URI calcServerUri(URI uri) {
+    assert serverUri != null;
+    // check if backing up a graph or a server
+    String fragment = uri.getFragment();
+    if (fragment == null) {
+      if (logger.isDebugEnabled()) logger.debug("Backup for server: " + uri);
+      serverUri = uri;
+    } else {
+      String serverUriString = uri.toString().replaceAll("#" + fragment, "");
+      try {
+        serverUri = new URI(serverUriString);
+      } catch (URISyntaxException e) {
+        throw new Error("Unable to truncate a fragment from a valid URI");
+      }
+    }
+    return serverUri;
+  }
+}

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/BooleanSetCommand.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/BooleanSetCommand.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/BooleanSetCommand.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 /**
  * This class indicates a command for the UI to set a local boolean property. 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Command.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Command.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Command.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Commit.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Commit.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Commit.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 
 import org.mulgara.connection.Connection;

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/CreateGraph.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/CreateGraph.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/CreateGraph.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/DataTx.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/DataTx.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/DataTx.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Deletion.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Deletion.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Deletion.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 import java.util.Set;

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/DropGraph.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/DropGraph.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/DropGraph.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ExecuteScript.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/ExecuteScript.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ExecuteScript.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URL;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Help.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Help.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Help.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import org.mulgara.connection.Connection;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Insertion.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Insertion.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Insertion.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 import java.util.Set;

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Load.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Load.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Load.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/LocalCommand.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/LocalCommand.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/LocalCommand.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Modification.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Modification.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Modification.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,5 +1,17 @@
-package org.mulgara.query.ast;
+/*
+ * The contents of this file are subject to the Open Software License
+ * Version 3.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.opensource.org/licenses/osl-3.0.txt
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ */
 
+package org.mulgara.query.operation;
+
 import java.net.URI;
 import java.util.Set;
 
@@ -68,4 +80,4 @@
     return statements;
   }
 
-}
\ No newline at end of file
+}

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/NullOp.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/NullOp.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/NullOp.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import org.mulgara.connection.Connection;
 
@@ -24,7 +24,7 @@
 public class NullOp extends LocalCommand {
 
   /**
-   * @see org.mulgara.query.ast.Command#isUICommand()
+   * @see org.mulgara.operation.Command#isUICommand()
    */
   public boolean isUICommand() {
     return false;

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Quit.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Quit.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Quit.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import org.mulgara.connection.Connection;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Restore.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Restore.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Restore.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Rollback.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Rollback.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/Rollback.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 
 import org.mulgara.connection.Connection;

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ServerCommand.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/ServerCommand.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/ServerCommand.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 import java.util.Set;

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetAutoCommit.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/SetAutoCommit.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetAutoCommit.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import org.mulgara.connection.Connection;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetCommand.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/SetCommand.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetCommand.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 /**
  * This class indicates a command for the UI to set a local property. 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetTime.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/SetTime.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetTime.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -1,4 +1,4 @@
-/**
+/*
  * The contents of this file are subject to the Open Software License
  * Version 3.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  */
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import org.mulgara.connection.Connection;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetUser.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/SetUser.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/SetUser.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/command/TransactionCommand.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/TransactionCommand.java	2007-08-29 01:21:25 UTC (rev 389)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/command/TransactionCommand.java	2007-09-06 20:11:22 UTC (rev 402)
@@ -10,7 +10,7 @@
  * under the License.
  */
 
-package org.mulgara.query.ast;
+package org.mulgara.query.operation;
 
 import java.net.URI;
 
@@ -61,4 +61,4 @@
     return resultMessage;
   }
 
-}
\ No newline at end of file
+}




More information about the Mulgara-svn mailing list