whatsmars-earth

README.md

@@ -9,8 +9,7 @@
 Module | Intro
 ------ | ------
 whatsmars-common | mail,HttpUtils,AES,DES加解密
-whatsmars-earth-web | springmvc+velocity实战
-whatsmars-earth-support-web | earth-web的辅助工程
+whatsmars-earth | springmvc+velocity实战
 whatmars-fs-web | 用mongodb存储图片和文件
 whatsmars-javase-example | Java基础学习
 whatsmars-spring | spring原理、集成及新特性

pom.xml

@@ -10,12 +10,7 @@
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>whatsmars-common</module>
-        <module>whatsmars-earth-domain</module>
-        <module>whatsmars-earth-dao</module>
-        <module>whatsmars-earth-service</module>
-        <module>whatsmars-earth-web</module>
         <module>whatsmars-fs-web</module>
-        <module>whatsmars-earth-support-web</module>
         <module>whatsmars-tomcat</module>
         <module>whatsmars-javase-example</module>
         <module>whatsmars-spring</module>
@@ -29,6 +24,7 @@
         <module>whatsmars-motan</module>
         <module>whatsmars-spring-cloud</module>
         <module>whatsmars-sharding-jdbc</module>
+        <module>whatsmars-earth</module>
     </modules>
 
     <properties>

whatsmars-earth/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <artifactId>whatsmars-parent</artifactId>
+        <groupId>com.whatsmars</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>whatsmars-earth</artifactId>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <description>springmvc + velocity demo</description>
+
+    <modules>
+        <module>whatsmars-earth-domain</module>
+        <module>whatsmars-earth-dao</module>
+        <module>whatsmars-earth-service</module>
+        <module>whatsmars-earth-web</module>
+        <module>whatsmars-earth-support-web</module>
+    </modules>
+
+
+</project>
\ No newline at end of file

whatsmars-earth-support-web/pom.xml → whatsmars-earth/whatsmars-earth-support-web/pom.xml

@@ -160,7 +160,7 @@
             </activation>
             <build>
                 <filters>
-                    <filter>../profile/development.properties</filter>
+                    <filter>../../profile/development.properties</filter>
                 </filters>
             </build>
         </profile>
@@ -168,7 +168,7 @@
             <id>test</id>
             <build>
                 <filters>
-                    <filter>../profile/test.properties</filter>
+                    <filter>../../profile/test.properties</filter>
                 </filters>
             </build>
         </profile>
@@ -176,7 +176,7 @@
             <id>production</id>
             <build>
                 <filters>
-                    <filter>../profile/production.properties</filter>
+                    <filter>../../profile/production.properties</filter>
                 </filters>
             </build>
         </profile>

whatsmars-earth-web/pom.xml → whatsmars-earth/whatsmars-earth-web/pom.xml

@@ -119,7 +119,7 @@
             </activation>
             <build>
                 <filters>
-                    <filter>../profile/development.properties</filter>
+                    <filter>../../profile/development.properties</filter>
                 </filters>
             </build>
         </profile>
@@ -127,7 +127,7 @@
             <id>test</id>
             <build>
                 <filters>
-                    <filter>../profile/test.properties</filter>
+                    <filter>../../profile/test.properties</filter>
                 </filters>
             </build>
         </profile>
@@ -135,7 +135,7 @@
             <id>production</id>
             <build>
                 <filters>
-                    <filter>../profile/production.properties</filter>
+                    <filter>../../profile/production.properties</filter>
                 </filters>
             </build>
         </profile>