Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions AOMCouchPersistenceFramework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.esfinge</groupId>
<groupId>net.sf.esfinge</groupId>
<artifactId>aomrolemapper-couch-persistence</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@
</license>
</licenses>


<developers>
<developer>
<name>Eduardo Guerra</name>
Expand Down Expand Up @@ -70,7 +69,7 @@
<dependencies>

<dependency>
<groupId>org.esfinge</groupId>
<groupId>net.sf.esfinge</groupId>
<artifactId>aomrolemapper</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
net.sf.esfinge.aom.persistence.couchdb.CouchAOM

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.esfinge.aom.persistence.couchdb;
package net.sf.esfinge.aom.persistence.couchdb;

import java.util.regex.Pattern;

import org.esfinge.aom.api.model.IEntityType;
import org.esfinge.aom.exceptions.EsfingeAOMException;
import net.sf.esfinge.aom.api.model.IEntityType;
import net.sf.esfinge.aom.exceptions.EsfingeAOMException;

public abstract class BasePersistence {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.esfinge.aom.persistence.couchdb;
package net.sf.esfinge.aom.persistence.couchdb;

import java.util.List;
import java.util.UUID;

import org.esfinge.aom.api.manager.visitors.IEntityTypeVisitor;
import org.esfinge.aom.api.manager.visitors.IEntityVisitor;
import org.esfinge.aom.api.model.IEntity;
import org.esfinge.aom.api.model.IEntityType;
import org.esfinge.aom.api.modelretriever.IModelRetriever;
import org.esfinge.aom.exceptions.EsfingeAOMException;
import net.sf.esfinge.aom.api.manager.visitors.IEntityTypeVisitor;
import net.sf.esfinge.aom.api.manager.visitors.IEntityVisitor;
import net.sf.esfinge.aom.api.model.IEntity;
import net.sf.esfinge.aom.api.model.IEntityType;
import net.sf.esfinge.aom.api.modelretriever.IModelRetriever;
import net.sf.esfinge.aom.exceptions.EsfingeAOMException;

public class CouchAOM extends BasePersistence implements IModelRetriever {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package org.esfinge.aom.persistence.couchdb;
package net.sf.esfinge.aom.persistence.couchdb;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.esfinge.aom.api.manager.visitors.IEntityVisitor;
import org.esfinge.aom.api.model.IEntity;
import org.esfinge.aom.api.model.IEntityType;
import org.esfinge.aom.api.model.IProperty;
import org.esfinge.aom.api.model.IPropertyType;
import org.esfinge.aom.exceptions.EsfingeAOMException;
import org.lightcouch.CouchDbClient;
import org.lightcouch.CouchDbProperties;
import org.lightcouch.DesignDocument;
Expand All @@ -20,6 +14,13 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import net.sf.esfinge.aom.api.manager.visitors.IEntityVisitor;
import net.sf.esfinge.aom.api.model.IEntity;
import net.sf.esfinge.aom.api.model.IEntityType;
import net.sf.esfinge.aom.api.model.IProperty;
import net.sf.esfinge.aom.api.model.IPropertyType;
import net.sf.esfinge.aom.exceptions.EsfingeAOMException;

public class EntityPersistence extends BasePersistence {
private CouchDbClient db;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package org.esfinge.aom.persistence.couchdb;
package net.sf.esfinge.aom.persistence.couchdb;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.esfinge.aom.api.manager.visitors.IEntityTypeVisitor;
import org.esfinge.aom.api.model.IEntityType;
import org.esfinge.aom.api.model.IPropertyType;
import org.esfinge.aom.exceptions.EsfingeAOMException;
import org.lightcouch.CouchDbClient;
import org.lightcouch.CouchDbProperties;
import org.lightcouch.Document;
Expand All @@ -17,6 +13,11 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import net.sf.esfinge.aom.api.manager.visitors.IEntityTypeVisitor;
import net.sf.esfinge.aom.api.model.IEntityType;
import net.sf.esfinge.aom.api.model.IPropertyType;
import net.sf.esfinge.aom.exceptions.EsfingeAOMException;

public class EntityTypePersistence extends BasePersistence {
private CouchDbClient db;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package org.esfinge.aom.persistence.couchdb;
package net.sf.esfinge.aom.persistence.couchdb;

import java.io.File;
import java.io.FileReader;
import java.net.URL;

import org.esfinge.aom.exceptions.EsfingeAOMException;
import org.lightcouch.CouchDbProperties;

import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

import net.sf.esfinge.aom.exceptions.EsfingeAOMException;

public class PersistenceConfig {

private String dbPrefix;
Expand Down
Binary file removed AOMMongoPersistenceFramework/lib/mongo-2.7.3.jar
Binary file not shown.
5 changes: 2 additions & 3 deletions AOMMongoPersistenceFramework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.esfinge</groupId>
<groupId>net.sf.esfinge</groupId>
<artifactId>aomrolemapper-mongo-persistence</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@
</license>
</licenses>


<developers>
<developer>
<name>Eduardo Guerra</name>
Expand Down Expand Up @@ -76,7 +75,7 @@
<dependencies>

<dependency>
<groupId>org.esfinge</groupId>
<groupId>net.sf.esfinge</groupId>
<artifactId>aomrolemapper</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
net.sf.esfinge.aom.persistence.mongodb.MongoAOM

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.esfinge.aom.persistence.mongodb;
package net.sf.esfinge.aom.persistence.mongodb;

public class EntityTypeCollectionMap {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
package org.esfinge.aom.persistence.mongodb;
package net.sf.esfinge.aom.persistence.mongodb;

import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;

import org.bson.types.ObjectId;
import org.esfinge.aom.api.manager.visitors.IEntityTypeVisitor;
import org.esfinge.aom.api.manager.visitors.IEntityVisitor;
import org.esfinge.aom.api.model.IEntity;
import org.esfinge.aom.api.model.IEntityType;
import org.esfinge.aom.api.model.IProperty;
import org.esfinge.aom.api.model.IPropertyType;
import org.esfinge.aom.api.modelretriever.IModelRetriever;
import org.esfinge.aom.exceptions.EsfingeAOMException;

import com.mongodb.BasicDBObject;
import com.mongodb.DB;
Expand All @@ -21,6 +13,15 @@
import com.mongodb.DBObject;
import com.mongodb.Mongo;

import net.sf.esfinge.aom.api.manager.visitors.IEntityTypeVisitor;
import net.sf.esfinge.aom.api.manager.visitors.IEntityVisitor;
import net.sf.esfinge.aom.api.model.IEntity;
import net.sf.esfinge.aom.api.model.IEntityType;
import net.sf.esfinge.aom.api.model.IProperty;
import net.sf.esfinge.aom.api.model.IPropertyType;
import net.sf.esfinge.aom.api.modelretriever.IModelRetriever;
import net.sf.esfinge.aom.exceptions.EsfingeAOMException;


public class MongoAOM implements IModelRetriever {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.esfinge.aom.persistence.mongodb;
package net.sf.esfinge.aom.persistence.mongodb;

import java.io.File;
import java.net.URL;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.esfinge.aom.example.persistence.mongodb;
package net.sf.esfinge.aom.example.persistence.mongodb;

import junit.framework.Assert;
import net.sf.esfinge.aom.persistence.mongodb.MongoAOMConfiguration;

import org.esfinge.aom.persistence.mongodb.MongoAOMConfiguration;
import org.junit.Test;


Expand Down
37 changes: 21 additions & 16 deletions AOMNeo4jPersistenceFramework/.project
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>AOMNeo4JPersistenceFramework</name>
<comment>Persistence framework for Esfinge AOM Role Mapper using Neo4J graph database as backend. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<name>AOMNeo4JPersistenceFramework</name>
<comment>Persistence framework for Esfinge AOM Role Mapper using Neo4J graph database as backend. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
5 changes: 2 additions & 3 deletions AOMNeo4jPersistenceFramework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.esfinge</groupId>
<groupId>net.sf.esfinge</groupId>
<artifactId>aomrolemapper-neo4j-persistence</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@
</license>
</licenses>


<developers>
<developer>
<name>Eduardo Guerra</name>
Expand Down Expand Up @@ -77,7 +76,7 @@
<dependencies>

<dependency>
<groupId>org.esfinge</groupId>
<groupId>net.sf.esfinge</groupId>
<artifactId>aomrolemapper</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Expand Down
64 changes: 0 additions & 64 deletions AOMNeo4jPersistenceFramework/readme.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
net.sf.esfinge.aom.persistence.neo4j.Neo4JAOM

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.esfinge.aom.persistence.neo4j;
package net.sf.esfinge.aom.persistence.neo4j;

public class EntityTypeNode {

Expand Down
Loading