From b50a02c4a97676a8d4e976dbbcd6c7f8e21713a3 Mon Sep 17 00:00:00 2001 From: Al Rotundo Date: Wed, 20 Sep 2017 20:08:52 +0000 Subject: remove jar files jar files from lib directory were removed that were not needed. Added needed files into pom.xml file. Change-Id: I7cd15cdb3b65f790e4dbb4334753cb51d08f1803 Issue-ID:SDNC-81 Signed-off-by: Al Rotundo Former-commit-id: a11ee6416f6c565a3e8f979593855ac42dba10ce --- admportal/lib/CSPCheck.java | 27 -------------- admportal/lib/GLCookieDecryption.jar | Bin 11656 -> 0 bytes admportal/lib/ST4-4.0.8.jar | Bin 239543 -> 0 bytes admportal/lib/antlr4-4.5.1.jar | Bin 1478697 -> 0 bytes admportal/lib/antlr4-runtime-4.5.1.jar | Bin 302027 -> 0 bytes .../lib/java-concurrent-hash-trie-map-0.2.23.jar | Bin 47084 -> 0 bytes admportal/lib/jsr305-2.0.3.jar | Bin 33031 -> 0 bytes .../lib/object-cache-api-0.6.3-Helium-SR1.jar | Bin 13946 -> 0 bytes admportal/lib/org.abego.treelayout.core-1.0.1.jar | Bin 25515 -> 0 bytes .../org.eclipse.osgi-3.8.1.v20120830-144521.jar | Bin 1396459 -> 0 bytes admportal/lib/util-0.6.3-Helium-SR1.jar | Bin 115612 -> 0 bytes admportal/lib/yang-binding-0.6.3-Helium-SR1.jar | Bin 62971 -> 0 bytes admportal/lib/yang-common-0.6.3-Helium-SR1.jar | Bin 19216 -> 0 bytes admportal/package.json | 1 + admportal/pom.xml | 39 +++++++++++++-------- admportal/shell/start_portal.sh | 10 +++--- admportal/shell/svclogic.sh | 2 +- 17 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 admportal/lib/CSPCheck.java delete mode 100644 admportal/lib/GLCookieDecryption.jar delete mode 100644 admportal/lib/ST4-4.0.8.jar delete mode 100755 admportal/lib/antlr4-4.5.1.jar delete mode 100755 admportal/lib/antlr4-runtime-4.5.1.jar delete mode 100644 admportal/lib/java-concurrent-hash-trie-map-0.2.23.jar delete mode 100644 admportal/lib/jsr305-2.0.3.jar delete mode 100644 admportal/lib/object-cache-api-0.6.3-Helium-SR1.jar delete mode 100644 admportal/lib/org.abego.treelayout.core-1.0.1.jar delete mode 100644 admportal/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar delete mode 100644 admportal/lib/util-0.6.3-Helium-SR1.jar delete mode 100644 admportal/lib/yang-binding-0.6.3-Helium-SR1.jar delete mode 100644 admportal/lib/yang-common-0.6.3-Helium-SR1.jar 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 Binary files a/admportal/lib/GLCookieDecryption.jar and /dev/null differ 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 Binary files a/admportal/lib/ST4-4.0.8.jar and /dev/null differ 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 Binary files a/admportal/lib/antlr4-4.5.1.jar and /dev/null differ 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 Binary files a/admportal/lib/antlr4-runtime-4.5.1.jar and /dev/null differ 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 Binary files a/admportal/lib/java-concurrent-hash-trie-map-0.2.23.jar and /dev/null differ 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 Binary files a/admportal/lib/jsr305-2.0.3.jar and /dev/null differ 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 Binary files a/admportal/lib/object-cache-api-0.6.3-Helium-SR1.jar and /dev/null differ 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 Binary files a/admportal/lib/org.abego.treelayout.core-1.0.1.jar and /dev/null differ 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 Binary files a/admportal/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar and /dev/null differ 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 Binary files a/admportal/lib/util-0.6.3-Helium-SR1.jar and /dev/null differ 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 Binary files a/admportal/lib/yang-binding-0.6.3-Helium-SR1.jar and /dev/null differ 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 Binary files a/admportal/lib/yang-common-0.6.3-Helium-SR1.jar and /dev/null differ 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 @@ ${project.version}-${build.number} - - - org.onap.ccsdk.sli.core - sli-common - ${sdnctl.sli.version} - - - mysql - mysql-connector-java - 5.1.31 - jar - compile - - + + + org.onap.ccsdk.sli.core + sli-common + ${sdnctl.sli.version} + + + mysql + mysql-connector-java + 5.1.31 + jar + compile + + + org.antlr + antlr4 + ${antlr.version} + jar + + + equinoxSDK381 + org.eclipse.osgi + ${equinox.osgi.version} + + 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 $* -- cgit 1.2.3-korg