public void preUpdate() {
this.modifiedDate = new Date();
}
-
- /*
- public void resetPolicyVersion(){
- this.policyVersion = 1;
- }
- public void advancePolicyVersion(){
- this.policyVersion++;
- }
- public int getPolicyVersion(){
- return this.policyVersion;
- }
- public void setPolicyVersion(int polVer){
- this.policyVersion = polVer;
- }
- */
/**
* @return the policyId
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.conf;
+package org.openecomp.portalapp.conf;
import java.util.ArrayList;
import java.util.List;
-import org.onap.portalapp.login.LoginStrategyImpl;
-import org.onap.portalapp.scheduler.RegistryAdapter;
+import org.openecomp.portalapp.login.LoginStrategyImpl;
+import org.openecomp.portalapp.scheduler.RegistryAdapter;
import org.openecomp.portalsdk.core.auth.LoginStrategy;
import org.openecomp.portalsdk.core.conf.AppConfig;
import org.openecomp.portalsdk.core.conf.Configurable;
*/
@Configuration
@EnableWebMvc
-@ComponentScan(basePackages = "org.onap")
+@ComponentScan(basePackages = "org.onap, org.openecomp")
@PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true)
@Profile("src")
@EnableAsync
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.conf;
+package org.openecomp.portalapp.conf;
import org.openecomp.portalsdk.core.conf.AppInitializer;
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.conf;
+package org.openecomp.portalapp.conf;
import org.springframework.context.annotation.Profile;
import org.springframework.core.io.ClassPathResource;
*/
@Override
public String[] getPackagesToScan() {
- return new String[] { "org.onap" };
+ return new String[] { "org.onap", "org.openecomp" };
}
}
-package org.onap.portalapp.lm;
+package org.openecomp.portalapp.lm;
import java.util.Date;
import java.util.List;
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.lm;
+package org.openecomp.portalapp.lm;
import java.io.FileNotFoundException;
import java.io.InputStream;
-package org.onap.portalapp.login;
+package org.openecomp.portalapp.login;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.scheduler;
+package org.openecomp.portalapp.scheduler;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.portalapp.scheduler.LogRegistry;
import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.openecomp.portalsdk.core.scheduler.Registerable;
import org.openecomp.portalsdk.core.util.SystemProperties;
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.scheduler;
+package org.openecomp.portalapp.scheduler;
import java.util.ArrayList;
import java.util.Arrays;
* limitations under the License.
* ================================================================================
*/
-package org.onap.portalapp.service;
+package org.openecomp.portalapp.service;
import java.util.Set;
-import org.onap.policy.model.Roles;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.UserInfo;
+import org.openecomp.policy.model.Roles;
import org.openecomp.portalapp.service.IAdminAuthExtension;
import org.openecomp.portalsdk.core.domain.Role;
import org.openecomp.portalsdk.core.domain.User;
/*
* (non-Javadoc)
- * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User)
+ * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User)
*/
public void saveUserExtension(User user) {
logger.debug("saveUserExtension");
/*
* (non-Javadoc)
- * @see org.onap.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User)
+ * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User)
*/
public void editUserExtension(User user) {
logger.debug("editUserExtension");
/*
* (non-Javadoc)
- * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User)
+ * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User)
*/
public void saveUserRoleExtension(Set<Role> roles, User user) {
logger.debug("saveUserRoleExtension");
<encoder>
<pattern>${applicationLoggerPattern}</pattern>
</encoder>
- <filter class="org.onap.portalapp.util.CustomLoggingFilter" />
+ <filter class="org.openecomp.portalapp.util.CustomLoggingFilter" />
</appender>
<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
##########################################################################
# Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
+portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
# CSP Global Log On for single sign on
onap_redirect_url = todo_csp_global_logon
import org.onap.policy.components.HumanPolicyComponent;
import org.onap.policy.controller.PolicyController;
import org.onap.policy.controller.PolicyExportAndImportController;
-import org.onap.policy.model.Roles;
import org.onap.policy.rest.XACMLRest;
import org.onap.policy.rest.XACMLRestProperties;
import org.onap.policy.rest.adapter.PolicyRestAdapter;
import org.onap.policy.utils.PolicyUtils;
import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.onap.policy.xacml.util.XACMLPolicyScanner;
+import org.openecomp.policy.model.Roles;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import com.att.research.xacml.util.XACMLProperties;
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.model.PDPGroupContainer;
import org.onap.policy.model.PDPPolicyContainer;
-import org.onap.policy.model.Roles;
import org.onap.policy.rest.adapter.AutoPushTabAdapter;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.xacml.api.pap.OnapPDPGroup;
import org.onap.policy.xacml.std.pap.StdPDPGroup;
import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+import org.openecomp.policy.model.Roles;
import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
import org.openecomp.portalsdk.core.web.support.JsonMessage;
import org.openecomp.portalsdk.core.web.support.UserUtils;
package org.onap.policy.controller;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
public void paramUIGenerate(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
String data = entity.getConfigurationData().getConfigBody();
if(data != null){
- File file = new File(PolicyController.getConfigHome() +File.separator+ entity.getConfigurationData().getConfigurationName());
- if(file.exists()){
- try (BufferedReader br = new BufferedReader(new FileReader(file))) {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- }catch(Exception e){
- policyLogger.error(XACMLErrorConstants.ERROR_DATA_ISSUE+ e.getMessage() + e);
- }
- }
try {
StringBuilder params = new StringBuilder("");
Boolean flag = false;
Boolean comment = false;
- for (String line : Files.readAllLines(Paths.get(file.toString()))) {
+ for (String line : data.split("\n")) {
if (line.isEmpty() || line.startsWith("//")) {
continue;
}
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.model.PDPGroupContainer;
-import org.onap.policy.model.Roles;
import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.onap.policy.xacml.api.pap.OnapPDPGroup;
import org.onap.policy.xacml.std.pap.StdPDP;
import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.openecomp.policy.model.Roles;
import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
import org.openecomp.portalsdk.core.web.support.JsonMessage;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.onap.policy.admin.PolicyNotificationMail;
import org.onap.policy.admin.RESTfulPAPEngine;
import org.onap.policy.model.PDPGroupContainer;
-import org.onap.policy.model.Roles;
import org.onap.policy.rest.XACMLRestProperties;
import org.onap.policy.rest.XacmlAdminAuthorization;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.rest.jpa.PolicyVersion;
import org.onap.policy.rest.jpa.UserInfo;
+import org.openecomp.policy.model.Roles;
import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
import org.openecomp.portalsdk.core.web.support.JsonMessage;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.json.JSONObject;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.model.Roles;
import org.onap.policy.rest.adapter.PolicyExportAdapter;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.ActionBodyEntity;
import org.onap.policy.rest.jpa.PolicyVersion;
import org.onap.policy.rest.jpa.UserInfo;
import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.openecomp.policy.model.Roles;
import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.springframework.beans.factory.annotation.Autowired;
* ============LICENSE_END=========================================================
*/
-package org.onap.policy.model;
+package org.openecomp.policy.model;
import java.io.Serializable;
<!---------------------------DS2 ICONS-------------------------------->
<link rel="stylesheet" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
- <link rel="stylesheet" href="app/fusion/styles/onap.css">
+ <link rel="stylesheet" href="app/fusion/styles/ecomp.css">
<link rel="stylesheet" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
<script src= "app/policyApp/CSS/UIGrid/ui-grid.eot"></script>
<link rel="stylesheet" href="app/policyApp/CSS/UIGrid/ui-grid.svg">
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.controller.CreateDcaeMicroServiceController;
import org.onap.policy.controller.PolicyController;
-import org.onap.policy.model.Roles;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.ActionBodyEntity;
import org.onap.policy.rest.jpa.ConfigurationDataEntity;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.rest.jpa.PolicyVersion;
import org.onap.policy.rest.jpa.UserInfo;
+import org.openecomp.policy.model.Roles;
public class PolicyManagerServletTest extends Mockito{
import org.mockito.Mockito;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.model.Roles;
import org.onap.policy.xacml.api.pap.OnapPDPGroup;
import org.onap.policy.xacml.std.pap.StdPDPGroup;
import org.onap.policy.xacml.std.pap.StdPDPGroupStatus;
+import org.openecomp.policy.model.Roles;
import org.springframework.mock.web.MockHttpServletResponse;
##########################################################################
# Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
+portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
# CSP Global Log On for single sign on
onap_redirect_url = ${{ONAP_REDIRECT_URL}}