Merge "remove jar files"

Former-commit-id: 7818a148f53081c4159f49824f739c47cc7c0da6

17 files changed, 32 insertions, 47 deletions

diff --git a/admportal/lib/CSPCheck.java b/admportal/lib/CSPCheck.java
deleted file mode 100644
index dac1d886..00000000
--- a/admportal/lib/CSPCheck.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import esGateKeeper.*;
-import java.util.*;
-import  java.io.*;
-import java.net.*;
-public class  CSPCheck{
-
-public static void main(String[] args){
-        try{
-		String attuid = "";	
-		if(args != null && args.length == 2){
-			String secCookie = args[0];
-			//validationEnv can be DEVL or PROD	
-			String validationEnv=args[1];
-			String retString = esGateKeeper.esGateKeeper(secCookie, "CSP", validationEnv, -5, "/tmp/");
-			if(retString != null){
-				String[] dataArr = retString.split("\\|");
-				attuid= dataArr[5];
-
-			}
-			System.out.print("{" + "\"attuid\" : \"" + attuid + "\"}");
-		}
-	}catch(Exception e){
-		System.out.print("{" + "\"attuid\" : \"ERROR\"}");
-	}
-}
-}
-
diff --git a/admportal/lib/GLCookieDecryption.jar b/admportal/lib/GLCookieDecryption.jar
deleted file mode 100644
index aa3d0593..00000000
--- a/admportal/lib/GLCookieDecryption.jar
+++ /dev/null
diff --git a/admportal/lib/ST4-4.0.8.jar b/admportal/lib/ST4-4.0.8.jar
deleted file mode 100644
index 144828ba..00000000
--- a/admportal/lib/ST4-4.0.8.jar
+++ /dev/null
diff --git a/admportal/lib/antlr4-4.5.1.jar b/admportal/lib/antlr4-4.5.1.jar
deleted file mode 100755
index 81039db1..00000000
--- a/admportal/lib/antlr4-4.5.1.jar
+++ /dev/null
diff --git a/admportal/lib/antlr4-runtime-4.5.1.jar b/admportal/lib/antlr4-runtime-4.5.1.jar
deleted file mode 100755
index 7807292e..00000000
--- a/admportal/lib/antlr4-runtime-4.5.1.jar
+++ /dev/null
diff --git a/admportal/lib/java-concurrent-hash-trie-map-0.2.23.jar b/admportal/lib/java-concurrent-hash-trie-map-0.2.23.jar
deleted file mode 100644
index 2c019d09..00000000
--- a/admportal/lib/java-concurrent-hash-trie-map-0.2.23.jar
+++ /dev/null
diff --git a/admportal/lib/jsr305-2.0.3.jar b/admportal/lib/jsr305-2.0.3.jar
deleted file mode 100644
index cc39b738..00000000
--- a/admportal/lib/jsr305-2.0.3.jar
+++ /dev/null
diff --git a/admportal/lib/object-cache-api-0.6.3-Helium-SR1.jar b/admportal/lib/object-cache-api-0.6.3-Helium-SR1.jar
deleted file mode 100644
index e75db741..00000000
--- a/admportal/lib/object-cache-api-0.6.3-Helium-SR1.jar
+++ /dev/null
diff --git a/admportal/lib/org.abego.treelayout.core-1.0.1.jar b/admportal/lib/org.abego.treelayout.core-1.0.1.jar
deleted file mode 100644
index 2350adcd..00000000
--- a/admportal/lib/org.abego.treelayout.core-1.0.1.jar
+++ /dev/null
diff --git a/admportal/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar b/admportal/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar
deleted file mode 100644
index c152830e..00000000
--- a/admportal/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar
+++ /dev/null
diff --git a/admportal/lib/util-0.6.3-Helium-SR1.jar b/admportal/lib/util-0.6.3-Helium-SR1.jar
deleted file mode 100644
index 0f8ca621..00000000
--- a/admportal/lib/util-0.6.3-Helium-SR1.jar
+++ /dev/null
diff --git a/admportal/lib/yang-binding-0.6.3-Helium-SR1.jar b/admportal/lib/yang-binding-0.6.3-Helium-SR1.jar
deleted file mode 100644
index 6adef241..00000000
--- a/admportal/lib/yang-binding-0.6.3-Helium-SR1.jar
+++ /dev/null
diff --git a/admportal/lib/yang-common-0.6.3-Helium-SR1.jar b/admportal/lib/yang-common-0.6.3-Helium-SR1.jar
deleted file mode 100644
index 1fc5f9f7..00000000
--- a/admportal/lib/yang-common-0.6.3-Helium-SR1.jar
+++ /dev/null
diff --git a/admportal/package.json b/admportal/package.json
index e625ef22..f30d0599 100644
--- a/admportal/package.json
+++ b/admportal/package.json
@@ -6,6 +6,7 @@
     "start": "node ./bin/www"
   },
   "dependencies": {
+    "async": "^2.5.0",
     "body-parser": "~1.8.1",
     "bootstrap": "^3.3.6",
     "bootstrap-submenu": "^2.0.3",
diff --git a/admportal/pom.xml b/admportal/pom.xml
index aebb75b3..6bb2f6bc 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -27,20 +27,31 @@
 		<SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>sli-common</artifactId>
-			<version>${sdnctl.sli.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.31</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.ccsdk.sli.core</groupId>
+      <artifactId>sli-common</artifactId>
+      <version>${sdnctl.sli.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.31</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4</artifactId>
+      <version>${antlr.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${equinox.osgi.version}</version>
+    </dependency>
+  </dependencies>
 
 	<build>
 		<plugins>
diff --git a/admportal/shell/start_portal.sh b/admportal/shell/start_portal.sh
index 976502cd..8a0c4452 100755
--- a/admportal/shell/start_portal.sh
+++ b/admportal/shell/start_portal.sh
@@ -1,8 +1,8 @@
 #. ./set-https-env.sh
 #cd ../bin
 #cp ../config/config.json.https ../config/config.json
-export PROJECT_HOME=/opt/openecomp/sdnc
-export PROJECT_RUNTIME_BASE=/opt/openecomp/sdnc
+export PROJECT_HOME=/opt/onap/sdnc
+export PROJECT_RUNTIME_BASE=/opt/onap/sdnc
 #export JAVA_HOME=/usr/lib/jvm/java-7-oracle
 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
 export SSL_ENABLED=false
@@ -19,11 +19,11 @@ export MAIN_MENU
 SSL_ENABLED=`python $PROJECT_HOME/admportal/shell/getAdmPortalProp.py sslEnabled | sed -e 's|['\'']||g'` 
 export SSL_ENABLED
 
-if [ ! -d /opt/openecomp/sdnc/admportal/node_modules ]; then
-	cd /opt/openecomp/sdnc/admportal && npm install
+if [ ! -d /opt/onap/sdnc/admportal/node_modules ]; then
+	cd /opt/onap/sdnc/admportal && npm install
 fi
 
-cd /opt/openecomp/sdnc/admportal
+cd /opt/onap/sdnc/admportal
 node shell/www
 #if [ "true" == "${SSL_ENABLED}" ]; then
 	#pm2 startOrRestart process.https.json
diff --git a/admportal/shell/svclogic.sh b/admportal/shell/svclogic.sh
index aca6bf1f..67ada89e 100644
--- a/admportal/shell/svclogic.sh
+++ b/admportal/shell/svclogic.sh
@@ -29,4 +29,4 @@ do
     CLASSPATH=$CLASSPATH:${jar}
 done
 
-java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER} org.openecomp.sdnc.sli.SvcLogicParser $*
+java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER} org.onap.ccsdk.sli.core.sli.SvcLogicParser $*