Code Review / sdnc / oam.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 1bd7bcb)
Added some dependencies and plugin in SDNC-231 27/70927/2
authorsoumendu <SA00498080@techmahindra.com>
Mon, 22 Oct 2018 10:11:29 +0000 (15:41 +0530)
committerDan Timoney <dtimoney@att.com>
Fri, 26 Oct 2018 15:29:19 +0000 (15:29 +0000)
Added dependencies and plugin in vnfconfigbackupservice pom and update path in index.jsp

Change-Id: I5755762d6e22d072c7b2145b2dbf87254b8b26a0
Issue-ID: SDNC-483
Signed-off-by: soumendu <SA00498080@techmahindra.com>
Former-commit-id: 2248dfe67a4e21be9a1c5c9c81800404ca38a3e0

configbackuprestore/vnfconfigbackupservice/pom.xml patch | blob | history
configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp patch | blob | history
configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html patch | blob | history

diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index 606062e..ef9a981 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/pom.xml
+++ b/configbackuprestore/vnfconfigbackupservice/pom.xml
@@ -131,11 +131,35 @@
                        <artifactId>jackson-xml-databind</artifactId>
                        <version>0.6.2</version>
                </dependency>
+               
+               <dependency>
+               <groupId>org.webjars</groupId>
+                       <artifactId>bootstrap</artifactId>
+                       <version>3.3.7</version>
+               </dependency>
+
+               <dependency>
+               <groupId>org.webjars</groupId>
+                       <artifactId>bootstrap-datepicker</artifactId>
+                       <version>1.0.1</version>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.webjars.bower</groupId>
+                       <artifactId>angular-object-diff</artifactId>
+                       <version>1.0.1</version>
+               </dependency>
 
        </dependencies>
 
        <build>
                <plugins>
+
+                       <plugin>
+                               <groupId>org.springframework.boot</groupId>
+                               <artifactId>spring-boot-maven-plugin</artifactId>
+                       </plugin>
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
index b6a3e55..95b6414 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
+++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
@@ -26,8 +26,8 @@
       <!-- CSS -->
       <script src="./node_modules/jquery.min.js"></script>
       <script src="./node_modules/tether.min.js" ></script>
-      <link rel="stylesheet" href="./node_modules/bootstrap-3.3.7/dist/css/bootstrap.min.css">
-      <script src="./node_modules/bootstrap-3.3.7/dist/js/bootstrap.min.js"></script>
+      <link rel="stylesheet" href="./webjars/bootstrap/3.3.7/css/bootstrap.min.css">
+      <script src="./webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
       <link rel="stylesheet" href="/static/style/sdnc-style.css">
       <!-- JS -->
       <!-- load angular,date-time picker,pagination,growl and ui-router -->
@@ -53,8 +53,8 @@
       <script src="./node_modules/ng-ip-address/ngIpAddress.min.js" ></script>
       <link rel="stylesheet" type="text/css" href="./node_modules/angular-growl-v2/build/angular-growl.css">
       <link rel="stylesheet" href="/static/style/w3.css">
-      <link type="text/css" href="./node_modules/angular-object-diff/dist/angular-object-diff.css" rel='stylesheet'>
-      <script type="text/javascript" src="/node_modules/angular-object-diff/dist/angular-object-diff.js"></script>
+      <link type="text/css" href="./webjars/angular-object-diff/1.0.1/dist/angular-object-diff.css" rel='stylesheet'>
+      <script type="text/javascript" src="/webjars/angular-object-diff/1.0.1/dist/angular-object-diff.js"></script>
    </head>
    <!-- apply our angular app -->
    <body>
diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html
index 178a818..b8b65c6 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html
+++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html
@@ -10,7 +10,7 @@
                                </div>
                         </div>
             <li><div class="dropdown">
-              <button class="dropbtn">DEVICE CONFIGRUATION</button>
+              <button class="dropbtn">DEVICE CONFIGURATION</button>
                       <div class="dropdown-content">
                              <a ng-href="#deviceConfig">Backup Config</a>
                              <a ng-href="#applyConfig">Apply Config</a>
SDNC OA&M tools