Change common module name

pom.xml

@@ -9,7 +9,7 @@
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <modules>
-        <module>whatsmars-mars001-common</module>
+        <module>whatsmars-common</module>
         <module>whatsmars-mars001-domain</module>
         <module>whatsmars-mars001-dao</module>
         <module>whatsmars-mars001-service</module>

whatsmars-mars001-common/pom.xml → whatsmars-common/pom.xml

@@ -9,12 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>whatsmars-mars001-common</artifactId>
+    <artifactId>whatsmars-common</artifactId>
     <packaging>jar</packaging>
-    <name>whatsmars-mars001-common</name>
+    <name>whatsmars-common</name>
     <url>http://maven.apache.org</url>
     <build>
-        <finalName>whatsmars-mars001-common</finalName>
+        <finalName>whatsmars-common</finalName>
     </build>
 
     <dependencies>

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/CommonConstants.java → whatsmars-common/src/main/java/com/whatsmars/common/CommonConstants.java

-package com.whatsmars.mars001.common;
+package com.whatsmars.common;
 
 /**
  * Created by liuguanqing on 15/4/16.

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/ImageSizeEnum.java → whatsmars-common/src/main/java/com/whatsmars/common/ImageSizeEnum.java

-package com.whatsmars.mars001.common;
+package com.whatsmars.common;
 
 /**
  * Created by liuguanqing on 15/4/20.

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mail/EmailSenderClient.java → whatsmars-common/src/main/java/com/whatsmars/common/mail/EmailSenderClient.java

-package com.whatsmars.mars001.common.mail;
+package com.whatsmars.common.mail;
 
 import org.apache.commons.mail.*;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/GridFSClient.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/GridFSClient.java

-package com.whatsmars.mars001.common.mongo;
+package com.whatsmars.common.mongo;
 
-import com.whatsmars.mars001.common.ImageSizeEnum;
-import com.whatsmars.mars001.common.mongo.object.MongoDBConfig;
-import com.whatsmars.mars001.common.mongo.object.MongoDBCredential;
-import com.whatsmars.mars001.common.mongo.object.MongoDBDriver;
+import com.whatsmars.common.ImageSizeEnum;
+import com.whatsmars.common.mongo.object.MongoDBConfig;
+import com.whatsmars.common.mongo.object.MongoDBCredential;
+import com.whatsmars.common.mongo.object.MongoDBDriver;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/MongoDBClient.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/MongoDBClient.java

-package com.whatsmars.mars001.common.mongo;
+package com.whatsmars.common.mongo;
 
-import com.whatsmars.mars001.common.mongo.object.MongoDBConfig;
-import com.whatsmars.mars001.common.mongo.object.MongoDBCredential;
-import com.whatsmars.mars001.common.mongo.object.MongoDBDriver;
+import com.whatsmars.common.mongo.object.MongoDBConfig;
+import com.whatsmars.common.mongo.object.MongoDBCredential;
+import com.whatsmars.common.mongo.object.MongoDBDriver;
 import com.mongodb.client.ListCollectionsIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/object/MongoDBConfig.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/object/MongoDBConfig.java

-package com.whatsmars.mars001.common.mongo.object;
+package com.whatsmars.common.mongo.object;
 
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/object/MongoDBCredential.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/object/MongoDBCredential.java

-package com.whatsmars.mars001.common.mongo.object;
+package com.whatsmars.common.mongo.object;
 
 /**
  * Author: qing

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/object/MongoDBDriver.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/object/MongoDBDriver.java

-package com.whatsmars.mars001.common.mongo.object;
+package com.whatsmars.common.mongo.object;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/object/ObjectIdCreator.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/object/ObjectIdCreator.java

-package com.whatsmars.mars001.common.mongo.object;
+package com.whatsmars.common.mongo.object;
 
 import org.bson.types.ObjectId;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/serializer/CustomDateDeserializer.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/serializer/CustomDateDeserializer.java

-package com.whatsmars.mars001.common.mongo.serializer;
+package com.whatsmars.common.mongo.serializer;
 
 import org.apache.commons.lang.time.DateUtils;
 import org.codehaus.jackson.JsonParser;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/mongo/serializer/CustomDateSerializer.java → whatsmars-common/src/main/java/com/whatsmars/common/mongo/serializer/CustomDateSerializer.java

-package com.whatsmars.mars001.common.mongo.serializer;
+package com.whatsmars.common.mongo.serializer;
 
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.codehaus.jackson.JsonGenerator;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/pojo/Result.java → whatsmars-common/src/main/java/com/whatsmars/common/pojo/Result.java

-package com.whatsmars.mars001.common.pojo;
+package com.whatsmars.common.pojo;
 
 import java.util.HashMap;
 import java.util.Map;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/pojo/ResultCode.java → whatsmars-common/src/main/java/com/whatsmars/common/pojo/ResultCode.java

-package com.whatsmars.mars001.common.pojo;
+package com.whatsmars.common.pojo;
 
 public class ResultCode {
 	

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/AESUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/AESUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import org.apache.commons.codec.binary.Base64;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/Authenticator.java → whatsmars-common/src/main/java/com/whatsmars/common/util/Authenticator.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import javax.mail.PasswordAuthentication;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/DESUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/DESUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import org.apache.commons.codec.binary.Base64;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/EmailUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/EmailUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import java.util.HashMap;
 import java.util.Map;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/HttpUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/HttpUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/IdCardUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/IdCardUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/JSONConverterUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/JSONConverterUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
-import com.whatsmars.mars001.common.pojo.Result;
+import com.whatsmars.common.pojo.Result;
 import org.codehaus.jackson.map.ObjectMapper;
 
 /**

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/MoneyFormatUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/MoneyFormatUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import java.text.NumberFormat;
 import java.util.HashMap;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/NumberFormatUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/NumberFormatUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import java.math.BigDecimal;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/ResultHelper.java → whatsmars-common/src/main/java/com/whatsmars/common/util/ResultHelper.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
-import com.whatsmars.mars001.common.pojo.Result;
-import com.whatsmars.mars001.common.pojo.ResultCode;
+import com.whatsmars.common.pojo.Result;
+import com.whatsmars.common.pojo.ResultCode;
 import net.sf.json.JSONObject;
 
 import java.util.Map;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/UnicodeUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/UnicodeUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 /**
  * Created by shenhongxi on 15/5/8.

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/ValidateCodeUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/ValidateCodeUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 
 import java.awt.*;

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/ValidateUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/ValidateUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import org.apache.commons.lang.StringUtils;
 

whatsmars-mars001-common/src/main/java/com/whatsmars/mars001/common/util/VelocityUtils.java → whatsmars-common/src/main/java/com/whatsmars/common/util/VelocityUtils.java

-package com.whatsmars.mars001.common.util;
+package com.whatsmars.common.util;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;

whatsmars-mars001-service/pom.xml

@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>com.whatsmars</groupId>
-            <artifactId>whatsmars-mars001-common</artifactId>
+            <artifactId>whatsmars-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

whatsmars-mars001-service/src/main/java/com/whatsmars/mars001/service/AccountService.java

 package com.whatsmars.mars001.service;
 
-import com.whatsmars.mars001.common.pojo.Result;
+import com.whatsmars.common.pojo.Result;
 
 /**
  * Created by shenhongxi on 2016/4/1.

whatsmars-mars001-service/src/main/java/com/whatsmars/mars001/service/impl/AccountServiceImpl.java

 package com.whatsmars.mars001.service.impl;
 
-import com.whatsmars.mars001.common.pojo.Result;
+import com.whatsmars.common.pojo.Result;
 import com.whatsmars.mars001.dao.AccountDao;
 import com.whatsmars.mars001.service.AccountService;
 import org.springframework.stereotype.Service;

whatsmars-mars001-web/src/main/java/com/whatsmars/mars001/web/controller/AccountController.java

 package com.whatsmars.mars001.web.controller;
 
-import com.whatsmars.mars001.common.pojo.Result;
-import com.whatsmars.mars001.common.pojo.ResultCode;
-import com.whatsmars.mars001.common.util.ResultHelper;
+import com.whatsmars.common.pojo.Result;
+import com.whatsmars.common.util.ResultHelper;
 import com.whatsmars.mars001.service.AccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

whatsmars-mars001-web/src/main/java/com/whatsmars/mars001/web/controller/BaseController.java

 package com.whatsmars.mars001.web.controller;
 
-import com.whatsmars.mars001.common.util.DESUtils;
+import com.whatsmars.common.util.DESUtils;
 import com.whatsmars.mars001.domain.constants.Constants;
 import com.whatsmars.mars001.domain.misc.SystemConfig;
 import org.apache.commons.lang.RandomStringUtils;

whatsmars-mars001-web/src/main/java/com/whatsmars/mars001/web/interceptor/LoginInterceptor.java

 package com.whatsmars.mars001.web.interceptor;
 
-import com.whatsmars.mars001.common.util.DESUtils;
+import com.whatsmars.common.util.DESUtils;
 import com.whatsmars.mars001.domain.misc.LoginContext;
 import com.whatsmars.mars001.domain.misc.LoginContextHolder;
 import com.whatsmars.mars001.domain.misc.SystemConfig;
@@ -15,7 +15,6 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
-import java.util.List;
 
 /**
  * Author: qing

whatsmars-mars001-web/src/main/resources/spring-service.xml

@@ -27,14 +27,14 @@
         </property>
     </bean>
 
-    <bean id="mongodbDriver" class="com.whatsmars.mars001.common.mongo.object.MongoDBDriver" init-method="init" destroy-method="close">
+    <bean id="mongodbDriver" class="MongoDBDriver" init-method="init" destroy-method="close">
         <property name="properties" ref="mongodbProperties"/>
         <property name="configuration">
-            <bean class="com.whatsmars.mars001.common.mongo.object.MongoDBConfig">
+            <bean class="MongoDBConfig">
                 <property name="addresses" value="${ixhong.mongodb.common.addresses}"/>
                 <property name="credentials">
                     <list>
-                        <bean class="com.whatsmars.mars001.common.mongo.object.MongoDBCredential">
+                        <bean class="MongoDBCredential">
                             <property name="databaseName" value="${ixhong.mongodb.common.dbname}"/>
                             <property name="username" value="${ixhong.mongodb.common.username}"/>
                             <property name="password" value="${ixhong.mongodb.common.password}"/>
@@ -47,7 +47,7 @@
         </property>
     </bean>
 
-    <bean id="mongoClient" class="com.whatsmars.mars001.common.mongo.MongoDBClient">
+    <bean id="mongoClient" class="MongoDBClient">
         <property name="mongoDBDriver" ref="mongodbDriver"/>
         <property name="databaseName" value="${ixhong.mongodb.common.dbname}"/>
     </bean>-->