Merge branch '2.0.x'

orientechnologies · Apr 14, 2015 · 1b4e3ba · 1b4e3ba
2 parents e990b00 + 461076d
commit 1b4e3ba
Show file tree

Hide file tree

Showing 61 changed files with 1,594 additions and 595 deletions.
diff --git a/_base/script/release.sh → _base/script/release_community.sh b/_base/script/release.sh → _base/script/release_community.sh
diff --git a/_base/script/release_enterprise.sh b/_base/script/release_enterprise.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+if [ -z "$1" ]
+then
+    echo "SYNTAX ERROR, USE: release.sh <version>"
+    exit
+fi
+
+echo "Releasing OrientDB Enterprise $1..."
+
+cp -R distribution/target/orientdb-community-$1-distribution.dir/orientdb-community-$1/ distribution/target/orientdb-community-$1-distribution.dir/orientdb-enterprise-$1/
+
+DIR=distribution/target/orientdb-community-$1-distribution.dir/orientdb-enterprise-$1/
+
+cp ../drivers/orientdb-jdbc/target/orientdb-jdbc-$1.jar $DIR/lib/
+
+cp ../modules/orientdb-lucene/target/orientdb-lucene-$1-dist.jar $DIR/plugins/
+
+cp ../modules/orientdb-etl/target/orientdb-etl-$1.jar $DIR/lib/
+cp ../modules/orientdb-etl/script/oetl.* $DIR/bin/
+
+cd distribution/target/
+rm orientdb-enterprise-$1.tar.gz 
+rm orientdb-enterprise-$1.zip
+
+cd orientdb-community-$1-distribution.dir
+tar cvzf ../orientdb-enterprise-$1.tar.gz orientdb-enterprise-$1
+zip -X -r -9 ../orientdb-enterprise-$1.zip orientdb-enterprise-$1
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
     <property environment="env"/>
     <property name="vendor" value="Orient Technologies Ltd"/>
     <property name="product" value="OrientDB"/>
-    <property name="version" value="2.0.6"/>
+    <property name="version" value="2.0.7"/>
     <condition property="community.release" value="${releaseHome}/orientdb-community-${version}"
                else="../releases/orientdb-community-${version}">
         <isset property="releaseHome"/>

diff --git a/client/pom.xml b/client/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java
@@ -28,7 +28,6 @@
 import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
-import com.orientechnologies.orient.core.exception.ODatabaseException;
 import com.orientechnologies.orient.core.exception.OStorageException;
 import com.orientechnologies.orient.core.index.OIndexManager;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
@@ -230,7 +229,7 @@ public synchronized boolean existsDatabase() throws IOException {
    * @return true if exists, otherwise false
    * @throws IOException
    * @param storageType
-   *          The storage type to check between memory, local and plocal.
+   *          Storage type between "plocal" or "memory".
    */
   public synchronized boolean existsDatabase(final String storageType) throws IOException {
 
@@ -263,10 +262,10 @@ public synchronized boolean existsDatabase(final String storageType) throws IOEx
    * @see #dropDatabase(String)
    * @throws IOException
    * @param storageType
-   *          Type of storage of server database.
+   *          Storage type between "plocal" or "memory".
    */
   @Deprecated
-  public OServerAdmin deleteDatabase(String storageType) throws IOException {
+  public OServerAdmin deleteDatabase(final String storageType) throws IOException {
     return dropDatabase(storageType);
   }
 
@@ -276,8 +275,9 @@ public OServerAdmin deleteDatabase(String storageType) throws IOException {
    * @return The instance itself. Useful to execute method in chain
    * @throws IOException
    * @param storageType
+   *          Storage type between "plocal" or "memory".
    */
-  public synchronized OServerAdmin dropDatabase(String storageType) throws IOException {
+  public synchronized OServerAdmin dropDatabase(final String storageType) throws IOException {
 
     boolean retry = true;
 
@@ -313,7 +313,16 @@ public synchronized OServerAdmin dropDatabase(String storageType) throws IOExcep
     return this;
   }
 
-  public synchronized OServerAdmin freezeDatabase(String storageType) throws IOException {
+  /**
+   * Freezes the database by locking it in exclusive mode.
+   * 
+   * @param storageType
+   *          Storage type between "plocal" or "memory".
+   * @return
+   * @throws IOException
+   * @see #releaseDatabase(String)
+   */
+  public synchronized OServerAdmin freezeDatabase(final String storageType) throws IOException {
 
     try {
       final OChannelBinaryAsynchClient network = storage.beginRequest(OChannelBinaryProtocol.REQUEST_DB_FREEZE);
@@ -333,7 +342,16 @@ public synchronized OServerAdmin freezeDatabase(String storageType) throws IOExc
     return this;
   }
 
-  public synchronized OServerAdmin releaseDatabase(String storageType) throws IOException {
+  /**
+   * Releases a frozen database.
+   * 
+   * @param storageType
+   *          Storage type between "plocal" or "memory".
+   * @return
+   * @throws IOException
+   * @see #freezeDatabase(String)
+   */
+  public synchronized OServerAdmin releaseDatabase(final String storageType) throws IOException {
 
     try {
       final OChannelBinaryAsynchClient network = storage.beginRequest(OChannelBinaryProtocol.REQUEST_DB_RELEASE);
@@ -353,7 +371,19 @@ public synchronized OServerAdmin releaseDatabase(String storageType) throws IOEx
     return this;
   }
 
-  public synchronized OServerAdmin freezeCluster(int clusterId, String storageType) throws IOException {
+  /**
+   * Freezes a cluster by locking it in exclusive mode.
+   * 
+   * @param clusterId
+   *          Id of cluster to freeze
+   * @param storageType
+   *          Storage type between "plocal" or "memory".
+   * @return
+   * @throws IOException
+   * @see #releaseCluster(int, String)
+   */
+
+  public synchronized OServerAdmin freezeCluster(final int clusterId, final String storageType) throws IOException {
 
     try {
       final OChannelBinaryAsynchClient network = storage.beginRequest(OChannelBinaryProtocol.REQUEST_DATACLUSTER_FREEZE);
@@ -376,7 +406,18 @@ public synchronized OServerAdmin freezeCluster(int clusterId, String storageType
     return this;
   }
 
-  public synchronized OServerAdmin releaseCluster(int clusterId, String storageType) throws IOException {
+  /**
+   * Releases a frozen cluster.
+   * 
+   * @param clusterId
+   *          Id of cluster to freeze
+   * @param storageType
+   *          Storage type between "plocal" or "memory".
+   * @return
+   * @throws IOException
+   * @see #freezeCluster(int, String)
+   */
+  public synchronized OServerAdmin releaseCluster(final int clusterId, final String storageType) throws IOException {
 
     try {
       final OChannelBinaryAsynchClient network = storage.beginRequest(OChannelBinaryProtocol.REQUEST_DATACLUSTER_RELEASE);

diff --git a/core/pom.xml b/core/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/core/src/main/java/com/orientechnologies/orient/core/OConstants.java b/core/src/main/java/com/orientechnologies/orient/core/OConstants.java
@@ -20,7 +20,7 @@
 package com.orientechnologies.orient.core;
 
 public class OConstants {
-  public static final String ORIENT_VERSION = "2.0.6";
+  public static final String ORIENT_VERSION = "2.0.7";
 
   public static final String ORIENT_URL     = "www.orientechnologies.com";