summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--openo-portal/pom.xml26
-rw-r--r--openo-portal/portal-auth/pom.xml21
-rw-r--r--openo-portal/portal-catalog/pom.xml2
-rw-r--r--openo-portal/portal-common/pom.xml2
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/index.html23
-rw-r--r--openo-portal/portal-extsys/pom.xml2
-rw-r--r--openo-portal/portal-lifecyclemgr/pom.xml8
-rw-r--r--openo-portal/portal-package/pom.xml46
-rw-r--r--openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml3
-rw-r--r--openo-portal/portal-resmgr/pom.xml8
10 files changed, 82 insertions, 59 deletions
diff --git a/openo-portal/pom.xml b/openo-portal/pom.xml
index 28dba218..46693b65 100644
--- a/openo-portal/pom.xml
+++ b/openo-portal/pom.xml
@@ -15,26 +15,28 @@
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.gso.gui</groupId>
- <artifactId>gso-gui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <groupId>org.openo.gso.gui</groupId>
+ <artifactId>gso-gui</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
+
+ <groupId>org.openo.portal</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>openo-portal</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>portal</name>
<modules>
- <module>portal-package</module>
- <module>portal-common</module>
- <module>portal-resmgr</module>
- <module>portal-extsys</module>
- <module>portal-catalog</module>
- <module>portal-auth</module>
- <module>portal-lifecyclemgr</module>
+ <module>portal-package</module>
+ <module>portal-common</module>
+ <module>portal-resmgr</module>
+ <module>portal-extsys</module>
+ <module>portal-catalog</module>
+ <module>portal-auth</module>
+ <module>portal-lifecyclemgr</module>
</modules>
</project>
diff --git a/openo-portal/portal-auth/pom.xml b/openo-portal/portal-auth/pom.xml
index cdbf8d12..64f80f99 100644
--- a/openo-portal/portal-auth/pom.xml
+++ b/openo-portal/portal-auth/pom.xml
@@ -18,12 +18,23 @@
-->
<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.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>portal-auth</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>portal-auth</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/openo-portal/portal-catalog/pom.xml b/openo-portal/portal-catalog/pom.xml
index 5ce6acd7..7cb47462 100644
--- a/openo-portal/portal-catalog/pom.xml
+++ b/openo-portal/portal-catalog/pom.xml
@@ -19,7 +19,7 @@
<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/maven-v4_0_0.xsd">
<parent>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/openo-portal/portal-common/pom.xml b/openo-portal/portal-common/pom.xml
index 3d159212..50b12450 100644
--- a/openo-portal/portal-common/pom.xml
+++ b/openo-portal/portal-common/pom.xml
@@ -16,7 +16,7 @@
-->
<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.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/openo-portal/portal-common/src/main/webapp/common/index.html b/openo-portal/portal-common/src/main/webapp/common/index.html
deleted file mode 100644
index 7a778347..00000000
--- a/openo-portal/portal-common/src/main/webapp/common/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- Copyright 2016, CMCC Technologies Co., Ltd.
-
- 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.
--->
-<html>
-
-<head>
- <meta http-equiv="Refresh" content="1;url=login.html"> </head>
-
-<body> Loading... </body>
-
-</html>
diff --git a/openo-portal/portal-extsys/pom.xml b/openo-portal/portal-extsys/pom.xml
index 3b6c5e50..502f8c9e 100644
--- a/openo-portal/portal-extsys/pom.xml
+++ b/openo-portal/portal-extsys/pom.xml
@@ -20,7 +20,7 @@
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.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/openo-portal/portal-lifecyclemgr/pom.xml b/openo-portal/portal-lifecyclemgr/pom.xml
index 897234c5..3e71fe76 100644
--- a/openo-portal/portal-lifecyclemgr/pom.xml
+++ b/openo-portal/portal-lifecyclemgr/pom.xml
@@ -19,7 +19,7 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -27,9 +27,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>portal-lifecyclemgr</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>war</packaging>
- <!-- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -39,6 +39,6 @@
</configuration>
</plugin>
</plugins>
- </build> -->
+ </build>
</project>
diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
index 75567b52..666f6446 100644
--- a/openo-portal/portal-package/pom.xml
+++ b/openo-portal/portal-package/pom.xml
@@ -17,7 +17,7 @@
<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/maven-v4_0_0.xsd">
<parent>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -28,27 +28,45 @@
<dependencies>
<dependency>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>portal-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
+ <artifactId>portal-resmgr</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.openo.portal</groupId>
<artifactId>portal-extsys</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>portal-catalog</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.openo.portal</groupId>
+ <artifactId>portal-auth</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.openo.portal</groupId>
+ <artifactId>portal-lifecyclemgr</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
</dependencies>
<build>
- <finalName>open-portal</finalName>
+ <finalName>openo-portal</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -57,17 +75,29 @@
<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
<overlays>
<overlay>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>portal-common</artifactId>
</overlay>
<overlay>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
+ <artifactId>portal-resmgr</artifactId>
+ </overlay>
+ <overlay>
+ <groupId>org.openo.portal</groupId>
<artifactId>portal-extsys</artifactId>
</overlay>
<overlay>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>portal-catalog</artifactId>
</overlay>
+ <overlay>
+ <groupId>org.openo.portal</groupId>
+ <artifactId>portal-auth</artifactId>
+ </overlay>
+ <overlay>
+ <groupId>org.openo.portal</groupId>
+ <artifactId>portal-lifecyclemgr</artifactId>
+ </overlay>
</overlays>
</configuration>
</plugin>
diff --git a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
index 887f7dfd..071ba46b 100644
--- a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
+++ b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
@@ -16,4 +16,7 @@
-->
<web-app>
<display-name>OPEN-O Web Application</display-name>
+ <welcome-file-list>
+ <welcome-file>common/login.html</welcome-file>
+ </welcome-file-list>
</web-app>
diff --git a/openo-portal/portal-resmgr/pom.xml b/openo-portal/portal-resmgr/pom.xml
index 60890a2b..798a2118 100644
--- a/openo-portal/portal-resmgr/pom.xml
+++ b/openo-portal/portal-resmgr/pom.xml
@@ -19,7 +19,7 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openo.gso.gui</groupId>
+ <groupId>org.openo.portal</groupId>
<artifactId>openo-portal</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -27,8 +27,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>portal-resmgr</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-<!--
+ <packaging>war</packaging>
+
<build>
<plugins>
<plugin>
@@ -39,5 +39,5 @@
</configuration>
</plugin>
</plugins>
- </build> -->
+ </build>
</project>