Finalized version

Author: salimm

libs/allconfig.jar

@@ -1,9 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>MoujiNameServer</groupId>
-	<artifactId>MoujiNameServer</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<groupId>org.mouji</groupId>
+	<artifactId>moujinameserver</artifactId>
+	<version>0.1.0</version>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>org.mouji</groupId>
+		<artifactId>moujiparent</artifactId>
+		<version>0.1.0</version>
+		<relativePath>../</relativePath>
+	</parent>
+
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<plugins>
@@ -23,6 +32,20 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<dependency>
+			<groupId>org.mouji</groupId>
+			<artifactId>moujicommon</artifactId>
+			<version>0.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mouji</groupId>
+			<artifactId>moujistub4j</artifactId>
+			<version>0.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+
 		<!-- https://mvnrepository.com/artifact/org.eclipse.jetty.aggregate/jetty-all -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>

moujinameserver-0.1.0.jar

@@ -5,7 +5,8 @@
 import org.mouji.common.errors.DatabaseNotSupported;
 import org.mouji.ns.core.server.NameServer;
 
-import com.allConfig.conf.XMLConfig;
+import me.salimm.allConfig.types.XMLConfig;
+
 
 
 public class NameServerRunner {

pom.xml

@@ -4,14 +4,16 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import com.allConfig.conf.AbstractConfig;
 
 import org.mouji.common.db.DBInfo;
 import org.mouji.common.db.DBUtils;
 import org.mouji.common.errors.DatabaseNotSupported;
 import org.mouji.common.types.DBType;
 import org.mouji.ns.core.constants.Constants;
 
+import me.salimm.allConfig.Config;
+import me.salimm.allConfig.errors.PrefixNotANestedConfigException;
+
 /**
  * 
  * DBConnections contains a set of static functions to create connections to
@@ -86,9 +88,10 @@ public static Connection createSQLLiteConnection(String DB_URL, String USER, Str
 	 * @throws ClassNotFoundException
 	 * @throws SQLException
 	 * @throws DatabaseNotSupported
+	 * @throws PrefixNotANestedConfigException 
 	 */
-	public static DBUtils getDBUtils(AbstractConfig conf)
-			throws ClassNotFoundException, SQLException, DatabaseNotSupported {
+	public static DBUtils getDBUtils(Config conf)
+			throws ClassNotFoundException, SQLException, DatabaseNotSupported, PrefixNotANestedConfigException {
 		if (conf.getValue(CONF_TAG_NAME_DB_TYPE).equals(DBType.MYSQL.name())) {
 			return new MySQLUtils();
 			// } else if
@@ -125,7 +128,7 @@ public static Connection getConnection(DBInfo dbInfo)
 
 	}
 
-	public static DBInfo getDBInfo(AbstractConfig conf) {
+	public static DBInfo getDBInfo(Config conf) throws PrefixNotANestedConfigException {
 		return new DBInfo(conf.getValue(CONF_TAG_NAME_DB_URL), conf.getValue(CONF_TAG_NAME_DB_DBNAME),
 				conf.getValue(CONF_TAG_NAME_DB_USER), conf.getValue(CONF_TAG_NAME_DB_PASS),
 				DBType.fromString(conf.getValue(CONF_TAG_NAME_DB_TYPE)));

src/org/mouji/ns/core/NameServerRunner.java

@@ -5,7 +5,6 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.allConfig.conf.AbstractConfig;
 
 import org.mouji.common.db.DBInfo;
 import org.mouji.common.db.DBUtils;
@@ -17,6 +16,9 @@
 import org.mouji.common.services.NameServer;
 import org.mouji.ns.core.db.DBFactory;
 
+import me.salimm.allConfig.Config;
+import me.salimm.allConfig.errors.PrefixNotANestedConfigException;
+
 /**
  * 
  * 
@@ -42,17 +44,17 @@ public class DBBasedNameServer implements NameServer {
 	 */
 	private ProviderLoadBalancer balancer;
 
-	public DBBasedNameServer(AbstractConfig conf, DBUtils dbUtils, String url, int port,
-			ProviderLoadBalancer balancer) {
+	public DBBasedNameServer(Config conf, DBUtils dbUtils, String url, int port,
+			ProviderLoadBalancer balancer) throws PrefixNotANestedConfigException {
 		this.dbUtils = dbUtils;
 		this.url = url;
 		this.port = port;
 		this.setLoadBalancer(balancer);
 		this.dbInfo = DBFactory.getDBInfo(conf);
 	}
 
-	public DBBasedNameServer(AbstractConfig conf, DBUtils dbUtils, int port, ProviderLoadBalancer balancer)
-			throws UnknownHostException {
+	public DBBasedNameServer(Config conf, DBUtils dbUtils, int port, ProviderLoadBalancer balancer)
+			throws UnknownHostException, PrefixNotANestedConfigException {
 		this(conf, dbUtils, Inet4Address.getLocalHost().getHostAddress(), port, balancer);
 	}
 

src/org/mouji/ns/core/db/DBFactory.java

@@ -2,7 +2,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 
 import org.mouji.common.db.DBInfo;
@@ -16,7 +15,9 @@
 import org.mouji.ns.core.rpc.NameServerServiceProvider;
 import org.mouji.stub.java.stubs.ServerStub;
 
-import com.allConfig.conf.AbstractConfig;
+import me.salimm.allConfig.Config;
+import me.salimm.allConfig.errors.PrefixNotANestedConfigException;
+
 
 /**
  * 
@@ -27,11 +28,11 @@
  */
 public class NameServer implements Constants {
 
-	private AbstractConfig conf;
+	private Config conf;
 
 	private DBUtils dbUtils;
 
-	public NameServer(AbstractConfig conf) throws ClassNotFoundException, SQLException, DatabaseNotSupported {
+	public NameServer(Config conf) throws ClassNotFoundException, SQLException, DatabaseNotSupported, PrefixNotANestedConfigException {
 		this.conf = conf;
 		this.dbUtils = DBFactory.getDBUtils(conf);