1. Adjust the directory hierarchy

2. Fix the compile issue
Change-Id: Ibf10c83104e5e673bc797013799861426cd950ce
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

4 files changed, 490 insertions, 0 deletions

diff --git a/msb-parent/README.md b/msb-parent/README.md
new file mode 100644
index 0000000..2ef8e06
--- /dev/null
+++ b/msb-parent/README.md
@@ -0,0 +1,17 @@
+modeldesign-parent

+============

+

+Root Pom of Project modeldesign

+

+**modeldesignparent-lite is descripe the maven repo and maven plugin .**

+

+**modeldesignparent is the parent pom of the this project ,which descripe the dependency Management of the thirdparty Supporting Libraries**

+

+you can use the following section to reference it .

+

+~~~

+  <groupId>org.openo.orchestrator.modeldesignparent</groupId>

+  <artifactId>modeldesignparent</artifactId>

+  <version>1.0.0</version>

+~~~

+

diff --git a/msb-parent/msbparent-lite/pom.xml b/msb-parent/msbparent-lite/pom.xml
new file mode 100644
index 0000000..a7b68c5
--- /dev/null
+++ b/msb-parent/msbparent-lite/pom.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+            http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+-->
+<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>
+
+<!--
+  <parent>
+    <groupId>org.openo.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+-->
+
+  <groupId>org.openo.msb</groupId>
+  <artifactId>msbparent-lite</artifactId>
+  <version>1.0.0</version>
+  <packaging>pom</packaging>
+  <name>msbparent-lite</name> 
+
+  <properties>
+    
+    <nexus.repository.release>dav:http://nexus.open-o.com/repos/content/repositories/releases</nexus.repository.release>
+    <nexus.repository.snapshot>dav:http://nexus.open-o.com/repos/content/repositories/snapshots</nexus.repository.snapshot>
+
+    <stream>latest</stream><!-- CI should pass in -Dstream={stream} -->
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <!-- Java Versions -->
+    <!-- FIXME: confirm these two are picked by maven-compiler-plugin -->
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <java.version.source>${maven.compiler.source}</java.version.source>
+    <java.version.target>${maven.compiler.target}</java.version.target>  
+
+
+    <!-- Maven plugin versions, in the 'canonical' format -->
+    <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
+    <maven.bundle.version>3.0.0</maven.bundle.version>
+    <maven.clean.plugin.version>2.6.1</maven.clean.plugin.version>
+    <maven.compile.plugin.version>3.3</maven.compile.plugin.version>
+    <maven.jar.version>2.6</maven.jar.version>
+    <maven.javadoc.version>2.10.3</maven.javadoc.version>
+    <maven.plugin.version>3.4</maven.plugin.version>
+    <maven.release.version>2.5.2</maven.release.version>
+    <maven.surefire.version>2.18.1</maven.surefire.version>
+
+    <!-- Maven plugin versions, in random formats -->
+    <checkstyle.version>2.16</checkstyle.version>
+    <compiler.version>${maven.compile.plugin.version}</compiler.version>
+    <enforcer.version>1.4</enforcer.version>
+
+
+
+  </properties>
+
+  <distributionManagement>
+    <repository>
+      <id>releases</id>
+      <url>${nexus.repository.release}</url>
+    </repository>
+    <snapshotRepository>
+      <id>snapshots</id>
+      <url>${nexus.repository.snapshot}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+
+  <build>
+    <extensions>
+        <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh</artifactId>
+            <version>2.10</version>
+        </extension>
+        <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ftp</artifactId>
+            <version>2.10</version>
+        </extension>
+        <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>2.10</version>
+        </extension>
+    </extensions>
+    <resources>
+        <resource>
+            <filtering>false</filtering>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </resource>
+        <resource>
+            <filtering>true</filtering>
+            <directory>src/main/filters</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </resource>
+    </resources>
+    <testResources>
+        <testResource>
+            <filtering>false</filtering>
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </testResource>
+        <testResource>
+            <filtering>true</filtering>
+            <directory>src/test/filters</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </testResource>
+    </testResources>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.8.1</version>
+        </plugin>
+
+        <!-- Official maven plugins, alpha-sorted by artifactId.
+             We do not need to specify the groupId. -->
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>${maven.antrun.plugin.version}</version>
+        </plugin>
+        
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${maven.clean.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven.compile.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>${enforcer.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${failsafe.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>2.0.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${maven.jar.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${maven.javadoc.version}</version>
+          <configuration>
+            <!-- Keep things quiet except for warnings/errors -->
+            <quiet>true</quiet>
+          </configuration>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>${maven.release.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.10</version>          
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${maven.plugin.version}</version>
+        </plugin>
+
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.4</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven.surefire.version}</version>
+          <configuration>
+            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          </configuration>
+        </plugin>
+       
+      </plugins>
+    </pluginManagement>
+  </build> 
+ 
+
+
+</project>
diff --git a/msb-parent/msbparent/pom.xml b/msb-parent/msbparent/pom.xml
new file mode 100644
index 0000000..36b6c4f
--- /dev/null
+++ b/msb-parent/msbparent/pom.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+            http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+-->
+<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>
+
+  <parent>
+    <groupId>org.openo.msb</groupId>
+    <artifactId>msbparent-lite</artifactId>
+    <version>1.0.0</version>
+    <relativePath>../msbparent-lite</relativePath>
+  </parent>
+
+  <groupId>org.openo.msb</groupId>
+  <artifactId>msbparent</artifactId>
+  <packaging>pom</packaging>
+  <name>msbparent</name> 
+
+
+  <scm>
+    <connection>scm:git:ssh://gerrit.zte.com.cn:29418/paas/wisdom/modeldesign-parent.git</connection>
+    <developerConnection>scm:git:ssh://gerrit.zte.com.cn:29418/paas/wisdom/modeldesign-parent.git</developerConnection>
+    <tag>HEAD</tag>
+
+  </scm>
+
+
+  <properties>
+    <!-- Supporting Libraries -->
+    <dropwizard.version>0.8.0</dropwizard.version>
+    <swagger.version>1.5.3</swagger.version>  
+    <jedis.version>2.7.3</jedis.version>
+    <lombok.version>1.16.4</lombok.version>
+    <json-lib.version>2.4</json-lib.version>
+    <junit.version>4.11</junit.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+
+      <!-- Testing Dependencies -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <!-- Supporting Libraries -->
+      <dependency>
+        <groupId>io.dropwizard</groupId>
+        <artifactId>dropwizard-core</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard</groupId>
+        <artifactId>dropwizard-assets</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.dropwizard</groupId>
+        <artifactId>dropwizard-client</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>    
+
+      <dependency>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-jersey2-jaxrs</artifactId>
+        <version>${swagger.version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>redis.clients</groupId>
+        <artifactId>jedis</artifactId>
+        <version>${jedis.version}</version>
+      </dependency>     
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <version>${lombok.version}</version>
+      </dependency>
+      <dependency> 
+        <groupId>net.sf.json-lib</groupId> 
+        <artifactId>json-lib</artifactId> 
+        <version>${json-lib.version}</version> 
+      </dependency> 
+    </dependencies>
+  </dependencyManagement>
+
+<!--   <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.version}</version>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>3.0.1</version>
+        <configuration>
+          <effort>Max</effort>
+          <threshold>Low</threshold>
+          <goal>site</goal>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </reporting> -->
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.19.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <formats>
+            <format>xml</format>
+            <format>html</format>
+          </formats>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.5</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.6</version>
+        <configuration>
+          <linkXref>true</linkXref>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+          <targetJdk>1.8</targetJdk>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>
diff --git a/msb-parent/pom.xml b/msb-parent/pom.xml
new file mode 100644
index 0000000..d4bedff
--- /dev/null
+++ b/msb-parent/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+            http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+-->
+<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>
+
+<parent>
+    <groupId>org.openo.msb</groupId>
+    <artifactId>msbparent-lite</artifactId>
+    <version>1.0.0</version>
+    <relativePath>msbparent-lite</relativePath>
+</parent>
+
+<groupId>org.openo.msb</groupId>
+<artifactId>msbparent-aggregator</artifactId>
+<version>1.0.0</version>
+<name>msbparent-aggregator</name> 
+<packaging>pom</packaging>
+
+
+<modules>
+    <module>msbparent</module>
+    <module>msbparent-lite</module>
+</modules>
+
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <version>2.8.2</version>
+            <configuration>
+                <skip>true</skip>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+
+</project>