From 85e12563d2092018f83b456f5926f2b28f9742c7 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jh1730@att.com>
Date: Mon, 5 Jun 2017 09:51:55 -0500
Subject: [POLICY-8] cleaned up unused code

Change-Id: Ifebf67db574e1c4eadf9d50ca0f178ab7ddba033
Signed-off-by: Jorge Hernandez <jh1730@att.com>
---
 policy-core/pom.xml                                | 58 ---------------
 policy-core/src/assembly/assemble_zip.xml          | 85 ----------------------
 .../src/main/resources/META-INF/jndi.properties    | 21 ------
 .../src/main/resources/META-INF/persistence.xml    | 84 ---------------------
 4 files changed, 248 deletions(-)
 delete mode 100644 policy-core/src/assembly/assemble_zip.xml
 delete mode 100644 policy-core/src/main/resources/META-INF/jndi.properties
 delete mode 100644 policy-core/src/main/resources/META-INF/persistence.xml

(limited to 'policy-core')

diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 18723942..4d504a69 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -31,11 +31,6 @@
   </parent>
 
   <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-    </dependency>
     <dependency>
       <groupId>org.kie</groupId>
       <artifactId>kie-api</artifactId>
@@ -59,7 +54,6 @@
       <version>6.3.0.Final</version>
     </dependency>
     <dependency>
-    <!-- leave this for now, but will remove policy-utils at the end of conversion -->
        <groupId>org.openecomp.policy.drools-pdp</groupId>
        <artifactId>policy-utils</artifactId>
        <version>${project.version}</version>  
@@ -69,69 +63,17 @@
       <artifactId>ECOMP-Logging</artifactId>
       <version>${common-modules.version}</version>  
     </dependency>
-    <dependency>
-      <groupId>org.openecomp.policy.common</groupId>
-      <artifactId>integrity-monitor</artifactId>
-      <version>${common-modules.version}</version>
-    </dependency>
-	<dependency>
-      <groupId>org.openecomp.policy.common</groupId>
-      <artifactId>integrity-audit</artifactId>
-      <version>${common-modules.version}</version>
-	</dependency>
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
       <version>1.2.3</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>[1.4.186,)</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.4.1</version>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
-	<dependency>
-		<groupId>org.codehaus.btm</groupId>
-		<artifactId>btm</artifactId>
-		<version>2.1.4</version>
-	</dependency>
-	<dependency>
-		<groupId>org.eclipse.persistence</groupId>
-		<artifactId>eclipselink</artifactId>
-		<version>2.6.2</version>
-	</dependency>
-	<dependency>
-		<groupId>org.hibernate</groupId>
-		<artifactId>hibernate-entitymanager</artifactId>
-		<version>5.0.7.Final</version>
- 	</dependency>
-	
-	<dependency>
-		<groupId>org.json</groupId>
-		<artifactId>json</artifactId>
-		<version>20160810</version>
-	</dependency>
   </dependencies>  
-
-  <dependencyManagement>
-  	<dependencies>
-  		<dependency>
-  			<groupId>org.apache.httpcomponents</groupId>
-  			<artifactId>httpclient</artifactId>
-  			<version>4.5</version>
-  		</dependency>
-  	</dependencies>
-  </dependencyManagement>
 </project>
diff --git a/policy-core/src/assembly/assemble_zip.xml b/policy-core/src/assembly/assemble_zip.xml
deleted file mode 100644
index 447a5271..00000000
--- a/policy-core/src/assembly/assemble_zip.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  policy-core
-  ================================================================================
-  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=========================================================
-  -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>runtime</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<!-- we want "system" and related files right at the root level as this 
-		file is suppose to be unzip on top of a karaf distro. -->
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>policy-core-${project.version}.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target/assembly/</directory>
-			<outputDirectory>.</outputDirectory>
-			<excludes>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>.</directory>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/server-gen/bin</directory>
-			<outputDirectory>bin</outputDirectory>
-			<fileMode>0744</fileMode>
-			<excludes>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/server/bin</directory>
-			<outputDirectory>bin</outputDirectory>
-			<fileMode>0744</fileMode>
-			<excludes>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/server-gen/scripts</directory>
-			<outputDirectory>scripts</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/server/scripts</directory>
-			<outputDirectory>scripts</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/server/config</directory>
-			<outputDirectory>config</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-</assembly>
diff --git a/policy-core/src/main/resources/META-INF/jndi.properties b/policy-core/src/main/resources/META-INF/jndi.properties
deleted file mode 100644
index 033a08aa..00000000
--- a/policy-core/src/main/resources/META-INF/jndi.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-core
-# ================================================================================
-# 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=========================================================
-###
-
-java.naming.factory.initial=bitronix.tm.jndi.BitronixInitialContextFactory
diff --git a/policy-core/src/main/resources/META-INF/persistence.xml b/policy-core/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index cc44aca7..00000000
--- a/policy-core/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  policy-core
-  ================================================================================
-  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=========================================================
-  -->
-
-<persistence version="2.1"
-	xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-
-	<persistence-unit name="ncompPU" transaction-type="RESOURCE_LOCAL">
-	<!-- This is for database access by non-drools methods -->
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.openecomp.policy.drools.persistence.DroolsPdpEntity</class>
-		<class>org.openecomp.policy.drools.persistence.DroolsSessionEntity</class>
-		<class>org.drools.persistence.info.SessionInfo</class>
-		<class>org.drools.persistence.info.WorkItemInfo</class>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-
-		<properties>
-			<!-- Properties are passed in -->
-        </properties>
-	</persistence-unit>
-	
-	<!-- This is the PU used by IntegrityAudit to audit DB tables used by Drools PDP -->
-	<persistence-unit name="auditDroolsPU" transaction-type="RESOURCE_LOCAL">
-		<!-- This is for database access by non-drools methods -->
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.drools.persistence.DroolsPdpEntity</class>
-		<class>org.openecomp.policy.drools.persistence.DroolsSessionEntity</class>
-		<class>org.drools.persistence.info.SessionInfo</class>
-		<class>org.drools.persistence.info.WorkItemInfo</class>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<properties>
-			<!-- Properties are passed in -->
-        </properties>
-	</persistence-unit>
-	
-	<persistence-unit name="ncompsessionsPU" transaction-type="JTA">
-	<!-- Used for drools session data access -->
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>		
-		<class>org.drools.persistence.info.SessionInfo</class>
-		<class>org.drools.persistence.info.WorkItemInfo</class>
-		<properties>
-			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
-			<property name="hibernate.max_fetch_depth" value="3" />
-			<property name="hibernate.hbm2ddl.auto" value="update" />
-			<property name="hibernate.show_sql" value="false" />
-			<property name="hibernate.transaction.manager_lookup_class"
-				value="org.hibernate.transaction.BTMTransactionManagerLookup" />
-		</properties>
-	</persistence-unit>
-	
-	
-	<persistence-unit name="schemaPU" transaction-type="RESOURCE_LOCAL">
-	<!-- Limited use for generating the DB and schema files for ncomp DB - uses eclipselink for convenience -->
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.drools.persistence.info.SessionInfo</class>
-		<class>org.drools.persistence.info.WorkItemInfo</class>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<properties>
-			<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-			<property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/> 
-            <property name="javax.persistence.schema-generation.scripts.create-target" value="./sql/generatedCreateNcomp.ddl"/>
-            <property name="javax.persistence.schema-generation.scripts.drop-target" value="./sql/generatedDropNcomp.ddl"/>
-        </properties>
-	</persistence-unit>
-</persistence>
-- 
cgit 1.2.3-korg