Skip to content

Update to OrientDB 2.0. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
okelepko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to OrientDB 2.0. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions services/database/interactivespaces-sandbox-service-database-orientdb/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Installing OrientDB
===================


Master
------

Rename `orientdb-core-2.0.10.jar` into `com.orientechnologies.orientdb-core-2.0.10.jar`
and copy to
`master/master/repository/interactivespaces/resources/bundles/`

Controller
----------

### Jars

Copy the following jars to `controller/bootstrap/`:
* concurrentlinkedhashmap-lru-1.4.1.jar
* orientdb-client-2.0.10.jar
* orientdb-enterprise-2.0.10.jar
* orientdb-server-2.0.10.jar
* snappy-java-1.1.0.1.jar

### Ext file
Create a file named `orientdb.ext` in `controller/config/environment/` with the following content:

`package:sun.misc`
2 changes: 1 addition & 1 deletion services/database/interactivespaces-sandbox-service-database-orientdb/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</library>

<dependencies>
<dependency name="com.orientechnologies.orientdb-core" minimumVersion="1.6.0" maximumVersion="1.8.0" required="true" />
<dependency name="com.orientechnologies.orientdb-core" minimumVersion="1.7.0" maximumVersion="2.2.0" required="true" />
</dependencies>
</project>
2 changes: 2 additions & 0 deletions ...ces/sandbox/service/database/document/orientdb/BasicOrientDbDocumentDatabaseEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

import com.google.common.collect.Lists;

import com.orientechnologies.orient.core.db.ODatabase;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import org.apache.commons.logging.Log;

import java.util.Collection;
Expand Down
24 changes: 14 additions & 10 deletions ...aces/sandbox/service/database/document/orientdb/BasicOrientDbDocumentDatabaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,27 @@

package interactivespaces.sandbox.service.database.document.orientdb;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;

import com.google.common.collect.ImmutableList;

import interactivespaces.InteractiveSpacesException;
import interactivespaces.service.BaseSupportedService;

import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.server.OServer;
import com.orientechnologies.orient.server.OServerMain;
import com.orientechnologies.orient.server.config.OServerConfiguration;
import com.orientechnologies.orient.server.config.OServerEntryConfiguration;
import com.orientechnologies.orient.server.config.OServerNetworkConfiguration;
import com.orientechnologies.orient.server.config.OServerNetworkListenerConfiguration;
import com.orientechnologies.orient.server.config.OServerNetworkProtocolConfiguration;
import com.orientechnologies.orient.server.config.OServerUserConfiguration;
import org.apache.commons.logging.Log;

import java.io.File;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;

/**
* @author Keith M. Hughes
Expand Down Expand Up @@ -55,7 +66,7 @@ public class BasicOrientDbDocumentDatabaseService extends BaseSupportedService {
/**
* Range of ports to which the server tries to bind.
*/
public static final String PORT_RANGE = "2424-2424";
public static final String PORT_RANGE = "2424-2500";

/**
* Username of a server user.
Expand Down Expand Up @@ -114,12 +125,6 @@ public class BasicOrientDbDocumentDatabaseService extends BaseSupportedService {
*/
private final AtomicBoolean active = new AtomicBoolean();

/**
* Pattern for allowed db names. It is more restrictive than is required, yet it is simple
* and allows for more flexibility in implementation.
*/
private final Pattern allowedDbName = Pattern.compile("[A-Za-z0-9_-]+");

/**
* OrientDB server starter/stopper.
*/
Expand Down Expand Up @@ -155,7 +160,6 @@ public void shutdown() {
*/
public OrientDbDocumentDatabaseEndpoint getOrientDbDocumentDatabaseEndpoint(
String databaseName, Log log) {
checkArgument(allowedDbName.matcher(databaseName).matches());
String databaseUrl = DATABASE_URL_PROTOCOL_PLOCAL
+ getSpaceEnvironment().getFilesystem().getDataDirectory(getName()).getAbsolutePath()
+ File.separator + databaseName;
Expand Down
4 changes: 4 additions & 0 deletions ...vespaces/sandbox/service/database/document/orientdb/OrientDbDocumentDatabaseEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
package interactivespaces.sandbox.service.database.document.orientdb;


import interactivespaces.util.resource.ManagedResource;

import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;

/**
* Endpoint for an OrientDB document database.
*/
Expand Down