seedstack · pith · Nov 5, 2015 · Nov 5, 2015
diff --git a/...d/persistence/mongodb/MongoDbAsyncIT.java → ...org/seedstack/mongodb/MongoDbAsyncIT.java b/...d/persistence/mongodb/MongoDbAsyncIT.java → ...org/seedstack/mongodb/MongoDbAsyncIT.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb;
+package org.seedstack.mongodb;
 
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.client.MongoClient;

diff --git a/...k/seed/persistence/mongodb/MongoDbIT.java → ...java/org/seedstack/mongodb/MongoDbIT.java b/...k/seed/persistence/mongodb/MongoDbIT.java → ...java/org/seedstack/mongodb/MongoDbIT.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb;
+package org.seedstack.mongodb;
 
 import com.mongodb.MongoClient;
 import com.mongodb.client.MongoDatabase;

diff --git a/...rg.seedstack.seed.persistence.mongo.props → ...F/configuration/org.seedstack.mongo.props b/...rg.seedstack.seed.persistence.mongo.props → ...F/configuration/org.seedstack.mongo.props
@@ -6,21 +6,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-[org.seedstack.seed.persistence.mongodb]
+[org.seedstack.mongodb]
 clients = client1, client2, client3
 
-[org.seedstack.seed.persistence.mongodb.client.client1]
+[org.seedstack.mongodb.client.client1]
 hosts = localhost
 option.connectionsPerHost = 50
 databases = db1
 
-[org.seedstack.seed.persistence.mongodb.client.client2]
+[org.seedstack.mongodb.client.client2]
 async = true
 hosts = localhost
 setting.connectionPool.maxSize = 50
 databases = db2
 
-[org.seedstack.seed.persistence.mongodb.client.client3]
+[org.seedstack.mongodb.client.client3]
 async = true
 hosts = localhost
 databases = db2

diff --git a/...godb/internal/AbstractMongoDbManager.java → ...phia/internal/AbstractMongoDbManager.java b/...godb/internal/AbstractMongoDbManager.java → ...phia/internal/AbstractMongoDbManager.java
@@ -5,15 +5,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.internal;
+package org.seedstack.mongodb.morphia.internal;
 
 import com.google.inject.Module;
 import com.mongodb.AuthenticationMechanism;
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
 import org.apache.commons.configuration.Configuration;
-import org.seedstack.seed.core.api.SeedException;
-import org.seedstack.seed.persistence.mongodb.api.MongoDbErrorCodes;
+import org.seedstack.seed.SeedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...mongodb/internal/AsyncMongoDbManager.java → ...morphia/internal/AsyncMongoDbManager.java b/...mongodb/internal/AsyncMongoDbManager.java → ...morphia/internal/AsyncMongoDbManager.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.internal;
+package org.seedstack.mongodb.morphia.internal;
 
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
@@ -23,8 +23,7 @@
 import com.mongodb.selector.ServerSelector;
 import org.apache.commons.configuration.Configuration;
 import org.bson.codecs.configuration.CodecRegistry;
-import org.seedstack.seed.core.api.SeedException;
-import org.seedstack.seed.persistence.mongodb.api.MongoDbErrorCodes;
+import org.seedstack.seed.SeedException;
 
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;

diff --git a/...stence/mongodb/api/MongoDbErrorCodes.java → ...b/morphia/internal/MongoDbErrorCodes.java b/...stence/mongodb/api/MongoDbErrorCodes.java → ...b/morphia/internal/MongoDbErrorCodes.java
@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.api;
+package org.seedstack.mongodb.morphia.internal;
 
-import org.seedstack.seed.core.api.ErrorCode;
+import org.seedstack.seed.ErrorCode;
 
 public enum MongoDbErrorCodes implements ErrorCode {
     MISSING_URI,

diff --git a/...ence/mongodb/internal/MongoDbManager.java → ...godb/morphia/internal/MongoDbManager.java b/...ence/mongodb/internal/MongoDbManager.java → ...godb/morphia/internal/MongoDbManager.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.internal;
+package org.seedstack.mongodb.morphia.internal;
 
 import com.google.inject.Module;
 import org.apache.commons.configuration.Configuration;

diff --git a/...tence/mongodb/internal/MongoDbModule.java → ...ngodb/morphia/internal/MongoDbModule.java b/...tence/mongodb/internal/MongoDbModule.java → ...ngodb/morphia/internal/MongoDbModule.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.internal;
+package org.seedstack.mongodb.morphia.internal;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Key;

diff --git a/...tence/mongodb/internal/MongoDbPlugin.java → ...ngodb/morphia/internal/MongoDbPlugin.java b/...tence/mongodb/internal/MongoDbPlugin.java → ...ngodb/morphia/internal/MongoDbPlugin.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.internal;
+package org.seedstack.mongodb.morphia.internal;
 
 import com.google.inject.AbstractModule;
 import io.nuun.kernel.api.Plugin;
@@ -14,10 +14,9 @@
 import io.nuun.kernel.api.plugin.context.InitContext;
 import io.nuun.kernel.core.AbstractPlugin;
 import org.apache.commons.configuration.Configuration;
-import org.seedstack.seed.core.api.Application;
-import org.seedstack.seed.core.api.SeedException;
+import org.seedstack.seed.Application;
+import org.seedstack.seed.SeedException;
 import org.seedstack.seed.core.internal.application.ApplicationPlugin;
-import org.seedstack.seed.persistence.mongodb.api.MongoDbErrorCodes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,9 +26,9 @@
 import java.util.Set;
 
 public class MongoDbPlugin extends AbstractPlugin {
-    public static final String MONGO_PLUGIN_CONFIGURATION_PREFIX = "org.seedstack.seed.persistence.mongodb";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbPlugin.class);
+    public static final String CONFIGURATION_PREFIX = "org.seedstack.mongodb";
 
     private static class SyncHolder {
         private static final MongoDbManager INSTANCE = new SyncMongoDbManager();
@@ -44,7 +43,7 @@ private static class AsyncHolder {
 
     @Override
     public String name() {
-        return "seed-persistence-mongodb-plugin";
+        return "mongodb";
     }
 
     @Override
@@ -56,7 +55,7 @@ public InitState init(InitContext initContext) {
         for (Plugin plugin : initContext.pluginsRequired()) {
             if (plugin instanceof ApplicationPlugin) {
                 application = ((ApplicationPlugin) plugin).getApplication();
-                mongoConfiguration = application.getConfiguration().subset(MongoDbPlugin.MONGO_PLUGIN_CONFIGURATION_PREFIX);
+                mongoConfiguration = application.getConfiguration().subset(MongoDbPlugin.CONFIGURATION_PREFIX);
             }
         }
 

diff --git a/.../mongodb/internal/SyncMongoDbManager.java → .../morphia/internal/SyncMongoDbManager.java b/.../mongodb/internal/SyncMongoDbManager.java → .../morphia/internal/SyncMongoDbManager.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb.internal;
+package org.seedstack.mongodb.morphia.internal;
 
 import com.mongodb.DBDecoderFactory;
 import com.mongodb.DBEncoderFactory;
@@ -19,8 +19,7 @@
 import com.mongodb.client.MongoDatabase;
 import org.apache.commons.configuration.Configuration;
 import org.bson.codecs.configuration.CodecRegistry;
-import org.seedstack.seed.core.api.SeedException;
-import org.seedstack.seed.persistence.mongodb.api.MongoDbErrorCodes;
+import org.seedstack.seed.SeedException;
 
 import javax.net.SocketFactory;
 import java.util.Iterator;

diff --git a/....mongodb.api.MongoDbErrorCodes.properties → ...odb.internal.MongoDbErrorCodes.properties b/....mongodb.api.MongoDbErrorCodes.properties → ...odb.internal.MongoDbErrorCodes.properties
diff --git a/core/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin b/core/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
@@ -1 +1 @@
-org.seedstack.seed.persistence.mongodb.internal.MongoDbPlugin
+org.seedstack.mongodb.morphia.internal.MongoDbPlugin
diff --git a/...k/seed/persistence/mongodb/MongoDbIT.java → .../seedstack/mongodb/morphia/MongoDbIT.java b/...k/seed/persistence/mongodb/MongoDbIT.java → .../seedstack/mongodb/morphia/MongoDbIT.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.persistence.mongodb;
+package org.seedstack.mongodb.morphia;
 
 import com.mongodb.MongoClient;
 import com.mongodb.client.MongoDatabase;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.seedstack.seed.persistence.mongodb.internal.MongoDbPlugin
		org.seedstack.mongodb.morphia.internal.MongoDbPlugin