summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-os
diff options
context:
space:
mode:
authorKotta, Shireesha (sk434m) <sk434m@att.com>2018-03-06 09:44:53 -0500
committerKotta, Shireesha (sk434m) <sk434m@att.com>2018-03-06 17:43:16 -0500
commitcfb69f44f841338e1f208225ec006388e986bd2c (patch)
treee8b7e982637a5b27f3383a793fcdcee50f7e0057 /ecomp-sdk/epsdk-app-os
parent724ff8f8b22d6503ce5070ebc13f6f5fbc48c8cf (diff)
Added Junits & AAF attributes Support
Issue-ID: PORTAL-136 Includes JUNITS, AAF attributes support Change-Id: Id4cc9f64268017665d7245d0a10369c9b498ba2f Signed-off-by: Kotta, Shireesha (sk434m) <sk434m@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-os')
-rw-r--r--ecomp-sdk/epsdk-app-os/README.md5
-rw-r--r--ecomp-sdk/epsdk-app-os/pom.xml6
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java4
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml72
4 files changed, 82 insertions, 5 deletions
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index 9d35d03a..a6a748f4 100644
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -12,12 +12,15 @@ like Apache Tomcat. Eclipse users must install the M2E-WTP connector, see
https://www.eclipse.org/m2e-wtp/
## Release Notes
+Version 2.2.0
+- PORTAL 136 Junits for SDK
+- PORTAL 87 hibernate mapping in epsdk-overlay forces use of analytics dependency jar
+- PORTAL 155 Review security issues: portal
Version 2.1.0
- PORTAL 161 Refer epsdk-app-common
- PORTAL 160 Refer epsdk-app-common
- PORTAL 159 Refer epsdk-app-common
-- PORTAL 136 Junits for SDK
Version 1.4.0
- PORTAL-19 Rename Java package base to org.onap
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 062d013b..49298d6a 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -252,17 +252,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.6.3</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.6.3</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index 0c91ff0a..77a4de64 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
+++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -51,7 +51,9 @@ public class HibernateMappingLocations implements HibernateMappingLocatable {
public Resource[] getMappingLocations() {
return new Resource[] { new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),
new ClassPathResource("../fusion/orm/Workflow.hbm.xml"),
- new ClassPathResource("../fusion/orm/RNoteBookIntegration.hbm.xml") };
+ new ClassPathResource("../fusion/orm/RNoteBookIntegration.hbm.xml") ,
+ new ClassPathResource("../fusion/orm/Analytics.hbm.xml")
+ };
}
@Override
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml
new file mode 100644
index 00000000..5a634c88
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+ ============LICENSE_START==========================================
+ ONAP Portal SDK
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+
+ Unless otherwise specified, all software contained herein is licensed
+ under the Apache License, Version 2.0 (the “License”);
+ you may not use this software 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.
+
+ Unless otherwise specified, all documentation contained herein is licensed
+ under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ you may not use this documentation except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://creativecommons.org/licenses/by/4.0/
+
+ Unless required by applicable law or agreed to in writing, documentation
+ 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.
+
+ ============LICENSE_END============================================
+
+ ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ -->
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.onap.portalsdk.analytics.model.base">
+
+ <class name="ReportUserRole" table="cr_report_access">
+ <composite-id>
+ <key-property name="repId" column="rep_id" />
+ <key-property name="orderNo" column="order_no" />
+ </composite-id>
+
+ <property name="roleId" column="role_id"/>
+ <property name="userId" column="user_id"/>
+ <property name="readOnlyYn" column="read_only_yn"/>
+ </class>
+
+ <query name="getReportSecurityUsers">
+ select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and userId is not null
+ </query>
+
+ <query name="getReportSecurityRoles">
+ select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and roleId is not null
+ </query>
+
+ <query name="deleteReportSecurityUsers">
+ delete from ReportUserRole where repId = :report_id and userId =:user_id
+ </query>
+
+ <query name="deleteReportSecurityRoles">
+ delete from ReportUserRole where repId = :report_id and roleId =:role_id
+ </query>
+</hibernate-mapping>