X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfigure%2FPlaceArtifactScripts.java;h=48f0e622041887da357f7365dada231089c331af;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=5ee1abe26e6b8712917efec52657468e2fd34cb4;hpb=7e966914050e66219689001ff4ab601a49eef0ac;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
index 5ee1abe2..48f0e622 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
@@ -7,9 +7,9 @@
  * 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.
@@ -24,6 +24,8 @@ package org.onap.aaf.cadi.configure;
 import java.io.File;
 
 import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.aaf.Defaults;
+import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.util.Chmod;
 import org.onap.aaf.misc.env.Trans;
 import org.onap.aaf.misc.env.util.Chrono;
@@ -45,7 +47,7 @@ public class PlaceArtifactScripts extends ArtifactDir {
             }  else {
                 email=arti.getOsUser() + '\n';
             }
-            
+
             StringBuilder classpath = new StringBuilder();
             boolean first = true;
             for (String pth : Split.split(File.pathSeparatorChar, System.getProperty("java.class.path"))) {
@@ -55,21 +57,30 @@ public class PlaceArtifactScripts extends ArtifactDir {
                     classpath.append(File.pathSeparatorChar);
                 }
                 File f = new File(pth);
-                classpath.append(f.getCanonicalPath().replaceAll("[0-9]+\\.[0-9]+\\.[0-9]+","*"));
+                classpath.append(f.getCanonicalPath().replaceAll("[0-9]+\\.[0-9]+\\.[0-9]+",Defaults.AAF_VERSION+".*"));
             }
-            
+
             write(f1,Chmod.to644,
                     "#!/bin/bash " + f1.getCanonicalPath()+'\n',
                     "# Certificate Manager Check Script\n",
                     "# Check on Certificate, and renew if needed.\n",
                     "# Generated by Certificate Manager " + Chrono.timeStamp()+'\n',
+                    "#   by Deployer " + trans.getProperty(Config.AAF_APPID,"") + '\n',
+                    "#\n",
                     "DIR="+arti.getDir()+'\n',
+                    "APP_ID=" + arti.getMechid() + '\n',
+                    "FQDN=" + arti.getMachine()+ '\n',
                     "APP="+arti.getNs()+'\n',
-                    "EMAIL="+email,
-                    "CP=\""+classpath.toString()+"\"\n",
+                    "EMAIL="+email+ '\n',
+                    "JAR=\""+classpath.toString()+"\"\n",
+                    "if [ -z \"$JAVA_HOME\" ]; then \n",
+                    "  JAVA=\""+javaHome() + "/bin/" +"java\"\n",
+                    "else\n",
+                    "  JAVA=\"$JAVA_HOME/bin/java\"\n",
+                    "fi\n",
                     checkScript
                     );
-            
+
             // Setup check.sh script
             File f2 = new File(dir,arti.getNs()+".crontab.sh");
             write(f2,Chmod.to644,
@@ -89,9 +100,9 @@ public class PlaceArtifactScripts extends ArtifactDir {
         }
         return true;
     }
-    
+
     /**
-     * Note: java.home gets Absolute Path of Java, where we probably want soft links from 
+     * Note: java.home gets Absolute Path of Java, where we probably want soft links from
      * JAVA_HOME
      * @return
      */
@@ -99,8 +110,7 @@ public class PlaceArtifactScripts extends ArtifactDir {
         String rc = System.getenv("JAVA_HOME");
         return rc==null?System.getProperty("java.home"):rc;
     }
-    private final static String checkScript = 
-            "> $DIR/$APP.msg\n\n" +
+    private final static String checkScript =
             "function mailit {\n" +
             "  if [ -e /bin/mail ]; then\n" +
             "     MAILER=/bin/mail\n" +
@@ -115,9 +125,8 @@ public class PlaceArtifactScripts extends ArtifactDir {
             "    printf \"$*\" | $MAILER -s \"AAF Certman Notification for `uname -n`\" $EMAIL\n"+
             " fi\n" +
             "}\n\n" +
-            javaHome() + "/bin/" +"java -cp $CP " +
-                Agent.class.getName() + 
-                " cadi_prop_files=$DIR/$APP.props check 2>  $DIR/$APP.STDERR > $DIR/$APP.STDOUT\n" +
+            "> $DIR/$APP.msg\n\n" +
+            "$JAVA -jar $JAR check $APP_ID $FQDN cadi_prop_files=$DIR/$APP.props 2>  $DIR/$APP.STDERR > $DIR/$APP.STDOUT\n" +
             "case \"$?\" in\n" +
             "  0)\n" +
             "    # Note: Validation will be mailed only the first day after any modification\n" +
@@ -141,8 +150,8 @@ public class PlaceArtifactScripts extends ArtifactDir {
             "    ;;\n" +
             " esac\n\n" +
             " # Note: make sure to cover this sripts' exit Code\n";
-    
-    private final static String cronScript = 
+
+    private final static String cronScript =
             "crontab -l | sed -n \"/#### BEGIN $CF/,/END $CF ####/!p\" > $TFILE\n" +
             "# Note: Randomize Minutes (0-60) and hours (1-4)\n" +
             "echo \"#### BEGIN $CF ####\" >> $TFILE\n" +