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, 0 insertions, 99 deletions

diff --git a/openresty/pom.xml b/openresty/pom.xml
deleted file mode 100644
index 97f311f..0000000
--- a/openresty/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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">

-    <parent>

-        <groupId>org.openo.msb.msb-core</groupId>

-        <artifactId>msb-core-parent</artifactId>

-        <version>1.0.0-SNAPSHOT</version>

-    </parent>  

-

-

-    <modelVersion>4.0.0</modelVersion>

-    <groupId>org.openo.msb.msb-core</groupId>

-    <artifactId>openresty</artifactId>

-    <version>1.0.0-SNAPSHOT</version>

-    <name>openo/msb/msb-core/openresty</name>

-    <packaging>pom</packaging>

-

-    <properties>

-        <openresty.linux64.version>openresty-1.9.15.1-linux64</openresty.linux64.version>

-        <openresty.win32.version>openresty-1.9.14.1001-win32</openresty.win32.version>

-        <openresty.win64.version>openresty-1.9.14.1001-win64</openresty.win64.version>

-    </properties>

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>attach-artifacts-linux64</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>attach-artifact</goal>

-                        </goals>

-                        <configuration>

-                            <artifacts>

-                                <artifact>

-                                    <file>src/assembly/resources/${openresty.linux64.version}.tar.gz</file>

-                                    <classifier>linux64</classifier>

-                                    <type>tar.gz</type>

-                                </artifact>

-                            </artifacts>

-                        </configuration>

-                    </execution>

-                    <execution>

-                        <id>attach-artifacts-win32</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>attach-artifact</goal>

-                        </goals>

-                        <configuration>

-                            <artifacts>

-                                <artifact>

-                                    <file>src/assembly/resources/${openresty.win32.version}.zip</file>

-                                    <classifier>win32</classifier>

-                                    <type>zip</type>

-                                </artifact>

-                            </artifacts>

-                        </configuration>

-                    </execution>

-                    <execution>

-                        <id>attach-artifacts-win64</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>attach-artifact</goal>

-                        </goals>

-                        <configuration>

-                            <artifacts>

-                                <artifact>

-                                    <file>src/assembly/resources/${openresty.win64.version}.zip</file>

-                                    <classifier>win64</classifier>

-                                    <type>zip</type>

-                                </artifact>

-                            </artifacts>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>
\ No newline at end of file
diff --git a/openresty/src/assembly/resources/openresty-1.9.14.1001-win32.zip b/openresty/src/assembly/resources/openresty-1.9.14.1001-win32.zip
deleted file mode 100644
index de23278..0000000
--- a/openresty/src/assembly/resources/openresty-1.9.14.1001-win32.zip
+++ /dev/null
diff --git a/openresty/src/assembly/resources/openresty-1.9.14.1001-win64.zip b/openresty/src/assembly/resources/openresty-1.9.14.1001-win64.zip
deleted file mode 100644
index 2164cf3..0000000
--- a/openresty/src/assembly/resources/openresty-1.9.14.1001-win64.zip
+++ /dev/null
diff --git a/openresty/src/assembly/resources/openresty-1.9.15.1-linux64.tar.gz b/openresty/src/assembly/resources/openresty-1.9.15.1-linux64.tar.gz
deleted file mode 100644
index 96a4ecc..0000000
--- a/openresty/src/assembly/resources/openresty-1.9.15.1-linux64.tar.gz
+++ /dev/null