diff --git a/AOMCouchPersistenceFramework/pom.xml b/AOMCouchPersistenceFramework/pom.xml index fa6c3df..b7f6fb0 100644 --- a/AOMCouchPersistenceFramework/pom.xml +++ b/AOMCouchPersistenceFramework/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-couch-persistence 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -70,7 +69,7 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT diff --git a/AOMCouchPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever b/AOMCouchPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever new file mode 100644 index 0000000..88940d4 --- /dev/null +++ b/AOMCouchPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever @@ -0,0 +1 @@ +net.sf.esfinge.aom.persistence.couchdb.CouchAOM \ No newline at end of file diff --git a/AOMCouchPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever b/AOMCouchPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever deleted file mode 100644 index 48c29d2..0000000 --- a/AOMCouchPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever +++ /dev/null @@ -1 +0,0 @@ -org.esfinge.aom.persistence.couchdb.CouchAOM \ No newline at end of file diff --git a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/BasePersistence.java b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/BasePersistence.java similarity index 93% rename from AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/BasePersistence.java rename to AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/BasePersistence.java index bcfe170..463a61c 100644 --- a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/BasePersistence.java +++ b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/BasePersistence.java @@ -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 { diff --git a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/CouchAOM.java b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/CouchAOM.java similarity index 88% rename from AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/CouchAOM.java rename to AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/CouchAOM.java index ecd6457..0b22cd5 100644 --- a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/CouchAOM.java +++ b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/CouchAOM.java @@ -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 { diff --git a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/EntityPersistence.java b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/EntityPersistence.java similarity index 93% rename from AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/EntityPersistence.java rename to AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/EntityPersistence.java index 608012b..05081b9 100644 --- a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/EntityPersistence.java +++ b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/EntityPersistence.java @@ -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; @@ -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; diff --git a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/EntityTypePersistence.java b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/EntityTypePersistence.java similarity index 94% rename from AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/EntityTypePersistence.java rename to AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/EntityTypePersistence.java index 5e99dcf..9fc762c 100644 --- a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/EntityTypePersistence.java +++ b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/EntityTypePersistence.java @@ -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; @@ -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; diff --git a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/PersistenceConfig.java b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/PersistenceConfig.java similarity index 95% rename from AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/PersistenceConfig.java rename to AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/PersistenceConfig.java index d5045ef..84ea9e6 100644 --- a/AOMCouchPersistenceFramework/src/org/esfinge/aom/persistence/couchdb/PersistenceConfig.java +++ b/AOMCouchPersistenceFramework/src/net/sf/esfinge/aom/persistence/couchdb/PersistenceConfig.java @@ -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; diff --git a/AOMMongoPersistenceFramework/lib/mongo-2.7.3.jar b/AOMMongoPersistenceFramework/lib/mongo-2.7.3.jar deleted file mode 100644 index 24884da..0000000 Binary files a/AOMMongoPersistenceFramework/lib/mongo-2.7.3.jar and /dev/null differ diff --git a/AOMMongoPersistenceFramework/pom.xml b/AOMMongoPersistenceFramework/pom.xml index d29ba66..2a39759 100644 --- a/AOMMongoPersistenceFramework/pom.xml +++ b/AOMMongoPersistenceFramework/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-mongo-persistence 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -76,7 +75,7 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT diff --git a/AOMMongoPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever b/AOMMongoPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever new file mode 100644 index 0000000..98a8400 --- /dev/null +++ b/AOMMongoPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever @@ -0,0 +1 @@ +net.sf.esfinge.aom.persistence.mongodb.MongoAOM \ No newline at end of file diff --git a/AOMMongoPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever b/AOMMongoPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever deleted file mode 100644 index a9f308d..0000000 --- a/AOMMongoPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever +++ /dev/null @@ -1 +0,0 @@ -org.esfinge.aom.persistence.mongodb.MongoAOM \ No newline at end of file diff --git a/AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/EntityTypeCollectionMap.java b/AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/EntityTypeCollectionMap.java similarity index 89% rename from AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/EntityTypeCollectionMap.java rename to AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/EntityTypeCollectionMap.java index f786eb0..a0b907d 100644 --- a/AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/EntityTypeCollectionMap.java +++ b/AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/EntityTypeCollectionMap.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.persistence.mongodb; +package net.sf.esfinge.aom.persistence.mongodb; public class EntityTypeCollectionMap { diff --git a/AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/MongoAOM.java b/AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/MongoAOM.java similarity index 93% rename from AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/MongoAOM.java rename to AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/MongoAOM.java index cbe57a4..f16e6ca 100644 --- a/AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/MongoAOM.java +++ b/AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/MongoAOM.java @@ -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; @@ -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 { diff --git a/AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/MongoAOMConfiguration.java b/AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/MongoAOMConfiguration.java similarity index 94% rename from AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/MongoAOMConfiguration.java rename to AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/MongoAOMConfiguration.java index 0dd1b04..62ceb21 100644 --- a/AOMMongoPersistenceFramework/src/org/esfinge/aom/persistence/mongodb/MongoAOMConfiguration.java +++ b/AOMMongoPersistenceFramework/src/net/sf/esfinge/aom/persistence/mongodb/MongoAOMConfiguration.java @@ -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; diff --git a/AOMMongoPersistenceFramework/test/org/esfinge/aom/example/persistence/mongodb/MongoAOMConfigurationTest.java b/AOMMongoPersistenceFramework/test/net/sf/esfinge/aom/example/persistence/mongodb/MongoAOMConfigurationTest.java similarity index 86% rename from AOMMongoPersistenceFramework/test/org/esfinge/aom/example/persistence/mongodb/MongoAOMConfigurationTest.java rename to AOMMongoPersistenceFramework/test/net/sf/esfinge/aom/example/persistence/mongodb/MongoAOMConfigurationTest.java index 4d91727..e09c2d3 100644 --- a/AOMMongoPersistenceFramework/test/org/esfinge/aom/example/persistence/mongodb/MongoAOMConfigurationTest.java +++ b/AOMMongoPersistenceFramework/test/net/sf/esfinge/aom/example/persistence/mongodb/MongoAOMConfigurationTest.java @@ -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; diff --git a/AOMNeo4jPersistenceFramework/.project b/AOMNeo4jPersistenceFramework/.project index 8a664dd..709d6ed 100644 --- a/AOMNeo4jPersistenceFramework/.project +++ b/AOMNeo4jPersistenceFramework/.project @@ -1,18 +1,23 @@ - AOMNeo4JPersistenceFramework - 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. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - \ No newline at end of file + AOMNeo4JPersistenceFramework + 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. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/AOMNeo4jPersistenceFramework/pom.xml b/AOMNeo4jPersistenceFramework/pom.xml index 9cd841b..694842c 100644 --- a/AOMNeo4jPersistenceFramework/pom.xml +++ b/AOMNeo4jPersistenceFramework/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-neo4j-persistence 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -77,7 +76,7 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT diff --git a/AOMNeo4jPersistenceFramework/readme.md b/AOMNeo4jPersistenceFramework/readme.md deleted file mode 100644 index 1070211..0000000 --- a/AOMNeo4jPersistenceFramework/readme.md +++ /dev/null @@ -1,64 +0,0 @@ -# AOMNeo4jPersistenceFramework - -Componente de persist�ncia para ser utilizado em conjunto com o Framework -Esfinge AOM Role Mapper. -Prov� a persist�ncia dos dados e metadados do AOM Role Mapper em bancos -de dados Neo4j. - -## Utiliza��o - -Inclua o JAR do AOMNeo4jPersistenceFramework no ClassPath da aplica��o -que faz uso do AOMRoleMapper. O componente ser� carregado por meio do -Service Locator do Java. - -### Configura��o - -No mesmo diret�rio onde o arquivo JAR foi copiado crie um diret�rio -com o nome *Config* e dentro dele um arquivo chamado *Neo4jAOMConfiguration.json* -este arquivo, no formato JSON, cont�m as configura��es para acesso -ao banco de dados Neo4j. - -**Config/Neo4jAOMConfiguration.json** -```json -{ - "dbPrefix": "aomdb", - "host": "localhost", - "port": 5984, - "protocol": "http", - "createDbIfNotExist": true, - "username": "", - "password": "", - "path": "" -} -``` -Todos os par�metros mostrados no exemplo acima devem estar presentes no arquivo de configura��o. - -* __dbPrefix__ - Prefixo para os bancos de dados utilizados, o AOMRoleMapper -utiliza 2 bancos de dados com os nomes _[dbPrefix]-entity_ e _[dbPrefix]-entity_type_. -* __host__ - Nome ou IP do computador onde o banco de dados est� instalado. -* __port__ - Porta na qual o Neo4j pode ser acessado. -* __protocol__ - Protocolo de comunica��o utilizado _http_ ou _https_. -* __createDbIfNotExist__ - Criar banco de dados automaticamente caso n�o existam. -* __username__ - Nome de usu�rio (se deixado em branco o acesso ser� feito sem login). -* __password__ - Senha (pode ser deixada em branco). -* __path__ - Prefixo para a URL do banco de dados (pode ser deixado em branco). - -## Limita��es e Desenvolvimento Futuro - -- EntityTypes e Entities em bancos de dados separados. - -As EntityTypes e Entities s�o armazenadas em bancos de dados separados. -Isso � feito pois o Neo4j n�o possui cole��es e assim no caso de um -�nico banco de dados poderia haver conflitos entre os IDs utilizados para -Entities e EntityTypes. - -- IDs da Entities devem ser do tipo String. - -As chaves utilizadas para identifica��o nos documentos Neo4j s�o obrigatoriamente -armazenadas como Strings, dessa forma todas as Entities armazenadas devem -possuir o ID deste tipo. - -## Refer�ncias - -* [Esfinge AOM Role Mapper](esfinge.sourceforge.net/AOM.html) -* [Apache CouchDB](http://couchdb.apache.org/) diff --git a/AOMNeo4jPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever b/AOMNeo4jPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever new file mode 100644 index 0000000..5bd8474 --- /dev/null +++ b/AOMNeo4jPersistenceFramework/src/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever @@ -0,0 +1 @@ +net.sf.esfinge.aom.persistence.neo4j.Neo4JAOM \ No newline at end of file diff --git a/AOMNeo4jPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever b/AOMNeo4jPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever deleted file mode 100644 index aab1460..0000000 --- a/AOMNeo4jPersistenceFramework/src/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever +++ /dev/null @@ -1 +0,0 @@ -org.esfinge.aom.persistence.neo4j.Neo4jAOM \ No newline at end of file diff --git a/AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/EntityTypeNode.java b/AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/EntityTypeNode.java similarity index 88% rename from AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/EntityTypeNode.java rename to AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/EntityTypeNode.java index 77eba0e..3a32e67 100644 --- a/AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/EntityTypeNode.java +++ b/AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/EntityTypeNode.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.persistence.neo4j; +package net.sf.esfinge.aom.persistence.neo4j; public class EntityTypeNode { diff --git a/AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/Neo4jAOM.java b/AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/Neo4JAOM.java similarity index 94% rename from AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/Neo4jAOM.java rename to AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/Neo4JAOM.java index 173b905..880b494 100644 --- a/AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/Neo4jAOM.java +++ b/AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/Neo4JAOM.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.persistence.neo4j; +package net.sf.esfinge.aom.persistence.neo4j; import java.io.File; import java.util.ArrayList; @@ -8,14 +8,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -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 org.neo4j.graphdb.Direction; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; @@ -28,7 +20,16 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.Iterables; -public class Neo4jAOM implements IModelRetriever { +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 Neo4JAOM implements IModelRetriever { private GraphDatabaseService graphdb; @@ -75,7 +76,7 @@ private enum PersistenceType { Insert } - public Neo4jAOM() throws EsfingeAOMException { + public Neo4JAOM() throws EsfingeAOMException { neo4jAomConfig = new Neo4JAOMConfiguration(); this.databaseName = neo4jAomConfig.getDatabase(); initDatabase(); diff --git a/AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/Neo4JAOMConfiguration.java b/AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/Neo4JAOMConfiguration.java similarity index 93% rename from AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/Neo4JAOMConfiguration.java rename to AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/Neo4JAOMConfiguration.java index fa36fd8..53c1fed 100644 --- a/AOMNeo4jPersistenceFramework/src/org/esfinge/aom/persistence/neo4j/Neo4JAOMConfiguration.java +++ b/AOMNeo4jPersistenceFramework/src/net/sf/esfinge/aom/persistence/neo4j/Neo4JAOMConfiguration.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.persistence.neo4j; +package net.sf.esfinge.aom.persistence.neo4j; import java.io.File; import java.net.URL; @@ -29,7 +29,7 @@ public class Neo4JAOMConfiguration { public Neo4JAOMConfiguration() { try { - URL configURL = this.getClass().getResource("/Config/Neo4jAOMConfiguration.xml"); + URL configURL = this.getClass().getResource("/Config/Neo4JAOMConfiguration.xml"); DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); diff --git a/AOMNeo4jPersistenceFramework/test/org/esfinge/aom/example/persistence/neo4j/Neo4JAOMConfigurationTest.java b/AOMNeo4jPersistenceFramework/test/net/sf/esfinge/aom/example/persistence/neo4j/Neo4JAOMConfigurationTest.java similarity index 85% rename from AOMNeo4jPersistenceFramework/test/org/esfinge/aom/example/persistence/neo4j/Neo4JAOMConfigurationTest.java rename to AOMNeo4jPersistenceFramework/test/net/sf/esfinge/aom/example/persistence/neo4j/Neo4JAOMConfigurationTest.java index 535c6ad..19386b8 100644 --- a/AOMNeo4jPersistenceFramework/test/org/esfinge/aom/example/persistence/neo4j/Neo4JAOMConfigurationTest.java +++ b/AOMNeo4jPersistenceFramework/test/net/sf/esfinge/aom/example/persistence/neo4j/Neo4JAOMConfigurationTest.java @@ -1,9 +1,10 @@ -package org.esfinge.aom.example.persistence.neo4j; +package net.sf.esfinge.aom.example.persistence.neo4j; -import org.esfinge.aom.persistence.neo4j.Neo4JAOMConfiguration; import org.junit.Assert; import org.junit.Test; +import net.sf.esfinge.aom.persistence.neo4j.Neo4JAOMConfiguration; + public class Neo4JAOMConfigurationTest { private Neo4JAOMConfiguration configuration = new Neo4JAOMConfiguration(); diff --git a/AOMNeo4jPersistenceFramework/test/resources/Config/Neo4jAOMConfiguration.xml b/AOMNeo4jPersistenceFramework/test/resources/Config/Neo4JAOMConfiguration.xml similarity index 100% rename from AOMNeo4jPersistenceFramework/test/resources/Config/Neo4jAOMConfiguration.xml rename to AOMNeo4jPersistenceFramework/test/resources/Config/Neo4JAOMConfiguration.xml diff --git a/AOMRoleMapper/pom.xml b/AOMRoleMapper/pom.xml index d7448c8..2b4b3a1 100644 --- a/AOMRoleMapper/pom.xml +++ b/AOMRoleMapper/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/manager/visitors/IEntityTypeVisitor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/manager/visitors/IEntityTypeVisitor.java similarity index 94% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/manager/visitors/IEntityTypeVisitor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/manager/visitors/IEntityTypeVisitor.java index 19c77ac..da86642 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/manager/visitors/IEntityTypeVisitor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/manager/visitors/IEntityTypeVisitor.java @@ -1,7 +1,7 @@ -package org.esfinge.aom.api.manager.visitors; +package net.sf.esfinge.aom.api.manager.visitors; -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; /** * This class is responsible for creating and populating an Entity Type diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/manager/visitors/IEntityVisitor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/manager/visitors/IEntityVisitor.java similarity index 89% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/manager/visitors/IEntityVisitor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/manager/visitors/IEntityVisitor.java index c36e4b0..88e21b3 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/manager/visitors/IEntityVisitor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/manager/visitors/IEntityVisitor.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.api.manager.visitors; +package net.sf.esfinge.aom.api.manager.visitors; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; /** * This class is responsible for creating and populating an Entity diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/HasProperties.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/HasProperties.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/HasProperties.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/HasProperties.java index 8a1a6ac..2329d3f 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/HasProperties.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/HasProperties.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.api.model; +package net.sf.esfinge.aom.api.model; import java.util.List; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; public interface HasProperties { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IEntity.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IEntity.java similarity index 90% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IEntity.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IEntity.java index b2800db..a3d9db8 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IEntity.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IEntity.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.api.model; +package net.sf.esfinge.aom.api.model; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; /** * Interface that defines the Entity in the common AOM core structure diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IEntityType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IEntityType.java similarity index 96% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IEntityType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IEntityType.java index 9d2e70f..360ed9f 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IEntityType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IEntityType.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.api.model; +package net.sf.esfinge.aom.api.model; import java.util.List; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; /** * Interface that defines the Entity Type in the common AOM core structure diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IProperty.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IProperty.java similarity index 94% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IProperty.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IProperty.java index 8007e51..214b705 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IProperty.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IProperty.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.api.model; +package net.sf.esfinge.aom.api.model; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; /** * Interface that defines the Property in the common AOM core structure diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IPropertyType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IPropertyType.java similarity index 95% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IPropertyType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IPropertyType.java index 6c86149..c8b9eea 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/IPropertyType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/IPropertyType.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.api.model; +package net.sf.esfinge.aom.api.model; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; /** * Interface that defines the Property Type in the common AOM core structure diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/RuleObject.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/RuleObject.java similarity index 70% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/RuleObject.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/RuleObject.java index e3c3f69..a916986 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/RuleObject.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/RuleObject.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.api.model; +package net.sf.esfinge.aom.api.model; public interface RuleObject { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/rolemapper/metadata/reader/IAOMMetadataReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/rolemapper/metadata/reader/IAOMMetadataReader.java similarity index 57% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/rolemapper/metadata/reader/IAOMMetadataReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/rolemapper/metadata/reader/IAOMMetadataReader.java index 05a7ba4..ed5be31 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/rolemapper/metadata/reader/IAOMMetadataReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/rolemapper/metadata/reader/IAOMMetadataReader.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.api.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.api.model.rolemapper.metadata.reader; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; public interface IAOMMetadataReader { diff --git a/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/rolemapper/metadata/reader/IFixedPropertyReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/rolemapper/metadata/reader/IFixedPropertyReader.java new file mode 100644 index 0000000..3cba764 --- /dev/null +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/model/rolemapper/metadata/reader/IFixedPropertyReader.java @@ -0,0 +1,10 @@ +package net.sf.esfinge.aom.api.model.rolemapper.metadata.reader; + +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; + +public interface IFixedPropertyReader { + + public FixedPropertyDescriptor getDescriptor() throws EsfingeAOMException; + +} \ No newline at end of file diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/modelretriever/IModelRetriever.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/modelretriever/IModelRetriever.java similarity index 92% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/api/modelretriever/IModelRetriever.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/modelretriever/IModelRetriever.java index 6ca1675..070dbd6 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/modelretriever/IModelRetriever.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/api/modelretriever/IModelRetriever.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.api.modelretriever; +package net.sf.esfinge.aom.api.modelretriever; import java.util.List; -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.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.exceptions.EsfingeAOMException; /** * Interface that should be implemented by persistence frameworks diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/exceptions/EsfingeAOMException.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/exceptions/EsfingeAOMException.java similarity index 71% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/exceptions/EsfingeAOMException.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/exceptions/EsfingeAOMException.java index 5fe0824..6f54428 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/exceptions/EsfingeAOMException.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/exceptions/EsfingeAOMException.java @@ -1,11 +1,8 @@ -package org.esfinge.aom.exceptions; +package net.sf.esfinge.aom.exceptions; public class EsfingeAOMException extends Exception { - /** - * - */ - private static final long serialVersionUID = 6200674369030410529L; + private static final long serialVersionUID = -6216485594220223308L; public EsfingeAOMException() { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/ModelManager.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/ModelManager.java similarity index 88% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/manager/ModelManager.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/ModelManager.java index 8696c18..f074fa5 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/ModelManager.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/ModelManager.java @@ -1,24 +1,24 @@ -package org.esfinge.aom.manager; - -import org.esfinge.aom.api.manager.visitors.IEntityTypeVisitor; -import org.esfinge.aom.api.manager.visitors.IEntityVisitor; -import org.esfinge.aom.api.model.HasProperties; -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 org.esfinge.aom.manager.visitors.CreateEntityTypeVisitor; -import org.esfinge.aom.manager.visitors.CreateEntityVisitor; -import org.esfinge.aom.model.factories.PropertyTypeFactory; -import org.esfinge.aom.modelretriever.factories.ModelRetrieverFactory; +package net.sf.esfinge.aom.manager; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.WeakHashMap; +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.HasProperties; +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; +import net.sf.esfinge.aom.manager.visitors.CreateEntityTypeVisitor; +import net.sf.esfinge.aom.manager.visitors.CreateEntityVisitor; +import net.sf.esfinge.aom.model.factories.PropertyTypeFactory; +import net.sf.esfinge.aom.modelretriever.factories.ModelRetrieverFactory; + /** * Class that manages the instances created by the framework */ diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/configuration/ModelConfiguration.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/configuration/ModelConfiguration.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/manager/configuration/ModelConfiguration.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/configuration/ModelConfiguration.java index 00fff59..2d50de5 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/configuration/ModelConfiguration.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/configuration/ModelConfiguration.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.manager.configuration; +package net.sf.esfinge.aom.manager.configuration; import java.io.File; import java.util.ArrayList; @@ -13,17 +13,18 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; -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.esfinge.aom.manager.visitors.CreateEntityTypeVisitor; -import org.esfinge.aom.model.factories.PropertyTypeFactory; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +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; +import net.sf.esfinge.aom.manager.visitors.CreateEntityTypeVisitor; +import net.sf.esfinge.aom.model.factories.PropertyTypeFactory; + public class ModelConfiguration { private List model; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/visitors/CreateEntityTypeVisitor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/visitors/CreateEntityTypeVisitor.java similarity index 82% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/manager/visitors/CreateEntityTypeVisitor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/visitors/CreateEntityTypeVisitor.java index b4413e4..1608788 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/visitors/CreateEntityTypeVisitor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/visitors/CreateEntityTypeVisitor.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.manager.visitors; +package net.sf.esfinge.aom.manager.visitors; -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.esfinge.aom.manager.ModelManager; -import org.esfinge.aom.model.factories.EntityTypeFactory; -import org.esfinge.aom.model.factories.PropertyTypeFactory; +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; +import net.sf.esfinge.aom.manager.ModelManager; +import net.sf.esfinge.aom.model.factories.EntityTypeFactory; +import net.sf.esfinge.aom.model.factories.PropertyTypeFactory; public class CreateEntityTypeVisitor implements IEntityTypeVisitor { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/visitors/CreateEntityVisitor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/visitors/CreateEntityVisitor.java similarity index 70% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/manager/visitors/CreateEntityVisitor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/visitors/CreateEntityVisitor.java index 4e3b07b..c2c0243 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/manager/visitors/CreateEntityVisitor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/manager/visitors/CreateEntityVisitor.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.manager.visitors; +package net.sf.esfinge.aom.manager.visitors; -import org.esfinge.aom.api.manager.visitors.IEntityVisitor; -import org.esfinge.aom.api.model.HasProperties; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.manager.ModelManager; -import org.esfinge.aom.model.factories.EntityFactory; +import net.sf.esfinge.aom.api.manager.visitors.IEntityVisitor; +import net.sf.esfinge.aom.api.model.HasProperties; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.manager.ModelManager; +import net.sf.esfinge.aom.model.factories.EntityFactory; public class CreateEntityVisitor implements IEntityVisitor { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/exceptions/AdapterFactoryClassConstructionException.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/exceptions/AdapterFactoryClassConstructionException.java similarity index 82% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/exceptions/AdapterFactoryClassConstructionException.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/exceptions/AdapterFactoryClassConstructionException.java index 42531ca..7cac483 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/exceptions/AdapterFactoryClassConstructionException.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/exceptions/AdapterFactoryClassConstructionException.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.exceptions; +package net.sf.esfinge.aom.model.dynamic.exceptions; public class AdapterFactoryClassConstructionException extends Exception { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/exceptions/AdapterFactoryFileReaderException.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/exceptions/AdapterFactoryFileReaderException.java similarity index 81% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/exceptions/AdapterFactoryFileReaderException.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/exceptions/AdapterFactoryFileReaderException.java index 6ae401f..348c323 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/exceptions/AdapterFactoryFileReaderException.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/exceptions/AdapterFactoryFileReaderException.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.exceptions; +package net.sf.esfinge.aom.model.dynamic.exceptions; public class AdapterFactoryFileReaderException extends Exception { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/factory/AdapterFactory.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/factory/AdapterFactory.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/factory/AdapterFactory.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/factory/AdapterFactory.java index b0f2e48..8c617dc 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/factory/AdapterFactory.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/factory/AdapterFactory.java @@ -1,23 +1,24 @@ -package org.esfinge.aom.model.dynamic.factory; +package net.sf.esfinge.aom.model.dynamic.factory; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; -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.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.dynamic.exceptions.AdapterFactoryClassConstructionException; -import org.esfinge.aom.model.dynamic.exceptions.AdapterFactoryFileReaderException; -import org.esfinge.aom.model.dynamic.utils.ClassConstructor; -import org.esfinge.aom.model.dynamic.utils.DynamicClassLoader; -import org.esfinge.aom.model.dynamic.utils.PropertiesReaderJsonPattern; import org.json.simple.parser.ParseException; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; +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.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.dynamic.exceptions.AdapterFactoryClassConstructionException; +import net.sf.esfinge.aom.model.dynamic.exceptions.AdapterFactoryFileReaderException; +import net.sf.esfinge.aom.model.dynamic.utils.ClassConstructor; +import net.sf.esfinge.aom.model.dynamic.utils.DynamicClassLoader; +import net.sf.esfinge.aom.model.dynamic.utils.PropertiesReaderJsonPattern; + public class AdapterFactory { private static HashMap storedClasses = new HashMap(); private static AdapterFactory adapterFactory; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/ClassConstructor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/ClassConstructor.java similarity index 85% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/ClassConstructor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/ClassConstructor.java index 1780036..25680b9 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/ClassConstructor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/ClassConstructor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.utils; +package net.sf.esfinge.aom.model.dynamic.utils; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; @@ -30,7 +30,7 @@ import org.objectweb.asm.Opcodes; public class ClassConstructor{ - private static String adapterFactoryPath = "org/esfinge/aom/model/dynamic/factory/"; + private static String adapterFactoryPath = "net/sf/esfinge/aom/model/dynamic/factory/"; private static void putAnnotationParameters( Map annotationParameters, AnnotationVisitor av) { @@ -88,7 +88,7 @@ public static void createAnnotationMethod(String annotationClassPathName, Map", - "(Lorg/esfinge/aom/api/model/IEntity;)V", null, null); + "(Lnet/sf/esfinge/aom/api/model/IEntity;)V", null, null); mv.visitCode(); mv.visitVarInsn(ALOAD, 0); @@ -107,7 +107,7 @@ public static void createClassAndConstructor(String name, ClassWriter cw) { mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 1); mv.visitFieldInsn(PUTFIELD, name, "entity", - "Lorg/esfinge/aom/api/model/IEntity;"); + "Lnet/sf/esfinge/aom/api/model/IEntity;"); mv.visitInsn(RETURN); @@ -146,16 +146,16 @@ public static MethodVisitor createGetter(String name, ClassWriter cw, String pro mv.visitFieldInsn(GETFIELD, name, "hasProperty", - "Lorg/esfinge/aom/api/model/HasProperties;"); + "Lnet/sf/esfinge/aom/api/model/HasProperties;"); mv.visitLdcInsn(prop); mv.visitMethodInsn( INVOKEINTERFACE, - "org/esfinge/aom/api/model/HasProperties", + "net/sf/esfinge/aom/api/model/HasProperties", "getProperty", - "(Ljava/lang/String;)Lorg/esfinge/aom/api/model/IProperty;", + "(Ljava/lang/String;)Lnet/sf/esfinge/aom/api/model/IProperty;", true); mv.visitMethodInsn(INVOKEINTERFACE, - "org/esfinge/aom/api/model/IProperty", "getValue", + "net/sf/esfinge/aom/api/model/IProperty", "getValue", "()Ljava/lang/Object;", true); mv.visitVarInsn(ASTORE, 1); Label l3 = new Label(); @@ -210,15 +210,15 @@ public static void createSetter(String name, ClassWriter cw, String prop) { Label l1 = new Label(); Label l2 = new Label(); mv.visitTryCatchBlock(l0, l1, l2, - "org/esfinge/aom/exceptions/EsfingeAOMException"); + "net/sf/esfinge/aom/exceptions/EsfingeAOMException"); mv.visitLabel(l0); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, name, "entity", - "Lorg/esfinge/aom/api/model/IEntity;"); + "Lnet/sf/esfinge/aom/api/model/IEntity;"); mv.visitLdcInsn(prop); mv.visitVarInsn(ALOAD, 1); mv.visitMethodInsn(INVOKEINTERFACE, - "org/esfinge/aom/api/model/IEntity", "setProperty", + "net/sf/esfinge/aom/api/model/IEntity", "setProperty", "(Ljava/lang/String;Ljava/lang/Object;)V", true); mv.visitLabel(l1); Label l3 = new Label(); @@ -240,7 +240,7 @@ public static void createSetter(String name, ClassWriter cw, String prop) { mv.visitLocalVariable("this", "L" + name + ";", null, l0, l5, 0); mv.visitLocalVariable("a", "Ljava/lang/Object;", null, l0, l5, 1); mv.visitLocalVariable("e", - "Lorg/esfinge/aom/exceptions/EsfingeAOMException;", null, l4, + "Lnet/sf/esfinge/aom/exceptions/EsfingeAOMException;", null, l4, l3, 2); mv.visitMaxs(3, 3); mv.visitEnd(); @@ -260,15 +260,15 @@ public static MethodVisitor createGetterWithSpecificProperty(String name, ClassW mv.visitCode(); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, name, "entity", - "Lorg/esfinge/aom/api/model/IEntity;"); + "Lnet/sf/esfinge/aom/api/model/IEntity;"); mv.visitLdcInsn(prop); mv.visitMethodInsn(INVOKEINTERFACE, - "org/esfinge/aom/api/model/IEntity", "getProperty", - "(Ljava/lang/String;)Lorg/esfinge/aom/api/model/IProperty;", + "net/sf/esfinge/aom/api/model/IEntity", "getProperty", + "(Ljava/lang/String;)Lnet/sf/esfinge/aom/api/model/IProperty;", true); mv.visitMethodInsn(INVOKEINTERFACE, - "org/esfinge/aom/api/model/IProperty", "getValue", + "net/sf/esfinge/aom/api/model/IProperty", "getValue", "()Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, propertyType.replace(".", "/")); @@ -305,15 +305,15 @@ public static void createSetterWithSpecificProperty(String name, ClassWriter cw, Label l1 = new Label(); Label l2 = new Label(); mv.visitTryCatchBlock(l0, l1, l2, - "org/esfinge/aom/exceptions/EsfingeAOMException"); + "net/sf/esfinge/aom/exceptions/EsfingeAOMException"); mv.visitLabel(l0); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, name, "entity", - "Lorg/esfinge/aom/api/model/IEntity;"); + "Lnet/sf/esfinge/aom/api/model/IEntity;"); mv.visitLdcInsn(prop); mv.visitVarInsn(ALOAD, 1); mv.visitMethodInsn(INVOKEINTERFACE, - "org/esfinge/aom/api/model/IEntity", "setProperty", + "net/sf/esfinge/aom/api/model/IEntity", "setProperty", "(Ljava/lang/String;Ljava/lang/Object;)V", true); mv.visitLabel(l1); Label l3 = new Label(); @@ -336,7 +336,7 @@ public static void createSetterWithSpecificProperty(String name, ClassWriter cw, mv.visitLocalVariable("a", "L" + propertyType.replace(".", "/") + ";", null, l0, l5, 1); mv.visitLocalVariable("e", - "Lorg/esfinge/aom/exceptions/EsfingeAOMException;", null, l4, + "Lnet/sf/esfinge/aom/exceptions/EsfingeAOMException;", null, l4, l3, 2); mv.visitMaxs(3, 3); mv.visitEnd(); @@ -362,18 +362,18 @@ public static MethodVisitor createComplexPropertyGetter(String name, ClassWriter mv.visitLabel(l0); mv.visitLineNumber(17, l0); mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, name, "entity", "Lorg/esfinge/aom/api/model/IEntity;"); + mv.visitFieldInsn(GETFIELD, name, "entity", "Lnet/sf/esfinge/aom/api/model/IEntity;"); mv.visitLdcInsn(propName); - mv.visitMethodInsn(INVOKEINTERFACE, "org/esfinge/aom/api/model/IEntity", "getProperty", "(Ljava/lang/String;)Lorg/esfinge/aom/api/model/IProperty;", true); - mv.visitMethodInsn(INVOKEINTERFACE, "org/esfinge/aom/api/model/IProperty", "getValue", "()Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "org/esfinge/aom/api/model/IEntity"); + mv.visitMethodInsn(INVOKEINTERFACE, "net/sf/esfinge/aom/api/model/IEntity", "getProperty", "(Ljava/lang/String;)Lnet/sf/esfinge/aom/api/model/IProperty;", true); + mv.visitMethodInsn(INVOKEINTERFACE, "net/sf/esfinge/aom/api/model/IProperty", "getValue", "()Ljava/lang/Object;", true); + mv.visitTypeInsn(CHECKCAST, "net/sf/esfinge/aom/api/model/IEntity"); mv.visitVarInsn(ASTORE, 1); Label l3 = new Label(); mv.visitLabel(l3); mv.visitLineNumber(18, l3); mv.visitMethodInsn(INVOKESTATIC, adapterFactoryPath + "AdapterFactory", "getInstance", "()L" + adapterFactoryPath + "AdapterFactory;", false); mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEVIRTUAL, adapterFactoryPath + "AdapterFactory", "generate", "(Lorg/esfinge/aom/api/model/IEntity;)Ljava/lang/Object;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, adapterFactoryPath + "AdapterFactory", "generate", "(Lnet/sf/esfinge/aom/api/model/IEntity;)Ljava/lang/Object;", false); mv.visitTypeInsn(CHECKCAST, propertyType.replace(".", "/")); mv.visitLabel(l1); mv.visitInsn(ARETURN); @@ -395,7 +395,7 @@ public static MethodVisitor createComplexPropertyGetter(String name, ClassWriter Label l6 = new Label(); mv.visitLabel(l6); mv.visitLocalVariable("this", "L" + name + ";", null, l0, l6, 0); - mv.visitLocalVariable("entityProp", "Lorg/esfinge/aom/api/model/IEntity;", null, l3, l2, 1); + mv.visitLocalVariable("entityProp", "Lnet/sf/esfinge/aom/api/model/IEntity;", null, l3, l2, 1); mv.visitLocalVariable("e", "Ljava/lang/Exception;", null, l4, l6, 1); mv.visitMaxs(3, 2); mv.visitEnd(); @@ -422,20 +422,20 @@ public static void createComplexPropertySetter(String name, ClassWriter cw, mv.visitLabel(l0); mv.visitLineNumber(29, l0); mv.visitVarInsn(ALOAD, 1); - mv.visitTypeInsn(CHECKCAST, "org/esfinge/aom/api/model/IEntity"); + mv.visitTypeInsn(CHECKCAST, "net/sf/esfinge/aom/api/model/IEntity"); mv.visitVarInsn(ASTORE, 2); Label l3 = new Label(); mv.visitLabel(l3); mv.visitLineNumber(30, l3); mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, name, "entity", "Lorg/esfinge/aom/api/model/IEntity;"); + mv.visitFieldInsn(GETFIELD, name, "entity", "Lnet/sf/esfinge/aom/api/model/IEntity;"); mv.visitLdcInsn(propName); - mv.visitMethodInsn(INVOKEINTERFACE, "org/esfinge/aom/api/model/IEntity", "getProperty", "(Ljava/lang/String;)Lorg/esfinge/aom/api/model/IProperty;", true); + mv.visitMethodInsn(INVOKEINTERFACE, "net/sf/esfinge/aom/api/model/IEntity", "getProperty", "(Ljava/lang/String;)Lnet/sf/esfinge/aom/api/model/IProperty;", true); Label l4 = new Label(); mv.visitLabel(l4); mv.visitLineNumber(31, l4); mv.visitVarInsn(ALOAD, 2); - mv.visitMethodInsn(INVOKEINTERFACE, "org/esfinge/aom/api/model/IProperty", "setValue", "(Ljava/lang/Object;)V", true); + mv.visitMethodInsn(INVOKEINTERFACE, "net/sf/esfinge/aom/api/model/IProperty", "setValue", "(Ljava/lang/Object;)V", true); mv.visitLabel(l1); mv.visitLineNumber(33, l1); Label l5 = new Label(); @@ -464,7 +464,7 @@ public static void createComplexPropertySetter(String name, ClassWriter cw, mv.visitLabel(l8); mv.visitLocalVariable("this", "L" + name + ";", null, l0, l8, 0); mv.visitLocalVariable("entity", "Ljava/lang/Object;", null, l0, l8, 1); - mv.visitLocalVariable("entityProp", "Lorg/esfinge/aom/api/model/IEntity;", null, l3, l1, 2); + mv.visitLocalVariable("entityProp", "Lnet/sf/esfinge/aom/api/model/IEntity;", null, l3, l1, 2); mv.visitLocalVariable("e", "Ljava/lang/Exception;", null, l6, l5, 2); mv.visitMaxs(3, 3); mv.visitEnd(); diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/DynamicClassLoader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/DynamicClassLoader.java similarity index 90% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/DynamicClassLoader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/DynamicClassLoader.java index 85e4247..8e802cc 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/DynamicClassLoader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/DynamicClassLoader.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.utils; +package net.sf.esfinge.aom.model.dynamic.utils; public class DynamicClassLoader extends ClassLoader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/PropertiesReaderJsonPattern.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/PropertiesReaderJsonPattern.java similarity index 97% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/PropertiesReaderJsonPattern.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/PropertiesReaderJsonPattern.java index 7c2a51a..fc5aee5 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/dynamic/utils/PropertiesReaderJsonPattern.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/dynamic/utils/PropertiesReaderJsonPattern.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.utils; +package net.sf.esfinge.aom.model.dynamic.utils; import java.io.File; import java.io.FileReader; import java.io.IOException; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/EntityFactory.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/EntityFactory.java similarity index 72% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/EntityFactory.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/EntityFactory.java index baa32b2..6beef4f 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/EntityFactory.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/EntityFactory.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.model.factories; +package net.sf.esfinge.aom.model.factories; -import org.esfinge.aom.api.model.HasProperties; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.api.model.HasProperties; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; public class EntityFactory { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/EntityTypeFactory.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/EntityTypeFactory.java similarity index 81% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/EntityTypeFactory.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/EntityTypeFactory.java index ee3ba79..c7711de 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/EntityTypeFactory.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/EntityTypeFactory.java @@ -1,9 +1,9 @@ -package org.esfinge.aom.model.factories; +package net.sf.esfinge.aom.model.factories; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericEntityType; -import org.esfinge.aom.model.rolemapper.core.AdapterEntityType; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericEntityType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntityType; public class EntityTypeFactory { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/PropertyFactory.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/PropertyFactory.java similarity index 69% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/PropertyFactory.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/PropertyFactory.java index f5059f0..730fb33 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/PropertyFactory.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/PropertyFactory.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.model.factories; +package net.sf.esfinge.aom.model.factories; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericProperty; -import org.esfinge.aom.model.rolemapper.core.AdapterProperty; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericProperty; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterProperty; public class PropertyFactory { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/PropertyTypeFactory.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/PropertyTypeFactory.java similarity index 72% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/PropertyTypeFactory.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/PropertyTypeFactory.java index 518d277..247e7c0 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/factories/PropertyTypeFactory.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/factories/PropertyTypeFactory.java @@ -1,9 +1,9 @@ -package org.esfinge.aom.model.factories; +package net.sf.esfinge.aom.model.factories; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.model.rolemapper.core.AdapterPropertyType; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterPropertyType; public class PropertyTypeFactory { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/CalculaAnos.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/CalculaAnos.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/CalculaAnos.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/CalculaAnos.java index bd90840..c0e5914 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/CalculaAnos.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/CalculaAnos.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.impl; +package net.sf.esfinge.aom.model.impl; import java.time.LocalDate; import java.time.Period; @@ -6,10 +6,10 @@ import java.util.Date; import java.util.GregorianCalendar; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.api.model.RuleObject; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.api.model.RuleObject; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; public class CalculaAnos implements RuleObject { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericEntity.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericEntity.java similarity index 87% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericEntity.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericEntity.java index 6f68dc8..5210d68 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericEntity.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericEntity.java @@ -1,16 +1,16 @@ -package org.esfinge.aom.model.impl; +package net.sf.esfinge.aom.model.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.WeakHashMap; -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.model.RuleObject; -import org.esfinge.aom.exceptions.EsfingeAOMException; +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.model.RuleObject; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; public class GenericEntity extends ThingWithProperties implements IEntity { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericEntityType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericEntityType.java similarity index 91% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericEntityType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericEntityType.java index 132f9d9..e0d02fd 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericEntityType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericEntityType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.impl; +package net.sf.esfinge.aom.model.impl; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -6,12 +6,12 @@ import java.util.Map; import java.util.WeakHashMap; -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.model.RuleObject; -import org.esfinge.aom.exceptions.EsfingeAOMException; +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.model.RuleObject; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; public class GenericEntityType extends ThingWithProperties implements IEntityType { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericProperty.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericProperty.java similarity index 87% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericProperty.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericProperty.java index 5bfcb9b..fe2661c 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericProperty.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericProperty.java @@ -1,9 +1,9 @@ -package org.esfinge.aom.model.impl; +package net.sf.esfinge.aom.model.impl; -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 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 GenericProperty extends ThingWithProperties implements IProperty { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericPropertyType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericPropertyType.java similarity index 89% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericPropertyType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericPropertyType.java index 57ee2e7..a2e7f98 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/GenericPropertyType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/GenericPropertyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.model.impl; +package net.sf.esfinge.aom.model.impl; import java.util.HashMap; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.utils.Utils; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.utils.Utils; public class GenericPropertyType extends ThingWithProperties implements IPropertyType { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/ThingWithProperties.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/ThingWithProperties.java similarity index 94% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/ThingWithProperties.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/ThingWithProperties.java index e944df4..5c00f39 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/impl/ThingWithProperties.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/impl/ThingWithProperties.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.impl; +package net.sf.esfinge.aom.model.impl; import java.util.ArrayList; import java.util.Collection; @@ -8,11 +8,11 @@ import java.util.Set; import java.util.WeakHashMap; -import org.esfinge.aom.api.model.HasProperties; -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 net.sf.esfinge.aom.api.model.HasProperties; +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 abstract class ThingWithProperties implements HasProperties{ @@ -111,7 +111,7 @@ private boolean isIn(IPropertyType propertyType) throws EsfingeAOMException { } private Object convertNumberType(Object propertyValue, IPropertyType propertyType) throws EsfingeAOMException { - GenericPropertyType gn = (org.esfinge.aom.model.impl.GenericPropertyType) this; + GenericPropertyType gn = (net.sf.esfinge.aom.model.impl.GenericPropertyType) this; boolean equalType = gn.type.equals(propertyValue.getClass()); if(isNumericType(gn.type)){ propertyType.setType(gn.type); diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterEntity.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntity.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterEntity.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntity.java index a2741dc..633f4fd 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterEntity.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntity.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.lang.reflect.Method; import java.util.ArrayList; @@ -8,18 +8,18 @@ import java.util.Map; import java.util.WeakHashMap; -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.model.RuleObject; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.factories.PropertyFactory; -import org.esfinge.aom.model.impl.GenericEntityType; -import org.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.EntityDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.repository.EntityMetadataRepository; +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.model.RuleObject; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.factories.PropertyFactory; +import net.sf.esfinge.aom.model.impl.GenericEntityType; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.EntityDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.EntityMetadataRepository; public class AdapterEntity implements IEntity { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityType.java similarity index 89% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityType.java index 3ddc094..cb8546f 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -12,18 +12,19 @@ import java.util.WeakHashMap; import org.apache.commons.lang3.ClassUtils; -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.model.RuleObject; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.EntityTypeDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.repository.EntityTypeMetadataRepository; -import org.esfinge.aom.model.rolemapper.metadata.repository.FixedPropertyMetadataRepository; + +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.model.RuleObject; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.EntityTypeDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.EntityTypeMetadataRepository; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.FixedPropertyMetadataRepository; public class AdapterEntityType implements IEntityType { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedProperty.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedProperty.java similarity index 87% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedProperty.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedProperty.java index 5ddcc81..d0131e4 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedProperty.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedProperty.java @@ -1,13 +1,13 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.lang.reflect.Field; import java.util.List; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.reader.FieldMetadataReader; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.FieldMetadataReader; public class AdapterFixedProperty implements IProperty { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyType.java similarity index 88% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyType.java index 56f89f0..db27538 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.lang.reflect.Field; import java.util.List; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.utils.Utils; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.utils.Utils; public class AdapterFixedPropertyType implements IPropertyType { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterProperty.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterProperty.java similarity index 90% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterProperty.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterProperty.java index 8d3a791..4bd8cab 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterProperty.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterProperty.java @@ -1,17 +1,17 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.lang.reflect.Method; import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.repository.EntityMetadataRepository; -import org.esfinge.aom.model.rolemapper.metadata.repository.PropertyMetadataRepository; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.EntityMetadataRepository; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.PropertyMetadataRepository; public class AdapterProperty implements IProperty { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyMap.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyMap.java similarity index 92% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyMap.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyMap.java index e82d21e..a4909af 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyMap.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyMap.java @@ -1,13 +1,13 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.api.model.IEntity; +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 AdapterPropertyMap implements IProperty { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyType.java similarity index 90% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyType.java index 5ef6655..b638121 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import java.lang.reflect.Method; import java.util.ArrayList; @@ -8,17 +8,17 @@ import java.util.Map; import java.util.WeakHashMap; -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.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyTypeDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.repository.EntityTypeMetadataRepository; -import org.esfinge.aom.model.rolemapper.metadata.repository.PropertyTypeMetadataRepository; -import org.esfinge.aom.utils.Utils; +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; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyTypeDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.EntityTypeMetadataRepository; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.PropertyTypeMetadataRepository; +import net.sf.esfinge.aom.utils.Utils; public class AdapterPropertyType implements IPropertyType { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/CreateEntityMethod.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/CreateEntityMethod.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/CreateEntityMethod.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/CreateEntityMethod.java index 60401a6..ac318a7 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/CreateEntityMethod.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/CreateEntityMethod.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Entity.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Entity.java similarity index 79% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Entity.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Entity.java index 75a5cf6..6990448 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Entity.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Entity.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityProperty.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityProperty.java similarity index 81% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityProperty.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityProperty.java index b6f90a3..6f08b17 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityProperty.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityProperty.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityPropertyMap.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityPropertyMap.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityPropertyMap.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityPropertyMap.java index 3dcfbfc..f690e31 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityPropertyMap.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityPropertyMap.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityType.java similarity index 81% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityType.java index 3beb1bc..6072371 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/EntityType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/EntityType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/FixedEntityProperty.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/FixedEntityProperty.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/FixedEntityProperty.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/FixedEntityProperty.java index 7397cae..ae06524 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/FixedEntityProperty.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/FixedEntityProperty.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/FixedMetadata.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/FixedMetadata.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/FixedMetadata.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/FixedMetadata.java index b6d949d..d784ae5 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/FixedMetadata.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/FixedMetadata.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Metadata.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Metadata.java similarity index 81% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Metadata.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Metadata.java index f266a55..1dc5c7a 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Metadata.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Metadata.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/MetadataMap.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/MetadataMap.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/MetadataMap.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/MetadataMap.java index 75bd92a..d222a57 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/MetadataMap.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/MetadataMap.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Name.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Name.java similarity index 79% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Name.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Name.java index 661eb15..654b040 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/Name.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/Name.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyType.java similarity index 81% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyType.java index deb37cf..4bc8891 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyTypeType.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyTypeType.java similarity index 80% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyTypeType.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyTypeType.java index 65a0abd..ecbc04d 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyTypeType.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyTypeType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyValue.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyValue.java similarity index 79% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyValue.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyValue.java index d90dda1..a40bc6e 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/annotations/PropertyValue.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/annotations/PropertyValue.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.annotations; +package net.sf.esfinge.aom.model.rolemapper.metadata.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/EntityDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/EntityDescriptor.java similarity index 91% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/EntityDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/EntityDescriptor.java index acb8421..727425d 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/EntityDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/EntityDescriptor.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.repository.PropertyMetadataRepository; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.repository.PropertyMetadataRepository; public class EntityDescriptor { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/EntityTypeDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/EntityTypeDescriptor.java similarity index 94% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/EntityTypeDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/EntityTypeDescriptor.java index d1f4fdf..bf288ce 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/EntityTypeDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/EntityTypeDescriptor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; import java.lang.reflect.Method; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/FieldDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/FieldDescriptor.java similarity index 95% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/FieldDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/FieldDescriptor.java index 97c33d1..bfb3598 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/FieldDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/FieldDescriptor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; import java.lang.reflect.Method; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/FixedPropertyDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/FixedPropertyDescriptor.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/FixedPropertyDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/FixedPropertyDescriptor.java index 4804925..4304d96 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/FixedPropertyDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/FixedPropertyDescriptor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/MetadataDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/MetadataDescriptor.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/MetadataDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/MetadataDescriptor.java index 1424aa7..cf7b2ac 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/MetadataDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/MetadataDescriptor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; import java.util.ArrayList; import java.util.List; diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyDescriptor.java similarity index 92% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyDescriptor.java index e1e0690..caacec8 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyDescriptor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; public class PropertyDescriptor { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyTypeDescriptor.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyTypeDescriptor.java similarity index 92% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyTypeDescriptor.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyTypeDescriptor.java index 2dd3985..7ddff91 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyTypeDescriptor.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/descriptors/PropertyTypeDescriptor.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.descriptors; +package net.sf.esfinge.aom.model.rolemapper.metadata.descriptors; public class PropertyTypeDescriptor extends MetadataDescriptor{ diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/EntityAnnotationReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/EntityAnnotationReader.java similarity index 66% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/EntityAnnotationReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/EntityAnnotationReader.java index e1ba485..2af8823 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/EntityAnnotationReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/EntityAnnotationReader.java @@ -1,16 +1,16 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.util.List; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityPropertyMap; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.EntityDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityPropertyMap; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.EntityDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; public class EntityAnnotationReader implements IAOMMetadataReader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/EntityTypeAnnotationReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/EntityTypeAnnotationReader.java similarity index 72% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/EntityTypeAnnotationReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/EntityTypeAnnotationReader.java index d929da9..d069568 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/EntityTypeAnnotationReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/EntityTypeAnnotationReader.java @@ -1,21 +1,21 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.List; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.EntityTypeDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.EntityTypeDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; public class EntityTypeAnnotationReader implements IAOMMetadataReader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FieldAnnotationReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FieldAnnotationReader.java similarity index 86% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FieldAnnotationReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FieldAnnotationReader.java index c1203d1..374e3f8 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FieldAnnotationReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FieldAnnotationReader.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; public class FieldAnnotationReader extends FieldMetadataReader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FieldMetadataReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FieldMetadataReader.java similarity index 94% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FieldMetadataReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FieldMetadataReader.java index 8dbb5de..df3b289 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FieldMetadataReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FieldMetadataReader.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -6,8 +6,8 @@ import java.lang.reflect.Type; import java.util.Collection; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.utils.Utils; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.utils.Utils; public class FieldMetadataReader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FixedPropertyAnnotationReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FixedPropertyAnnotationReader.java similarity index 75% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FixedPropertyAnnotationReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FixedPropertyAnnotationReader.java index 25b6899..fe5d345 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/FixedPropertyAnnotationReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/FixedPropertyAnnotationReader.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.lang.reflect.Field; import java.net.URL; @@ -7,15 +7,16 @@ import java.util.Map; import java.util.Set; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IFixedPropertyReader; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; import org.scannotation.AnnotationDB; import org.scannotation.ClasspathUrlFinder; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IFixedPropertyReader; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; + public class FixedPropertyAnnotationReader implements IFixedPropertyReader { @Override diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/PropertyAnnotationReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/PropertyAnnotationReader.java similarity index 67% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/PropertyAnnotationReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/PropertyAnnotationReader.java index d6e4be6..8d032f3 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/PropertyAnnotationReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/PropertyAnnotationReader.java @@ -1,15 +1,15 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.util.List; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyDescriptor; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyDescriptor; public class PropertyAnnotationReader implements IAOMMetadataReader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/PropertyTypeAnnotationReader.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/PropertyTypeAnnotationReader.java similarity index 70% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/PropertyTypeAnnotationReader.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/PropertyTypeAnnotationReader.java index 209df22..4f9d55a 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/PropertyTypeAnnotationReader.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/PropertyTypeAnnotationReader.java @@ -1,18 +1,18 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader; import java.util.List; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyTypeDescriptor; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.PropertyTypeDescriptor; public class PropertyTypeAnnotationReader implements IAOMMetadataReader { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/ElementReaderProvider.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/ElementReaderProvider.java similarity index 65% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/ElementReaderProvider.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/ElementReaderProvider.java index cf6cc67..26c6f94 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/ElementReaderProvider.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/ElementReaderProvider.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader.provider; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; public abstract class ElementReaderProvider { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityReaderProvider.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityReaderProvider.java similarity index 70% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityReaderProvider.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityReaderProvider.java index 67c6d22..0268e58 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityReaderProvider.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityReaderProvider.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader.provider; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider; -import org.esfinge.aom.model.rolemapper.metadata.reader.EntityAnnotationReader; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.EntityAnnotationReader; public class EntityReaderProvider extends ElementReaderProvider { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityTypeReaderProvider.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityTypeReaderProvider.java similarity index 70% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityTypeReaderProvider.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityTypeReaderProvider.java index fedd8c7..856dc40 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityTypeReaderProvider.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/EntityTypeReaderProvider.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader.provider; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider; -import org.esfinge.aom.model.rolemapper.metadata.reader.EntityTypeAnnotationReader; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.EntityTypeAnnotationReader; public class EntityTypeReaderProvider extends ElementReaderProvider { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/FixedPropertyReaderProvider.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/FixedPropertyReaderProvider.java similarity index 71% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/FixedPropertyReaderProvider.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/FixedPropertyReaderProvider.java index 2efaaad..00becd9 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/FixedPropertyReaderProvider.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/FixedPropertyReaderProvider.java @@ -1,7 +1,7 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader.provider; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IFixedPropertyReader; -import org.esfinge.aom.model.rolemapper.metadata.reader.FixedPropertyAnnotationReader; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IFixedPropertyReader; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.FixedPropertyAnnotationReader; public class FixedPropertyReaderProvider { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyReaderProvider.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyReaderProvider.java similarity index 70% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyReaderProvider.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyReaderProvider.java index 609cb64..201b304 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyReaderProvider.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyReaderProvider.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader.provider; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider; -import org.esfinge.aom.model.rolemapper.metadata.reader.PropertyAnnotationReader; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.PropertyAnnotationReader; public class PropertyReaderProvider extends ElementReaderProvider { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyTypeReaderProvider.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyTypeReaderProvider.java similarity index 71% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyTypeReaderProvider.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyTypeReaderProvider.java index 9ab5606..2e6bfd0 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyTypeReaderProvider.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/reader/provider/PropertyTypeReaderProvider.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.reader.provider; +package net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider; -import org.esfinge.aom.model.rolemapper.metadata.reader.PropertyTypeAnnotationReader; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.PropertyTypeAnnotationReader; public class PropertyTypeReaderProvider extends ElementReaderProvider { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/ElementMetadataRepository.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/ElementMetadataRepository.java similarity index 73% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/ElementMetadataRepository.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/ElementMetadataRepository.java index cd3ef98..db2998c 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/ElementMetadataRepository.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/ElementMetadataRepository.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.model.rolemapper.metadata.repository; +package net.sf.esfinge.aom.model.rolemapper.metadata.repository; import java.util.HashMap; import java.util.Map; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; -import org.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IAOMMetadataReader; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; public abstract class ElementMetadataRepository { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/EntityMetadataRepository.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/EntityMetadataRepository.java similarity index 72% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/EntityMetadataRepository.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/EntityMetadataRepository.java index 2b13577..95cc186 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/EntityMetadataRepository.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/EntityMetadataRepository.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.repository; +package net.sf.esfinge.aom.model.rolemapper.metadata.repository; -import org.esfinge.aom.model.rolemapper.metadata.reader.provider.EntityReaderProvider; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider.EntityReaderProvider; public class EntityMetadataRepository extends ElementMetadataRepository { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/EntityTypeMetadataRepository.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/EntityTypeMetadataRepository.java similarity index 73% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/EntityTypeMetadataRepository.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/EntityTypeMetadataRepository.java index afcd378..2233073 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/EntityTypeMetadataRepository.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/EntityTypeMetadataRepository.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.repository; +package net.sf.esfinge.aom.model.rolemapper.metadata.repository; -import org.esfinge.aom.model.rolemapper.metadata.reader.provider.EntityTypeReaderProvider; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider.EntityTypeReaderProvider; public class EntityTypeMetadataRepository extends ElementMetadataRepository { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/FixedPropertyMetadataRepository.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/FixedPropertyMetadataRepository.java similarity index 66% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/FixedPropertyMetadataRepository.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/FixedPropertyMetadataRepository.java index 85651e8..9c1c3eb 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/FixedPropertyMetadataRepository.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/FixedPropertyMetadataRepository.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.model.rolemapper.metadata.repository; +package net.sf.esfinge.aom.model.rolemapper.metadata.repository; -import org.esfinge.aom.api.model.rolemapper.metadata.reader.IFixedPropertyReader; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.reader.provider.FixedPropertyReaderProvider; +import net.sf.esfinge.aom.api.model.rolemapper.metadata.reader.IFixedPropertyReader; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider.FixedPropertyReaderProvider; public class FixedPropertyMetadataRepository { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/PropertyMetadataRepository.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/PropertyMetadataRepository.java similarity index 72% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/PropertyMetadataRepository.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/PropertyMetadataRepository.java index 6c4aef2..a76fe8d 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/PropertyMetadataRepository.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/PropertyMetadataRepository.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.repository; +package net.sf.esfinge.aom.model.rolemapper.metadata.repository; -import org.esfinge.aom.model.rolemapper.metadata.reader.provider.PropertyReaderProvider; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider.PropertyReaderProvider; public class PropertyMetadataRepository extends ElementMetadataRepository { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/PropertyTypeMetadataRepository.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/PropertyTypeMetadataRepository.java similarity index 73% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/PropertyTypeMetadataRepository.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/PropertyTypeMetadataRepository.java index 0b4db24..5b3145c 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/model/rolemapper/metadata/repository/PropertyTypeMetadataRepository.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/model/rolemapper/metadata/repository/PropertyTypeMetadataRepository.java @@ -1,6 +1,6 @@ -package org.esfinge.aom.model.rolemapper.metadata.repository; +package net.sf.esfinge.aom.model.rolemapper.metadata.repository; -import org.esfinge.aom.model.rolemapper.metadata.reader.provider.PropertyTypeReaderProvider; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.provider.PropertyTypeReaderProvider; public class PropertyTypeMetadataRepository extends ElementMetadataRepository { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/modelretriever/factories/ModelRetrieverFactory.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/modelretriever/factories/ModelRetrieverFactory.java similarity index 87% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/modelretriever/factories/ModelRetrieverFactory.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/modelretriever/factories/ModelRetrieverFactory.java index 85e7501..4599f94 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/modelretriever/factories/ModelRetrieverFactory.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/modelretriever/factories/ModelRetrieverFactory.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.modelretriever.factories; +package net.sf.esfinge.aom.modelretriever.factories; import java.util.ServiceLoader; -import org.esfinge.aom.api.modelretriever.IModelRetriever; +import net.sf.esfinge.aom.api.modelretriever.IModelRetriever; public class ModelRetrieverFactory { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/utils/Utils.java b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/utils/Utils.java similarity index 93% rename from AOMRoleMapper/src/main/java/org/esfinge/aom/utils/Utils.java rename to AOMRoleMapper/src/main/java/net/sf/esfinge/aom/utils/Utils.java index c42f5c9..f4d46fb 100644 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/utils/Utils.java +++ b/AOMRoleMapper/src/main/java/net/sf/esfinge/aom/utils/Utils.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.utils; +package net.sf.esfinge.aom.utils; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -147,9 +147,9 @@ public static boolean valueIsAssignable (Class classToBeChecked, Object value { // FIXME Tratar Autobox - quando classToBeChecked é do tipo primiário (ex.: int.class) /* AOMRoleMapperTest/bankingExample/savingsAccount/CreateEntity - Caused by: org.esfinge.aom.exceptions.EsfingeAOMException: The given value 0 is not valid for type accountNumber - at org.esfinge.aom.model.rolemapper.core.AdapterFixedProperty.setValue(AdapterFixedProperty.java:59) - at org.esfinge.aom.model.rolemapper.core.AdapterEntity.setProperty(AdapterEntity.java:231) + Caused by: net.sf.esfinge.aom.exceptions.EsfingeAOMException: The given value 0 is not valid for type accountNumber + at net.sf.esfinge.aom.model.rolemapper.core.AdapterFixedProperty.setValue(AdapterFixedProperty.java:59) + at net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity.setProperty(AdapterEntity.java:231) */ if (Number.class.isAssignableFrom(value.getClass())) { diff --git a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/rolemapper/metadata/reader/IFixedPropertyReader.java b/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/rolemapper/metadata/reader/IFixedPropertyReader.java deleted file mode 100644 index 5d2bc94..0000000 --- a/AOMRoleMapper/src/main/java/org/esfinge/aom/api/model/rolemapper/metadata/reader/IFixedPropertyReader.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.esfinge.aom.api.model.rolemapper.metadata.reader; - -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FixedPropertyDescriptor; - -public interface IFixedPropertyReader { - - public FixedPropertyDescriptor getDescriptor() throws EsfingeAOMException; - -} \ No newline at end of file diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/manager/ModelManagerTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/manager/ModelManagerTest.java similarity index 96% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/manager/ModelManagerTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/manager/ModelManagerTest.java index d123a54..ec3efcd 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/manager/ModelManagerTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/manager/ModelManagerTest.java @@ -1,18 +1,19 @@ -package org.esfinge.aom.manager; +package net.sf.esfinge.aom.manager; import java.util.List; -import org.esfinge.aom.api.model.HasProperties; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.manager.fake.FakeModelRetriever; -import org.esfinge.aom.model.impl.GenericEntityType; -import org.esfinge.aom.model.impl.GenericPropertyType; import org.junit.After; import org.junit.Test; import junit.framework.Assert; +import net.sf.esfinge.aom.api.model.HasProperties; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.manager.ModelManager; +import net.sf.esfinge.aom.manager.fake.FakeModelRetriever; +import net.sf.esfinge.aom.model.impl.GenericEntityType; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; public class ModelManagerTest { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/manager/fake/FakeModelRetriever.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/manager/fake/FakeModelRetriever.java similarity index 92% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/manager/fake/FakeModelRetriever.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/manager/fake/FakeModelRetriever.java index b2ff222..06a82dd 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/manager/fake/FakeModelRetriever.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/manager/fake/FakeModelRetriever.java @@ -1,20 +1,20 @@ -package org.esfinge.aom.manager.fake; +package net.sf.esfinge.aom.manager.fake; 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.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 org.esfinge.aom.model.impl.GenericEntityType; -import org.esfinge.aom.model.impl.GenericPropertyType; +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; +import net.sf.esfinge.aom.model.impl.GenericEntityType; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; public class FakeModelRetriever implements IModelRetriever { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/dynamic/factory/AdapterFactoryTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/dynamic/factory/AdapterFactoryTest.java similarity index 88% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/dynamic/factory/AdapterFactoryTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/dynamic/factory/AdapterFactoryTest.java index 84e033f..5a855e9 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/dynamic/factory/AdapterFactoryTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/dynamic/factory/AdapterFactoryTest.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.factory; +package net.sf.esfinge.aom.model.dynamic.factory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -7,18 +7,20 @@ import java.util.HashMap; import java.util.Map; -import org.esfinge.aom.api.model.HasProperties; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.dynamic.exceptions.AdapterFactoryClassConstructionException; -import org.esfinge.aom.model.dynamic.exceptions.AdapterFactoryFileReaderException; -import org.esfinge.aom.model.impl.GenericEntityType; -import org.esfinge.aom.model.impl.GenericPropertyType; import org.junit.Before; import org.junit.Test; +import net.sf.esfinge.aom.api.model.HasProperties; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.dynamic.exceptions.AdapterFactoryClassConstructionException; +import net.sf.esfinge.aom.model.dynamic.exceptions.AdapterFactoryFileReaderException; +import net.sf.esfinge.aom.model.dynamic.factory.AdapterFactory; +import net.sf.esfinge.aom.model.impl.GenericEntityType; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; + public class AdapterFactoryTest { private AdapterFactory af; private String fileName; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/dynamic/util/PropertiesReaderJsonPatternTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/dynamic/util/PropertiesReaderJsonPatternTest.java similarity index 92% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/dynamic/util/PropertiesReaderJsonPatternTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/dynamic/util/PropertiesReaderJsonPatternTest.java index 8ede651..1f7a223 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/dynamic/util/PropertiesReaderJsonPatternTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/dynamic/util/PropertiesReaderJsonPatternTest.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.model.dynamic.util; +package net.sf.esfinge.aom.model.dynamic.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -7,11 +7,12 @@ import java.io.IOException; -import org.esfinge.aom.model.dynamic.utils.PropertiesReaderJsonPattern; import org.json.simple.parser.ParseException; import org.junit.Before; import org.junit.Test; +import net.sf.esfinge.aom.model.dynamic.utils.PropertiesReaderJsonPattern; + public class PropertiesReaderJsonPatternTest { private PropertiesReaderJsonPattern readerJson; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityTest.java similarity index 88% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityTest.java index e60b238..e9d0ac3 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityTest.java @@ -1,23 +1,27 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import junit.framework.Assert; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericEntityType; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntityType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterProperty; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.Account; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountProperty; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountWithFixedProperties; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericEntityType; -import org.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.Account; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountProperty; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountWithFixedProperties; import org.junit.Test; public class AdapterEntityTest { - private static final String accountClass = "org.esfinge.aom.rolemapper.core.testclasses.entitytest.Account"; - private static final String accountTypeClass = "org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountType"; - private static final String accountPropertyTypeClass = "org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountPropertyType"; + private static final String accountClass = "net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.Account"; + private static final String accountTypeClass = "net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountType"; + private static final String accountPropertyTypeClass = "net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountPropertyType"; @Test public void testConstructor() throws Exception diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityTypeTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityTypeTest.java similarity index 91% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityTypeTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityTypeTest.java index cf02dae..b5779d8 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterEntityTypeTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterEntityTypeTest.java @@ -1,26 +1,28 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; import junit.framework.Assert; +import net.sf.esfinge.aom.api.model.HasProperties; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntityType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.Account; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountTypeFixedProperties; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountTypeWithMetadataMap; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountTypeWithoutAnnotations; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.MetadatasAccountType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.SimpleAccountType; -import org.esfinge.aom.api.model.HasProperties; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.Account; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountTypeFixedProperties; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountTypeWithMetadataMap; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountTypeWithoutAnnotations; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.MetadatasAccountType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.SimpleAccountType; import org.junit.Test; public class AdapterEntityTypeTest { - private static final String accountTypeClass = "org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountType"; + private static final String accountTypeClass = "net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.AccountType"; @Test public void testConstructor() throws Exception diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyTest.java similarity index 86% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyTest.java index 1ebf768..d7dfadb 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterFixedPropertyTest.java @@ -1,11 +1,12 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.impl.GenericPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountWithFixedProperties; import org.junit.Test; import junit.framework.Assert; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.impl.GenericPropertyType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterFixedProperty; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountWithFixedProperties; public class AdapterFixedPropertyTest { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyMapTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyMapTest.java similarity index 91% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyMapTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyMapTest.java index 71ae832..1fc5622 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyMapTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyMapTest.java @@ -1,11 +1,12 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountWithPropertyMap; import org.junit.After; import org.junit.Test; import junit.framework.Assert; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountWithPropertyMap; public class AdapterPropertyMapTest { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyTest.java similarity index 88% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyTest.java index 00b90ac..cb5a65e 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyTest.java @@ -1,18 +1,22 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.rolemapper.core.testclasses.propertytest.Account; -import org.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountProperty; -import org.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountType; import org.junit.Test; import junit.framework.Assert; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntityType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterProperty; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest.Account; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountProperty; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountType; public class AdapterPropertyTest { - private static final String accountPropertyClass = "org.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountProperty"; + private static final String accountPropertyClass = "net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest.AccountProperty"; @Test public void testConstructor() throws Exception diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyTypeTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyTypeTest.java similarity index 92% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyTypeTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyTypeTest.java index 9e7d978..d8f5cd7 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/model/rolemapper/core/AdapterPropertyTypeTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/model/rolemapper/core/AdapterPropertyTypeTest.java @@ -1,18 +1,21 @@ -package org.esfinge.aom.model.rolemapper.core; +package net.sf.esfinge.aom.model.rolemapper.core; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.rolemapper.core.testclasses.propertytypetest.Account; -import org.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountPropertyType; -import org.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountPropertyTypeWithMetadataMap; -import org.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountType; -import org.esfinge.aom.rolemapper.core.testclasses.propertytypetest.MetadatasAccountPropertyType; import org.junit.Test; import junit.framework.Assert; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntityType; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest.Account; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountPropertyType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountPropertyTypeWithMetadataMap; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest.MetadatasAccountPropertyType; public class AdapterPropertyTypeTest { - private static final String accountPropertyTypeClass = "org.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountPropertyType"; + private static final String accountPropertyTypeClass = "net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest.AccountPropertyType"; @Test public void testConstructor() throws Exception diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/Account.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/Account.java similarity index 75% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/Account.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/Account.java index b2da052..4c899be 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/Account.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/Account.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; @Entity public class Account implements IAccount { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountProperty.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountProperty.java similarity index 59% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountProperty.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountProperty.java index 983f9b2..cd3860e 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountProperty.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountProperty.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class AccountProperty { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountPropertyType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountPropertyType.java similarity index 72% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountPropertyType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountPropertyType.java index a89ab6a..2368226 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountPropertyType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountPropertyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class AccountPropertyType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountType.java similarity index 79% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountType.java index 723d96b..7c98074 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountType.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountWithFixedProperties.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountWithFixedProperties.java similarity index 74% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountWithFixedProperties.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountWithFixedProperties.java index 74b2705..7841843 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountWithFixedProperties.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountWithFixedProperties.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class AccountWithFixedProperties implements IAccount { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/IAccount.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/IAccount.java similarity index 81% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/IAccount.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/IAccount.java index 08312c8..56d80c6 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/IAccount.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytest/IAccount.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest; import java.util.List; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/Account.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/Account.java similarity index 75% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/Account.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/Account.java index eb16762..43396a7 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/Account.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/Account.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; @Entity public class Account { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountProperty.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountProperty.java similarity index 58% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountProperty.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountProperty.java index e6e16be..6410968 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytest/AccountProperty.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountProperty.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class AccountProperty { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountPropertyType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountPropertyType.java similarity index 72% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountPropertyType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountPropertyType.java index 5704075..a5bb510 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountPropertyType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountPropertyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class AccountPropertyType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountType.java similarity index 69% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountType.java index 88e18f0..6947613 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountType.java @@ -1,16 +1,16 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountType implements IAccountType { @@ -40,7 +40,7 @@ public Account createAccount() } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() */ @Override public Set getPropertyTypes() { @@ -48,7 +48,7 @@ public Set getPropertyTypes() { } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) */ @Override public void setPropertyTypes(Set propertyTypes) { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeFixedProperties.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeFixedProperties.java similarity index 62% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeFixedProperties.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeFixedProperties.java index 8123a12..a5c5a47 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeFixedProperties.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeFixedProperties.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountTypeFixedProperties implements IAccountType { @@ -27,7 +27,7 @@ public Account createAccount() } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() */ @Override public Set getPropertyTypes() { @@ -35,7 +35,7 @@ public Set getPropertyTypes() { } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) */ @Override public void setPropertyTypes(Set propertyTypes) { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithMetadataMap.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithMetadataMap.java similarity index 69% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithMetadataMap.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithMetadataMap.java index e786230..d053da8 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithMetadataMap.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithMetadataMap.java @@ -1,16 +1,16 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountTypeWithMetadataMap implements IAccountType { @@ -40,7 +40,7 @@ public Account createAccount() } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() */ @Override public Set getPropertyTypes() { @@ -48,7 +48,7 @@ public Set getPropertyTypes() { } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) */ @Override public void setPropertyTypes(Set propertyTypes) { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithoutAnnotations.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithoutAnnotations.java similarity index 63% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithoutAnnotations.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithoutAnnotations.java index 5038071..be0595d 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithoutAnnotations.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountTypeWithoutAnnotations.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountTypeWithoutAnnotations implements IAccountType { @@ -23,7 +23,7 @@ public Account createAccount() } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() */ @Override public Set getPropertyTypes() { @@ -31,7 +31,7 @@ public Set getPropertyTypes() { } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) */ @Override public void setPropertyTypes(Set propertyTypes) { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountWithFixedProperties.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountWithFixedProperties.java similarity index 75% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountWithFixedProperties.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountWithFixedProperties.java index 049e893..79d7961 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountWithFixedProperties.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountWithFixedProperties.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class AccountWithFixedProperties { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/IAccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/IAccountType.java similarity index 77% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/IAccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/IAccountType.java index 6c9932b..0f481cd 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/IAccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/IAccountType.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.Set; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/MetadatasAccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/MetadatasAccountType.java similarity index 59% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/MetadatasAccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/MetadatasAccountType.java index e3aff66..13a117d 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/MetadatasAccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/MetadatasAccountType.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @PropertyType public class MetadatasAccountType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/SimpleAccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/SimpleAccountType.java similarity index 54% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/SimpleAccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/SimpleAccountType.java index 9e487b3..61af551 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/SimpleAccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/entitytypetest/SimpleAccountType.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class SimpleAccountType implements IAccountType { @@ -18,7 +18,7 @@ public class SimpleAccountType implements IAccountType { /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#getPropertyTypes() */ @Override public Set getPropertyTypes() { @@ -26,7 +26,7 @@ public Set getPropertyTypes() { } /* (non-Javadoc) - * @see org.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) + * @see net.sf.esfinge.aom.rolemapper.core.testclasses.entitytypetest.IAccountType#setPropertyTypes(java.util.Set) */ @Override public void setPropertyTypes(Set propertyTypes) { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/Account.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/Account.java similarity index 75% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/Account.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/Account.java index 0ed1546..79522aa 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/Account.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/Account.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; @Entity public class Account { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountProperty.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountProperty.java similarity index 59% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountProperty.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountProperty.java index d611403..f728b5f 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/entitytypetest/AccountProperty.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountProperty.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.rolemapper.core.testclasses.entitytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class AccountProperty { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountPropertyType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountPropertyType.java similarity index 72% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountPropertyType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountPropertyType.java index 42585a3..c61095e 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountPropertyType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountPropertyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class AccountPropertyType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountType.java similarity index 75% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountType.java index d2123ad..aeec95e 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountType.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountWithPropertyMap.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountWithPropertyMap.java similarity index 61% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountWithPropertyMap.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountWithPropertyMap.java index b52a4ca..c988129 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountWithPropertyMap.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytest/AccountWithPropertyMap.java @@ -1,14 +1,14 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytest; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityPropertyMap; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountProperty; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountType; -import org.esfinge.aom.rolemapper.core.testclasses.entitytest.IAccount; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityPropertyMap; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountProperty; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.AccountType; +import net.sf.esfinge.aom.rolemapper.core.testclasses.entitytest.IAccount; @Entity public class AccountWithPropertyMap implements IAccount { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/Account.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/Account.java similarity index 74% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/Account.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/Account.java index 12ff334..32730c9 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/Account.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/Account.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; @Entity public class Account { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountProperty.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountProperty.java similarity index 58% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountProperty.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountProperty.java index 3e5bebb..36fb2d1 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountProperty.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountProperty.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class AccountProperty { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyType.java similarity index 77% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyType.java index 62f90eb..7cee115 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyType.java @@ -1,16 +1,16 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedMetadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Metadata; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class AccountPropertyType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyTypeWithMetadataMap.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyTypeWithMetadataMap.java similarity index 61% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyTypeWithMetadataMap.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyTypeWithMetadataMap.java index e9f6dd6..df9767e 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyTypeWithMetadataMap.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountPropertyTypeWithMetadataMap.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest; import java.util.HashMap; import java.util.Map; -import org.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.MetadataMap; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @PropertyType public class AccountPropertyTypeWithMetadataMap { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountType.java similarity index 73% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountType.java index 96d29a0..6e22f7f 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/AccountType.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/MetadatasAccountPropertyType.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/MetadatasAccountPropertyType.java similarity index 59% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/MetadatasAccountPropertyType.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/MetadatasAccountPropertyType.java index b43a2fc..12c3b4f 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/core/testclasses/propertytypetest/MetadatasAccountPropertyType.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/core/testclasses/propertytypetest/MetadatasAccountPropertyType.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.rolemapper.core.testclasses.propertytypetest; +package net.sf.esfinge.aom.rolemapper.core.testclasses.propertytypetest; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @PropertyType public class MetadatasAccountPropertyType { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/FieldAnnotationReaderTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/FieldAnnotationReaderTest.java similarity index 92% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/FieldAnnotationReaderTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/FieldAnnotationReaderTest.java index de6cf03..4b5d836 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/FieldAnnotationReaderTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/FieldAnnotationReaderTest.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.metadata.reader; +package net.sf.esfinge.aom.rolemapper.metadata.reader; import java.lang.reflect.Method; import java.util.ArrayList; @@ -6,13 +6,13 @@ import java.util.Set; import junit.framework.Assert; +import net.sf.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; +import net.sf.esfinge.aom.model.rolemapper.metadata.reader.FieldAnnotationReader; +import net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses.ClassWithCollection; +import net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses.FieldAnnotation; +import net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses.SimpleClass; +import net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses.SingleFieldAnnotation; -import org.esfinge.aom.model.rolemapper.metadata.descriptors.FieldDescriptor; -import org.esfinge.aom.model.rolemapper.metadata.reader.FieldAnnotationReader; -import org.esfinge.aom.rolemapper.metadata.reader.testclasses.ClassWithCollection; -import org.esfinge.aom.rolemapper.metadata.reader.testclasses.FieldAnnotation; -import org.esfinge.aom.rolemapper.metadata.reader.testclasses.SimpleClass; -import org.esfinge.aom.rolemapper.metadata.reader.testclasses.SingleFieldAnnotation; import org.junit.Test; public class FieldAnnotationReaderTest { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/ClassWithCollection.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/ClassWithCollection.java similarity index 94% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/ClassWithCollection.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/ClassWithCollection.java index 0b2808b..3d19499 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/ClassWithCollection.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/ClassWithCollection.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.metadata.reader.testclasses; +package net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses; import java.util.LinkedHashSet; import java.util.List; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/FieldAnnotation.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/FieldAnnotation.java similarity index 81% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/FieldAnnotation.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/FieldAnnotation.java index 336a4e2..e944214 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/FieldAnnotation.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/FieldAnnotation.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.metadata.reader.testclasses; +package net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/SimpleClass.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/SimpleClass.java similarity index 94% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/SimpleClass.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/SimpleClass.java index 9e5d558..560c229 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/SimpleClass.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/SimpleClass.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.metadata.reader.testclasses; +package net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses; public class SimpleClass { diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/SingleFieldAnnotation.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/SingleFieldAnnotation.java similarity index 81% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/SingleFieldAnnotation.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/SingleFieldAnnotation.java index 9432b71..5f9d0c6 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/rolemapper/metadata/reader/testclasses/SingleFieldAnnotation.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/rolemapper/metadata/reader/testclasses/SingleFieldAnnotation.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.rolemapper.metadata.reader.testclasses; +package net.sf.esfinge.aom.rolemapper.metadata.reader.testclasses; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/AOMRoleMapper/src/test/java/org/esfinge/aom/utils/UtilsTest.java b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/utils/UtilsTest.java similarity index 99% rename from AOMRoleMapper/src/test/java/org/esfinge/aom/utils/UtilsTest.java rename to AOMRoleMapper/src/test/java/net/sf/esfinge/aom/utils/UtilsTest.java index ee81b15..38c77d8 100644 --- a/AOMRoleMapper/src/test/java/org/esfinge/aom/utils/UtilsTest.java +++ b/AOMRoleMapper/src/test/java/net/sf/esfinge/aom/utils/UtilsTest.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.utils; +package net.sf.esfinge.aom.utils; import java.lang.reflect.Field; import java.security.InvalidParameterException; @@ -8,6 +8,7 @@ import java.util.Map; import junit.framework.Assert; +import net.sf.esfinge.aom.utils.Utils; import org.junit.Test; diff --git a/AOMRoleMapper/src/test/resources/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever b/AOMRoleMapper/src/test/resources/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever new file mode 100644 index 0000000..2c8e50c --- /dev/null +++ b/AOMRoleMapper/src/test/resources/META-INF/services/net.sf.esfinge.aom.api.modelretriever.IModelRetriever @@ -0,0 +1 @@ +net.sf.esfinge.aom.manager.fake.FakeModelRetriever \ No newline at end of file diff --git a/AOMRoleMapper/src/test/resources/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever b/AOMRoleMapper/src/test/resources/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever deleted file mode 100644 index 6f4e7a8..0000000 --- a/AOMRoleMapper/src/test/resources/META-INF/services/org.esfinge.aom.api.modelretriever.IModelRetriever +++ /dev/null @@ -1 +0,0 @@ -org.esfinge.aom.manager.fake.FakeModelRetriever \ No newline at end of file diff --git a/Examples/AOMRoleMapperBankingExample/pom.xml b/Examples/AOMRoleMapperBankingExample/pom.xml index 0229bf4..980143a 100644 --- a/Examples/AOMRoleMapperBankingExample/pom.xml +++ b/Examples/AOMRoleMapperBankingExample/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-banking-example 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -70,7 +69,7 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/Account.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/Account.java similarity index 69% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/Account.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/Account.java index 6ad48e5..8cd6449 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/Account.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/Account.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.example.bankingsystem.accounts; +package net.sf.esfinge.aom.example.bankingsystem.accounts; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class Account { diff --git a/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountProperty.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountProperty.java new file mode 100644 index 0000000..3d5761e --- /dev/null +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountProperty.java @@ -0,0 +1,31 @@ +package net.sf.esfinge.aom.example.bankingsystem.accounts; + +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; + +@EntityProperty +public class AccountProperty { + + @PropertyType + private AccountPropertyType propertyType; + + @PropertyValue + private Object value; + + public AccountPropertyType getPropertyType() { + return propertyType; + } + + public void setPropertyType(AccountPropertyType propertyType) { + this.propertyType = propertyType; + } + + public Object getValue() { + return value; + } + + public void setValue(Object value) { + this.value = value; + } +} diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountPropertyType.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountPropertyType.java similarity index 61% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountPropertyType.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountPropertyType.java index a70dd72..7b26f2a 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountPropertyType.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountPropertyType.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.example.bankingsystem.accounts; +package net.sf.esfinge.aom.example.bankingsystem.accounts; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class AccountPropertyType { diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountType.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountType.java similarity index 71% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountType.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountType.java index 2eeb9cf..da27de7 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountType.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/accounts/AccountType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.example.bankingsystem.accounts; +package net.sf.esfinge.aom.example.bankingsystem.accounts; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class AccountType { diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/Person.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/Person.java similarity index 63% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/Person.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/Person.java index a96d0d8..ee93045 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/Person.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/Person.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.example.bankingsystem.person; +package net.sf.esfinge.aom.example.bankingsystem.person; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; @Entity public class Person { diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonProperty.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonProperty.java similarity index 57% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonProperty.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonProperty.java index 3ec0136..eea4f57 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonProperty.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonProperty.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.example.bankingsystem.person; +package net.sf.esfinge.aom.example.bankingsystem.person; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class PersonProperty { diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonPropertyType.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonPropertyType.java similarity index 70% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonPropertyType.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonPropertyType.java index 3c36bba..27f2c09 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonPropertyType.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonPropertyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.example.bankingsystem.person; +package net.sf.esfinge.aom.example.bankingsystem.person; import java.util.HashSet; import java.util.Set; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class PersonPropertyType { diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonType.java b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonType.java similarity index 68% rename from Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonType.java rename to Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonType.java index 9b31066..d4dd014 100644 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/person/PersonType.java +++ b/Examples/AOMRoleMapperBankingExample/src/net/sf/esfinge/aom/example/bankingsystem/person/PersonType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.example.bankingsystem.person; +package net.sf.esfinge.aom.example.bankingsystem.person; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class PersonType { diff --git a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountProperty.java b/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountProperty.java deleted file mode 100644 index 81b6b30..0000000 --- a/Examples/AOMRoleMapperBankingExample/src/org/esfinge/aom/example/bankingsystem/accounts/AccountProperty.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.esfinge.aom.example.bankingsystem.accounts; - -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; - -@EntityProperty -public class AccountProperty { - - @PropertyType - private AccountPropertyType propertyType; - - @PropertyValue - private Object value; - - public AccountPropertyType getPropertyType() { - return propertyType; - } - - public void setPropertyType(AccountPropertyType propertyType) { - this.propertyType = propertyType; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } -} diff --git a/Examples/AOMRoleMapperMappingExamples/pom.xml b/Examples/AOMRoleMapperMappingExamples/pom.xml index 99791a8..5553eb6 100644 --- a/Examples/AOMRoleMapperMappingExamples/pom.xml +++ b/Examples/AOMRoleMapperMappingExamples/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-mapping-examples 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -70,7 +69,7 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/beanToAOM/Person.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/beanToAOM/Person.java similarity index 73% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/beanToAOM/Person.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/beanToAOM/Person.java index 3fc2c74..6d74a9b 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/beanToAOM/Person.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/beanToAOM/Person.java @@ -1,9 +1,9 @@ -package org.esfinge.aom.beanToAOM; +package net.sf.esfinge.aom.beanToAOM; import java.util.Date; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class Person { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/beanToAOM/PrincipalBeanToAOM.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/beanToAOM/PrincipalBeanToAOM.java similarity index 62% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/beanToAOM/PrincipalBeanToAOM.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/beanToAOM/PrincipalBeanToAOM.java index b7c5199..03342a7 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/beanToAOM/PrincipalBeanToAOM.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/beanToAOM/PrincipalBeanToAOM.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.beanToAOM; +package net.sf.esfinge.aom.beanToAOM; import java.util.Date; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; public class PrincipalBeanToAOM { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/Funcionario.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/Funcionario.java similarity index 62% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/Funcionario.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/Funcionario.java index 1f1d20a..6bd8aea 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/Funcionario.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/Funcionario.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.onlyPropertyList; +package net.sf.esfinge.aom.onlyPropertyList; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; @Entity public class Funcionario { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/FuncionarioInfo.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/FuncionarioInfo.java similarity index 59% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/FuncionarioInfo.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/FuncionarioInfo.java index e0e124f..5cbd1c1 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/FuncionarioInfo.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/FuncionarioInfo.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.onlyPropertyList; +package net.sf.esfinge.aom.onlyPropertyList; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class FuncionarioInfo { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/PrincipalOnlyPropertyList.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/PrincipalOnlyPropertyList.java similarity index 68% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/PrincipalOnlyPropertyList.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/PrincipalOnlyPropertyList.java index f293a48..19dff2f 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyList/PrincipalOnlyPropertyList.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyList/PrincipalOnlyPropertyList.java @@ -1,9 +1,9 @@ -package org.esfinge.aom.onlyPropertyList; +package net.sf.esfinge.aom.onlyPropertyList; -import org.esfinge.aom.api.model.HasProperties; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.api.model.HasProperties; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; public class PrincipalOnlyPropertyList { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyMap/Funcionario.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyMap/Funcionario.java similarity index 61% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyMap/Funcionario.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyMap/Funcionario.java index 0e31f56..a1f8a92 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyMap/Funcionario.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyMap/Funcionario.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.onlyPropertyMap; +package net.sf.esfinge.aom.onlyPropertyMap; import java.util.HashMap; import java.util.Map; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityPropertyMap; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityPropertyMap; @Entity public class Funcionario { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyMap/PrincipalOnlyPropertyMap.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyMap/PrincipalOnlyPropertyMap.java similarity index 72% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyMap/PrincipalOnlyPropertyMap.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyMap/PrincipalOnlyPropertyMap.java index bd36a7e..9cc5735 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyPropertyMap/PrincipalOnlyPropertyMap.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyPropertyMap/PrincipalOnlyPropertyMap.java @@ -1,9 +1,9 @@ -package org.esfinge.aom.onlyPropertyMap; +package net.sf.esfinge.aom.onlyPropertyMap; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IProperty; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IProperty; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; public class PrincipalOnlyPropertyMap { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/Person.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/Person.java similarity index 66% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/Person.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/Person.java index e44fba6..4628789 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/Person.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/Person.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.onlyTypeObject; +package net.sf.esfinge.aom.onlyTypeObject; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class Person { diff --git a/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/PersonType.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/PersonType.java new file mode 100644 index 0000000..87ab45e --- /dev/null +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/PersonType.java @@ -0,0 +1,20 @@ +package net.sf.esfinge.aom.onlyTypeObject; + +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; + +@EntityType +public class PersonType { + + @Name + private String typeName; + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + +} diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/PrincipalTypeObjectOnly.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/PrincipalTypeObjectOnly.java similarity index 59% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/PrincipalTypeObjectOnly.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/PrincipalTypeObjectOnly.java index 89a9527..6651a4b 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/PrincipalTypeObjectOnly.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/onlyTypeObject/PrincipalTypeObjectOnly.java @@ -1,10 +1,10 @@ -package org.esfinge.aom.onlyTypeObject; +package net.sf.esfinge.aom.onlyTypeObject; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.model.rolemapper.core.AdapterEntity; -import org.esfinge.aom.model.rolemapper.core.AdapterEntityType; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntityType; public class PrincipalTypeObjectOnly { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/Information.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/Information.java similarity index 60% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/Information.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/Information.java index d2dbab7..bfb3ac3 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/Information.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/Information.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.simpletypesquare; +package net.sf.esfinge.aom.simpletypesquare; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class Information { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/InformationType.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/InformationType.java similarity index 60% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/InformationType.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/InformationType.java index 5aa7e9e..be199ab 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/InformationType.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/InformationType.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.simpletypesquare; +package net.sf.esfinge.aom.simpletypesquare; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class InformationType { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/PrincipalTypeSquare.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/PrincipalTypeSquare.java similarity index 76% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/PrincipalTypeSquare.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/PrincipalTypeSquare.java index c4c8d1c..452f7e6 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/PrincipalTypeSquare.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/PrincipalTypeSquare.java @@ -1,14 +1,14 @@ -package org.esfinge.aom.simpletypesquare; +package net.sf.esfinge.aom.simpletypesquare; -import org.esfinge.aom.api.model.HasProperties; -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.esfinge.aom.model.factories.EntityTypeFactory; -import org.esfinge.aom.model.factories.PropertyTypeFactory; -import org.esfinge.aom.model.rolemapper.core.AdapterEntity; +import net.sf.esfinge.aom.api.model.HasProperties; +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; +import net.sf.esfinge.aom.model.factories.EntityTypeFactory; +import net.sf.esfinge.aom.model.factories.PropertyTypeFactory; +import net.sf.esfinge.aom.model.rolemapper.core.AdapterEntity; public class PrincipalTypeSquare { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/Product.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/Product.java similarity index 63% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/Product.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/Product.java index b8d6a52..bc1cc2b 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/Product.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/Product.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.simpletypesquare; +package net.sf.esfinge.aom.simpletypesquare; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class Product { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/ProductType.java b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/ProductType.java similarity index 66% rename from Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/ProductType.java rename to Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/ProductType.java index 73e564d..034c8d2 100644 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/simpletypesquare/ProductType.java +++ b/Examples/AOMRoleMapperMappingExamples/src/net/sf/esfinge/aom/simpletypesquare/ProductType.java @@ -1,11 +1,11 @@ -package org.esfinge.aom.simpletypesquare; +package net.sf.esfinge.aom.simpletypesquare; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class ProductType { diff --git a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/PersonType.java b/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/PersonType.java deleted file mode 100644 index d683b8f..0000000 --- a/Examples/AOMRoleMapperMappingExamples/src/org/esfinge/aom/onlyTypeObject/PersonType.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.esfinge.aom.onlyTypeObject; - -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; - -@EntityType -public class PersonType { - - @Name - private String typeName; - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - -} diff --git a/Examples/AOMRoleMapperMedicalExample/pom.xml b/Examples/AOMRoleMapperMedicalExample/pom.xml index a590b81..fe2434b 100644 --- a/Examples/AOMRoleMapperMedicalExample/pom.xml +++ b/Examples/AOMRoleMapperMedicalExample/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-medical-example 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -70,7 +69,7 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT diff --git a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/Observation.java b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/Observation.java similarity index 61% rename from Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/Observation.java rename to Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/Observation.java index 9c36aff..25d4e47 100644 --- a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/Observation.java +++ b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/Observation.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.example.medical; +package net.sf.esfinge.aom.example.medical; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyValue; @EntityProperty public class Observation { diff --git a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/ObservationType.java b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/ObservationType.java similarity index 60% rename from Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/ObservationType.java rename to Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/ObservationType.java index 8ec8419..2e11f38 100644 --- a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/ObservationType.java +++ b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/ObservationType.java @@ -1,8 +1,8 @@ -package org.esfinge.aom.example.medical; +package net.sf.esfinge.aom.example.medical; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyTypeType; @PropertyType public class ObservationType { diff --git a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/Party.java b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/Party.java similarity index 68% rename from Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/Party.java rename to Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/Party.java index d54441b..5fb1743 100644 --- a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/Party.java +++ b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/Party.java @@ -1,13 +1,13 @@ -package org.esfinge.aom.example.medical; +package net.sf.esfinge.aom.example.medical; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Entity; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Entity; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityProperty; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.FixedEntityProperty; @Entity public class Party { diff --git a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/PartyType.java b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/PartyType.java similarity index 63% rename from Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/PartyType.java rename to Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/PartyType.java index c347433..bf6cf9a 100644 --- a/Examples/AOMRoleMapperMedicalExample/src/org/esfinge/aom/example/medical/PartyType.java +++ b/Examples/AOMRoleMapperMedicalExample/src/net/sf/esfinge/aom/example/medical/PartyType.java @@ -1,12 +1,12 @@ -package org.esfinge.aom.example.medical; +package net.sf.esfinge.aom.example.medical; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; -import org.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; -import org.esfinge.aom.model.rolemapper.metadata.annotations.Name; -import org.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.CreateEntityMethod; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.EntityType; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.Name; +import net.sf.esfinge.aom.model.rolemapper.metadata.annotations.PropertyType; @EntityType public class PartyType { diff --git a/Examples/AOMRoleMapperTest/pom.xml b/Examples/AOMRoleMapperTest/pom.xml index 884bb62..63ae9a1 100644 --- a/Examples/AOMRoleMapperTest/pom.xml +++ b/Examples/AOMRoleMapperTest/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.esfinge + net.sf.esfinge aomrolemapper-test 1.0.0-SNAPSHOT jar @@ -19,7 +19,6 @@ - Eduardo Guerra @@ -70,32 +69,32 @@ - org.esfinge + net.sf.esfinge aomrolemapper 1.0.0-SNAPSHOT - org.esfinge + net.sf.esfinge aomrolemapper-banking-example 1.0.0-SNAPSHOT - org.esfinge + net.sf.esfinge aomrolemapper-medical-example 1.0.0-SNAPSHOT - org.esfinge + net.sf.esfinge aomrolemapper-mongo-persistence 1.0.0-SNAPSHOT - org.esfinge + net.sf.esfinge aomrolemapper-couch-persistence 1.0.0-SNAPSHOT - org.esfinge + net.sf.esfinge aomrolemapper-neo4j-persistence 1.0.0-SNAPSHOT diff --git a/Examples/AOMRoleMapperTest/src/Config/BankingModelConfiguration.xml b/Examples/AOMRoleMapperTest/src/Config/BankingModelConfiguration.xml index 6cbc95f..1699bad 100644 --- a/Examples/AOMRoleMapperTest/src/Config/BankingModelConfiguration.xml +++ b/Examples/AOMRoleMapperTest/src/Config/BankingModelConfiguration.xml @@ -1,24 +1,24 @@ - - - + + + - - - + + + - - - + + + - - - + + + - + diff --git a/Examples/AOMRoleMapperTest/src/Config/MedicalModelConfiguration.xml b/Examples/AOMRoleMapperTest/src/Config/MedicalModelConfiguration.xml index 2e2ad2b..983087c 100644 --- a/Examples/AOMRoleMapperTest/src/Config/MedicalModelConfiguration.xml +++ b/Examples/AOMRoleMapperTest/src/Config/MedicalModelConfiguration.xml @@ -1,13 +1,13 @@ - - - - + + + + - - - + + + \ No newline at end of file diff --git a/Examples/AOMRoleMapperTest/src/Config/Neo4jAOMConfiguration.xml b/Examples/AOMRoleMapperTest/src/Config/Neo4JAOMConfiguration.xml similarity index 100% rename from Examples/AOMRoleMapperTest/src/Config/Neo4jAOMConfiguration.xml rename to Examples/AOMRoleMapperTest/src/Config/Neo4JAOMConfiguration.xml diff --git a/Examples/AOMRoleMapperTest/src/org/esfinge/aom/performance/Helper.java b/Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/performance/Helper.java similarity index 84% rename from Examples/AOMRoleMapperTest/src/org/esfinge/aom/performance/Helper.java rename to Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/performance/Helper.java index 57fe765..e439d63 100644 --- a/Examples/AOMRoleMapperTest/src/org/esfinge/aom/performance/Helper.java +++ b/Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/performance/Helper.java @@ -1,19 +1,19 @@ -package org.esfinge.aom.performance; +package net.sf.esfinge.aom.performance; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.esfinge.aom.api.model.HasProperties; -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.esfinge.aom.manager.ModelManager; -import org.esfinge.aom.model.factories.EntityTypeFactory; -import org.esfinge.aom.model.factories.PropertyTypeFactory; +import net.sf.esfinge.aom.api.model.HasProperties; +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; +import net.sf.esfinge.aom.manager.ModelManager; +import net.sf.esfinge.aom.model.factories.EntityTypeFactory; +import net.sf.esfinge.aom.model.factories.PropertyTypeFactory; public class Helper { diff --git a/Examples/AOMRoleMapperTest/src/org/esfinge/aom/performance/Scenario1.java b/Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/performance/Scenario1.java similarity index 72% rename from Examples/AOMRoleMapperTest/src/org/esfinge/aom/performance/Scenario1.java rename to Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/performance/Scenario1.java index 9c4165d..fc9a99b 100644 --- a/Examples/AOMRoleMapperTest/src/org/esfinge/aom/performance/Scenario1.java +++ b/Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/performance/Scenario1.java @@ -1,13 +1,13 @@ -package org.esfinge.aom.performance; +package net.sf.esfinge.aom.performance; import java.util.ArrayList; import java.util.List; -import org.esfinge.aom.api.model.IEntity; -import org.esfinge.aom.api.model.IEntityType; -import org.esfinge.aom.api.model.IPropertyType; -import org.esfinge.aom.exceptions.EsfingeAOMException; -import org.esfinge.aom.manager.ModelManager; +import net.sf.esfinge.aom.api.model.IEntity; +import net.sf.esfinge.aom.api.model.IEntityType; +import net.sf.esfinge.aom.api.model.IPropertyType; +import net.sf.esfinge.aom.exceptions.EsfingeAOMException; +import net.sf.esfinge.aom.manager.ModelManager; public class Scenario1 { @@ -22,12 +22,12 @@ public static void main(String[] args) throws EsfingeAOMException { for (int i = 0; i < numberOfEntityTypes; i++) { IEntityType entityType = helper.createEntityType("banking", "entity" + i, - "org.esfinge.aom.example.bankingsystem.accounts.AccountType"); + "net.sf.esfinge.aom.example.bankingsystem.accounts.AccountType"); List propertyTypes = new ArrayList(); for (int j = 0; j < numberOfPropertyTypes; j++) { IPropertyType propertyType = helper.createPropertyType(entityType, "property" + j, java.lang.Integer.class, - "org.esfinge.aom.example.bankingsystem.accounts.AccountPropertyType"); + "net.sf.esfinge.aom.example.bankingsystem.accounts.AccountPropertyType"); propertyTypes.add(propertyType); } diff --git a/Examples/AOMRoleMapperTest/src/org/esfinge/aom/test/AOMTest.java b/Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/test/AOMTest.java similarity index 90% rename from Examples/AOMRoleMapperTest/src/org/esfinge/aom/test/AOMTest.java rename to Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/test/AOMTest.java index 8e96785..5baa321 100644 --- a/Examples/AOMRoleMapperTest/src/org/esfinge/aom/test/AOMTest.java +++ b/Examples/AOMRoleMapperTest/src/net/sf/esfinge/aom/test/AOMTest.java @@ -1,4 +1,4 @@ -package org.esfinge.aom.test; +package net.sf.esfinge.aom.test; import java.io.File; import java.lang.reflect.Type; @@ -6,16 +6,16 @@ import java.util.List; import java.util.Scanner; -import org.esfinge.aom.api.model.HasProperties; -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.esfinge.aom.manager.ModelManager; -import org.esfinge.aom.manager.configuration.ModelConfiguration; -import org.esfinge.aom.model.factories.EntityTypeFactory; -import org.esfinge.aom.model.factories.PropertyTypeFactory; +import net.sf.esfinge.aom.api.model.HasProperties; +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; +import net.sf.esfinge.aom.manager.ModelManager; +import net.sf.esfinge.aom.manager.configuration.ModelConfiguration; +import net.sf.esfinge.aom.model.factories.EntityTypeFactory; +import net.sf.esfinge.aom.model.factories.PropertyTypeFactory; public class AOMTest { @@ -52,13 +52,13 @@ private void selectPersistenceFrameworkMenu() { manager = ModelManager.getInstance(); break; case 2: - manager = ModelManager.getInstance("org.esfinge.aom.persistence.mongodb.MongoAOM"); + manager = ModelManager.getInstance("net.sf.esfinge.aom.persistence.mongodb.MongoAOM"); break; case 3: - manager = ModelManager.getInstance("org.esfinge.aom.persistence.couchdb.CouchAOM"); + manager = ModelManager.getInstance("net.sf.esfinge.aom.persistence.couchdb.CouchAOM"); break; case 4: - manager = ModelManager.getInstance("org.esfinge.aom.persistence.neo4j.Neo4jAOM"); + manager = ModelManager.getInstance("net.sf.esfinge.aom.persistence.neo4j.Neo4JAOM"); break; default: System.out.println("Invalid choice.");