diff options
| author |   ramprasad kotagiri <rp5662@att.com> | 2019-03-07 15:55:26 -0500 |
|---|---|---|
| committer |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-03-13 20:34:06 -0400 |
| commit | 2e98a6c64dcdc0891f3729abb045115b790a2c54 (patch) | |
| tree | b500d9c108e4eb520a8e00c3f39d7acdfd878728 /ccsdk-app-os | |
| parent | 3df51c6bb79df182be4f0f1bac20bde75f434494 (diff) | |
Latest code base
Change-Id: I9549091ebeeabcef2d7af7d91cc394d8371e496b
Issue-ID: CCSDK-1011
Signed-off-by: ramprasad kotagiri <rp5662@att.com>
Diffstat (limited to 'ccsdk-app-os')
5 files changed, 20 insertions, 12 deletions
diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml index 0efd176..7bd73e6 100644 --- a/ccsdk-app-os/pom.xml +++ b/ccsdk-app-os/pom.xml @@ -14,11 +14,12 @@ <encoding>UTF-8</encoding>
<springframework.version>4.2.0.RELEASE</springframework.version>
<hibernate.version>4.3.11.Final</hibernate.version>
- <epsdk.version>2.1.0</epsdk.version>
+ <epsdk.version>2.5.1</epsdk.version>
<ccsdk.version>1.1.0-SNAPSHOT</ccsdk.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
- <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
- <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+ <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+ <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+ <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<!-- supplied by Jenkins server -->
<build.version>${project.version}</build.version>
<!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -28,16 +29,22 @@ <repositories>
<repository>
<!-- Releases repository has ECOMP release artifacts -->
- <id>ecomp-releases</id>
- <name>OpenECOMP - Release Repository</name>
+ <id>onap-releases</id>
+ <name>ONAP - Release Repository</name>
<url>${nexusproxy}/${releaseNexusPath}</url>
</repository>
<repository>
<!-- Snapshots repository has ECOMP snapshot artifacts -->
- <id>ecomp-snapshots</id>
- <name>OpenECOMP - Snapshot Repository</name>
+ <id>onap-snapshots</id>
+ <name>ONAP - Snapshot Repository</name>
<url>${nexusproxy}/${snapshotNexusPath}</url>
</repository>
+ <repository>
+ <!-- Staging repository has ECOMP release staging artifacts -->
+ <id>onap-staging</id>
+ <name>ONAP - Staging Repository</name>
+ <url>${nexusproxy}${stagingNexusPath}</url>
+ </repository>
</repositories>
<build>
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java index a4a1fa6..68ef057 100644 --- a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java +++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -43,7 +43,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable { // a leading slash gets stripped so don't bother.
// new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),
// This is a COPY to work around a bug in the 1.1.0 release.
- new ClassPathResource("../fusion-110-copy.hbm.xml"),
+ new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),
new ClassPathResource("../oom-app.hbm.xml")
};
}
diff --git a/ccsdk-app-os/src/main/resources/logback.xml b/ccsdk-app-os/src/main/resources/logback.xml index 474dd7c..faff70c 100644 --- a/ccsdk-app-os/src/main/resources/logback.xml +++ b/ccsdk-app-os/src/main/resources/logback.xml @@ -30,11 +30,11 @@ --> <!--<jmxConfigurator /> --> - <!-- specify the component name --> - <property name="componentName" value="oom_app_os"></property> + <!-- specify the component name --> + <property name="componentName" value="dashboard"></property> <!-- specify the base path of the log directory --> - <property name="logDirPrefix" value="${catalina.base}/logs"></property> + <property name="logDirPrefix" value="/opt/logs/ecompc"></property> <!-- The directories where logs are written --> <property name="logDirectory" value="${logDirPrefix}/${componentName}" /> diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties index 881fdd1..01ba9f7 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties @@ -44,6 +44,7 @@ user_attribute_name = user # User Session settings roles_attribute_name = roles role_functions_attribute_name = role_functions +role_function_list = role_function_list # POST settings post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp index a31937c..e023929 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp @@ -77,7 +77,7 @@ </head>
<body>
<div class="login">
- <img src="app/oom/images/onap_logo_2257x496.png" style="height: 150px;" />
+ <img src="app/ccsdk/images/onap_logo_2257x496.png" style="height: 150px;" />
<h2>
<%=appDisplayName%>
</h2>
|