[PORTAL-7] Rebase

This rebasing includes common libraries and common overlays projects
abstraction of components

Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba
Signed-off-by: st782s <statta@research.att.com>

4 files changed, 0 insertions, 294 deletions

diff --git a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/LogJob.java b/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/LogJob.java
deleted file mode 100644
index b308efbb..00000000
--- a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/LogJob.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * 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.
- * ================================================================================
- */
-package org.openecomp.portalapp.scheduler;
-
-import org.openecomp.portalapp.conf.ExternalAppConfig;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.quartz.DisallowConcurrentExecution;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.PersistJobDataAfterExecution;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-@PersistJobDataAfterExecution
-@DisallowConcurrentExecution
-public class LogJob extends QuartzJobBean {
-
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);
-
-	
-	@Override
-	protected void executeInternal(JobExecutionContext ctx)
-			throws JobExecutionException {
-	   // JobDataMap dataMap = ctx.getJobDetail().getJobDataMap();
- 	   //int cnt = dataMap.getInt("");
-	   // JobKey jobKey = ctx.getJobDetail().getKey();
-	   logger.info(EELFLoggerDelegate.debugLogger, (Runtime.getRuntime().maxMemory() + " " + Runtime.getRuntime().maxMemory()));
-
-	}
-
-}
diff --git a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/LogRegistry.java b/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/LogRegistry.java
deleted file mode 100644
index dce9e26b..00000000
--- a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/LogRegistry.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * 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.
- * ================================================================================
- */
-package org.openecomp.portalapp.scheduler;
-
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.openecomp.portalsdk.core.scheduler.CronRegistry;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
-import org.springframework.scheduling.quartz.JobDetailFactoryBean;
-import org.springframework.stereotype.Component;
-
-@Component
-@DependsOn({ "systemProperties" })
-public class LogRegistry extends CronRegistry {
-
-	private static final String groupName = "AppGroup";
-	private static final String jobName = "LogJob";
-	private static final String triggerName = "LogTrigger";
-
-	// @Autowired
-	// private SystemProperties systemProperties;
-
-	// @Bean
-	public JobDetailFactoryBean jobDetailFactoryBean() {
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("units", "bytes");
-		return jobDetailFactoryBean(groupName, jobName, LogJob.class, map);
-	}
-
-	// @Bean
-	public CronTriggerFactoryBean cronTriggerFactoryBean() throws ParseException {
-		// "0 * * * * ? *
-		return cronTriggerFactoryBean(groupName, triggerName, SystemProperties.getProperty(SystemProperties.LOG_CRON));
-	}
-
-}
diff --git a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/Register.java b/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/Register.java
deleted file mode 100644
index 3a29520e..00000000
--- a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/Register.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * 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.
- * ================================================================================
- */
-package org.openecomp.portalapp.scheduler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.scheduler.Registerable;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.quartz.Trigger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.stereotype.Component;
-
-@Component
-@DependsOn({"logRegistry", "systemProperties"})
-public class Register implements Registerable {
-
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(Register.class);
-
-
-	private List<Trigger> scheduleTriggers = new ArrayList<Trigger>();
-	Trigger trigger[] = new Trigger[1];
-
-	
-	@Autowired
-	private LogRegistry logRegistry;
-	
-
-	
-	@Override
-	public Trigger[] getTriggers() {
-		return getScheduleTriggers().toArray(trigger);
-	}
-
-	@Override
-	public void registerTriggers() {
-		// if the property value is not available; the cron will not be added and can be ignored. its safe to ignore the exceptions
-		try {
-			if(SystemProperties.getProperty(SystemProperties.LOG_CRON) != null)
-				getScheduleTriggers().add(logRegistry.getTrigger());
-			
-		} catch(IllegalStateException ies) {
-			logger.info(EELFLoggerDelegate.debugLogger, ("Log Cron not available"));
-		}
-		
-		
-	}
-	
-	
-	public List<Trigger> getScheduleTriggers() {
-		return scheduleTriggers;
-	}
-
-	public void setScheduleTriggers(List<Trigger> scheduleTriggers) {
-		this.scheduleTriggers = scheduleTriggers;
-	}
-	
-	
-
-	
-	
-
-}
diff --git a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java b/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java
deleted file mode 100644
index 1bc43fee..00000000
--- a/ecomp-sdk/sdk-app/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * 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.
- * ================================================================================
- */
-package org.openecomp.portalapp.scheduler;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.openecomp.portalsdk.core.scheduler.Registerable;
-import org.openecomp.portalsdk.workflow.services.WorkflowScheduleService;
-import org.quartz.Trigger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-import org.springframework.stereotype.Component;
-
-/**
- * TODO REFACTOR
- * moved from org.openecomp.portalsdk.core.scheduler
- * to org.openecomp.portalapp.scheduler
- *
- */
-@Component
-public class RegistryAdapter {
-	
-	@Autowired
-	private Registerable registry;
-	
-	@Autowired
-	private WorkflowScheduleService workflowScheduleService;
-	
-	private SchedulerFactoryBean schedulerBean;
-	
-	Trigger trigger[] = new Trigger[1];
-	
-	public Trigger[] getTriggers() {
-		
-		registry.registerTriggers();
-		
-		List<Trigger> allTriggers = new ArrayList<Trigger>();
-		
-		List<Trigger> coreTriggers = addCoreTriggers();
-		final Trigger[] extTriggerArray = registry.getTriggers();
-		
-		allTriggers.addAll(Arrays.asList(extTriggerArray));
-		allTriggers.addAll(coreTriggers);
-		
-		return allTriggers.toArray(trigger);
-		
-		
-	}
-	
-	
-	public List<Trigger> addCoreTriggers() {
-		//On startup of the application after crash recovery, invoke workflow schedule trigger
-		List<Trigger> triggers = getWorkflowScheduleService().triggerWorkflowScheduling();
-		return triggers;
-	}
-
-
-	public void setSchedulerBean(SchedulerFactoryBean _schedulerBean) {
-		schedulerBean = _schedulerBean;
-		
-	}
-
-	public SchedulerFactoryBean getSchedulerBean() {
-		return schedulerBean;
-		
-	}
-
-
-	public Registerable getRegistry() {
-		return registry;
-	}
-
-
-	public void setRegistry(Registerable registry) {
-		this.registry = registry;
-	}
-
-
-	public WorkflowScheduleService getWorkflowScheduleService() {
-		return workflowScheduleService;
-	}
-
-
-	public void setWorkflowScheduleService(
-			WorkflowScheduleService workflowScheduleService) {
-		this.workflowScheduleService = workflowScheduleService;
-	}
-	
-}