fixed pom, unnecessary profile verification view and merge error

hit-base-service/pom.xml

@@ -1,16 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>gvt-ui-service</artifactId>
-	<name>gvt-ui-service</name>
-	<description>gvt-ui tool service package</description>
+	<artifactId>hit-base-service</artifactId>
+	<name>hit-base-service</name>
+	<description>HIT base tool service package</description>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>gov.nist.hit.gvt</groupId>
-		<artifactId>gvt-ui-tool</artifactId>
+		<groupId>gov.nist.hit.base</groupId>
+		<artifactId>hit-base-tool</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-
+ 
 	<build>
 		<pluginManagement>
 			<plugins>

hit-base-web/pom.xml

@@ -1,44 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>gvt-ui-web</artifactId>
-	<name>gvt-ui-web</name>
-	<description>gvt-ui web</description>
+	<artifactId>hit-base-web</artifactId>
+	<name>hit-base-web</name>
+	<description>hit-base tool</description>
 	<packaging>war</packaging>
 	<parent>
-		<groupId>gov.nist.hit.gvt</groupId>
-		<artifactId>gvt-ui-tool</artifactId>
+		<groupId>gov.nist.hit.base</groupId>
+		<artifactId>hit-base-tool</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>gov.nist.hit.gvt</groupId>
-			<artifactId>gvt-config</artifactId>
-			<version>${config.version}</version>
-		</dependency>
-		<dependency>
-	      <groupId>junit</groupId>
-	      <artifactId>junit</artifactId>
-	      <version>4.11</version>
-	      <scope>test</scope>
-	    </dependency>
-	    <dependency>
-		  <groupId>org.apache.httpcomponents</groupId>
-		  <artifactId>httpclient</artifactId>
-		  <version>4.0.1</version>
-		  <scope>compile</scope>
-		</dependency>
-		<dependency>
-		  <groupId>org.apache.httpcomponents</groupId>
-		  <artifactId>httpmime</artifactId>
-		  <version>4.0.1</version>
-		  <scope>compile</scope>
-		</dependency>
-	</dependencies>
-
 	<build>
-		<finalName>gvt</finalName>
+		<finalName>hit-base-tool</finalName>
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -59,6 +33,7 @@
 						</execution>
 					</executions>
 				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-eclipse-plugin</artifactId>
@@ -90,22 +65,23 @@
 						<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
 					</configuration>
 				</plugin>
-				<plugin>
-		          <groupId>org.apache.maven.plugins</groupId>
-		          <artifactId>maven-surefire-plugin</artifactId>
-		          <version>2.18.1</version>
-		        </plugin>
 			</plugins>
 		</pluginManagement>
+
 	</build>
+	<dependencies>
+ <dependency>
+			<groupId>gov.nist.hit.example</groupId>
+  <artifactId>hit-example-tool</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+		</dependency>  
 
+
+	</dependencies>
 	<repositories>
 		<repository>
 			<id>spring-milestones</id>
 			<url>http://repo.springsource.org/libs-milestone/</url>
 		</repository>
 	</repositories>
-	<properties>
-		<config.version>1.0.0-SNAPSHOT</config.version>
-	</properties>
 </project>

hit-base-web/src/main/webapp/index.html

@@ -90,7 +90,7 @@
 
   <div ng-include="'views/footer.html'"></div>
 
-  <script src="scripts/9433e398.vendor.js"></script>
+  <script src="scripts/34217450.vendor.js"></script>
 
   <script src="lib/i18n/jquery.i18n.properties-1.0.9.js"></script>
   <script src="lib/vkbeautify/vkbeautify.js"></script>
@@ -117,7 +117,7 @@
   <script src="lib/base-libs/edi.js"></script>
   <script src="lib/base-libs/soap.js"></script>
   <script src="lib/settings/settings.js"></script>
-  <script src="scripts/cf027ece.scripts.js"></script>
+  <script src="scripts/e976905b.scripts.js"></script>
 
   <div ng-include="'views/error.html'"></div>
   <div ng-include="'views/templates.html'"></div>

hit-base-web/src/main/webapp/views/header.html

@@ -41,6 +41,7 @@
             <!--<span title="Transport Configuration" class="label label-danger label-icon">T</span>-->
             <!--<i class="fa fa-exchange"></i>-->
             <!--Transport Settings</a></li>-->
+            <li ng-show="isAuthenticated()" ng-class="{'active':isActive('/profilevalidation')}"><a href="#/profileverification"><i class="fa fa-book"></i>Profile Verification</a></li>
             <li ng-class="{'active':isActive('/doc')}"><a href="#/doc"><i class="fa fa-book"></i>Documentation</a></li>
             <li ng-class="{'active':isActive('/about')}"><a href="#/about"><i class="fa fa-question-circle"></i>About</a></li>
             <!--<li ng-class="{'active':isActive('/contact')}"><a href="#/contact"><i class="fa fa-phone-square"></i>Contact Us</a></li>-->

hit-base-web/src/main/webapp/views/home.html

@@ -12,6 +12,7 @@
   <i class="fa fa-circle-o-notch fa-spin fa-3x"></i>
 </div>
 
+
 <div ng-show="!loadingDomain">
 
   <div class="iz-home">

hit-base-web/src/main/webapp/views/logs/validation.html

@@ -11,15 +11,12 @@
 </script>
 <div ng-controller="ValidationLogCtrl" ng-init="initValidationLogs()">
 
-<<<<<<< HEAD
-=======
 
   <div ng-show="loadingAll" style="text-align:center">
     <i class="fa fa-circle-o-notch fa-spin fa-3x"></i>
   </div>
 
   <div ng-show="!loadingAll">
->>>>>>> 61115ccae1413f04f9631b6757f78eacf2d32c89
   <div class="row" style="margin-bottom: 20px">
     <div class="col-md-4">
       <label>Context Type</label>
@@ -49,10 +46,6 @@
   </div>
 
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 61115ccae1413f04f9631b6757f78eacf2d32c89
   <table st-table="tmpLogs" st-safe-src="logs" st-set-filter="logCustomFilter" class="table table-condensed table-bordered validation-log">
     <thead>
     <tr>
@@ -119,9 +112,6 @@
       </th>
     </tr>
    </table>
-<<<<<<< HEAD
-=======
   </div>
 
->>>>>>> 61115ccae1413f04f9631b6757f78eacf2d32c89
 </div>