From 85e12563d2092018f83b456f5926f2b28f9742c7 Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Mon, 5 Jun 2017 09:51:55 -0500 Subject: [POLICY-8] cleaned up unused code Change-Id: Ifebf67db574e1c4eadf9d50ca0f178ab7ddba033 Signed-off-by: Jorge Hernandez --- policy-management/src/assembly/assemble_zip.xml | 2 - .../main/server/config/IntegrityMonitor.properties | 90 ---------------------- .../server/config/droolsPersistence.properties | 55 ------------- .../main/server/config/xacmlPersistence.properties | 43 ----------- 4 files changed, 190 deletions(-) delete mode 100644 policy-management/src/main/server/config/IntegrityMonitor.properties delete mode 100644 policy-management/src/main/server/config/droolsPersistence.properties delete mode 100644 policy-management/src/main/server/config/xacmlPersistence.properties (limited to 'policy-management') diff --git a/policy-management/src/assembly/assemble_zip.xml b/policy-management/src/assembly/assemble_zip.xml index 85a1dbfa..a9108257 100644 --- a/policy-management/src/assembly/assemble_zip.xml +++ b/policy-management/src/assembly/assemble_zip.xml @@ -29,8 +29,6 @@ zip - false diff --git a/policy-management/src/main/server/config/IntegrityMonitor.properties b/policy-management/src/main/server/config/IntegrityMonitor.properties deleted file mode 100644 index 293f3582..00000000 --- a/policy-management/src/main/server/config/IntegrityMonitor.properties +++ /dev/null @@ -1,90 +0,0 @@ -### -# ============LICENSE_START======================================================= -# policy-management -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END========================================================= -### - -hostPort = ${{host_port}} - -http.server.services=TEST -http.server.services.TEST.host=0.0.0.0 -http.server.services.TEST.port=9981 -http.server.services.TEST.restClasses=org.openecomp.policy.drools.core.IntegrityMonitorRestManager -http.server.services.TEST.managed=false -http.server.services.TEST.swagger=true - -# The following were added as part of US673632 -# -# Forward Progress Monitor update interval seconds -fp_monitor_interval = ${{fp_monitor_interval}} -# Failed counter threshold before failover -failed_counter_threshold = ${{failed_counter_threshold}} -# Interval between test transactions when no traffic seconds -test_trans_interval = ${{test_trans_interval}} -# Interval between writes of the FPC to the DB seconds -write_fpc_interval = ${{write_fpc_interval}} -# Name of the site in which this node is hosted -site_name = ${{site_name}} -# Node type -# Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error! -node_type = pdp_drools -# Dependency groups are groups of resources upon which a node operational state is dependent upon. -# Each group is a comma-separated list of resource names and groups are separated by a semicolon. For example: -dependency_groups=${{dependency_groups}} -# When set to true, dependent health checks are performed by using JMX to invoke test() on the dependent. -# The default false is to use state checks for health. -test_via_jmx=${{test_via_jmx}} -# This is the max number of seconds beyond which a non incrementing FPC is considered a failure -max_fpc_update_interval=${{max_fpc_update_interval}} - -# Needed by DroolsPdpsElectionHandler -pdp.checkInterval=7000 -pdp.updateInterval=10000 -#pdp.timeout=3000 -# Need long timeout, because testTransaction is only run every 10 seconds. -pdp.timeout=15000 -#how long do we wait for the pdp table to populate on initial startup -pdp.initialWait=20000 - -# Known as the PDPID in the droolpdpentity table. -#resource.name=pdp1 -resource.name=${{resource_name}} - -# The amount of this a resource (entity) should sleep between audit executions. -# If not specified, defaults to five seconds. -# -1 turns off audit -# zero forces audit to run continuously -integrity_audit_period_seconds=-1 - -# Properties needed for repository audit -# Assume it's the releaseRepository that needs to be audited, -# because that's the one BRMGW will publish to. -repository.audit.id=${{releaseRepositoryID}} -repository.audit.url=${{releaseRepositoryUrl}} -repository.audit.username=${{repositoryUsername}} -repository.audit.password=${{repositoryPassword}} - -# Flag to control the execution of the subsystemTest for the Database -db.audit.is.active=false - -# Flag to control the execution of the subsystemTest for the Nexus Maven repository -repository.audit.is.active=false -repository.audit.ignore.errors=true - -# Run the state audit every 60 seconds (60000 ms). NOTE! It will only run on nodes that are providing service. -# A value of <= 0 will turn off the state audit. -state_audit_interval_ms=60000 diff --git a/policy-management/src/main/server/config/droolsPersistence.properties b/policy-management/src/main/server/config/droolsPersistence.properties deleted file mode 100644 index 2fc6dc8b..00000000 --- a/policy-management/src/main/server/config/droolsPersistence.properties +++ /dev/null @@ -1,55 +0,0 @@ -### -# ============LICENSE_START======================================================= -# policy-management -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END========================================================= -### - -#javax.persistence.jdbc.driver = org.h2.Driver -#javax.persistence.jdbc.url = jdbc:h2:file:./sql/drools -#javax.persistence.jdbc.user = sa -#javax.persistence.jdbc.password = - -#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver -#javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/drools -#javax.persistence.jdbc.user=root -#javax.persistence.jdbc.password=policy - -javax.persistence.jdbc.driver = ${{JDBC_DRIVER}} -javax.persistence.jdbc.url = ${{JDBC_DROOLS_URL}} -javax.persistence.jdbc.user = ${{JDBC_USER}} -javax.persistence.jdbc.password = ${{JDBC_PASSWORD}} - -# Needed? -#javax.persistence.jdbc.driver = org.h2.Driver -#javax.persistence.jdbc.url = jdbc:h2:file:./sql/ncomp -#javax.persistence.jdbc.user = sa -#javax.persistence.jdbc.password = -#persistenceDisabled=false -#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver -#javax.persistence.jdbc.url=jdbc:mariadb://192.168.56.30:3306/drools -#javax.persistence.jdbc.user=patb -#javax.persistence.jdbc.password=policy - -hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource - -# The number of seconds that persistence data remains valid after a -# DroolsPDP shutdown or side switch -- older data is removed -# (if this field is not specified or <= 0, the time is indefinite) -persistence.sessioninfo.timeout=900 - -# For testing purposes, it may be convenient to disable persistence -persistenceDisabled=false diff --git a/policy-management/src/main/server/config/xacmlPersistence.properties b/policy-management/src/main/server/config/xacmlPersistence.properties deleted file mode 100644 index e88d8aaf..00000000 --- a/policy-management/src/main/server/config/xacmlPersistence.properties +++ /dev/null @@ -1,43 +0,0 @@ -### -# ============LICENSE_START======================================================= -# policy-management -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END========================================================= -### - -#javax.persistence.jdbc.driver = org.h2.Driver -#javax.persistence.jdbc.url = jdbc:h2:file:./sql/xacml -#javax.persistence.jdbc.user = sa -#javax.persistence.jdbc.password = - -#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver -#javax.persistence.jdbc.url=jdbc:mariadb://127.0.0.1:3306/xacml -#javax.persistence.jdbc.user=root -#javax.persistence.jdbc.password=policy - -javax.persistence.jdbc.driver = ${{JDBC_DRIVER}} -javax.persistence.jdbc.url = ${{JDBC_URL}} -javax.persistence.jdbc.user = ${{JDBC_USER}} -javax.persistence.jdbc.password = ${{JDBC_PASSWORD}} - -# Needed? -hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource - -# For testing purposes, it may be convenient to disable persistence -persistenceDisabled=false - - - -- cgit 1.2.3-korg