Merge "modified userFrom.jsp file"
diff --git a/.project b/.project
new file mode 100644
index 0000000..d3542a3
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>LocalRepo</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
index f61594b..8523e92 100644
--- a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
+++ b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
@@ -10,10 +10,14 @@
</head>
<body>
<<<<<<< HEAD
+<h1>Cognizant Technology Reddy </h1>
+=======
+<<<<<<< HEAD
<h1>Cognizant Test </h1>
=======
<h1>Cognizant Technology </h1>
>>>>>>> 46b94971157004bc4e2b04087cbc98cdd0caf8ef
+>>>>>>> refs/heads/Integration-Releases
<form:form method="POST" commandName="user">
<table>
@@ -62,4 +66,4 @@
</form:form>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/AntExample1/build/classes/com/vaannila/domain/User.class b/AntExample1/build/classes/com/vaannila/domain/User.class
new file mode 100644
index 0000000..900ddf3
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/domain/User.class
Binary files differ
diff --git a/AntExample1/build/classes/com/vaannila/service/UserService.class b/AntExample1/build/classes/com/vaannila/service/UserService.class
new file mode 100644
index 0000000..f92aa4e
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/service/UserService.class
Binary files differ
diff --git a/AntExample1/build/classes/com/vaannila/service/UserServiceImpl.class b/AntExample1/build/classes/com/vaannila/service/UserServiceImpl.class
new file mode 100644
index 0000000..eb88901
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/service/UserServiceImpl.class
Binary files differ
diff --git a/AntExample1/build/classes/com/vaannila/web/UserController.class b/AntExample1/build/classes/com/vaannila/web/UserController.class
new file mode 100644
index 0000000..9b16ddb
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/web/UserController.class
Binary files differ
diff --git a/AntExample1/dist/AntExample.war b/AntExample1/dist/AntExample.war
new file mode 100644
index 0000000..b9e22d8
--- /dev/null
+++ b/AntExample1/dist/AntExample.war
Binary files differ
diff --git a/AntExample1/license.txt b/AntExample1/license.txt
index 60fe9ae..1bdced3 100644
--- a/AntExample1/license.txt
+++ b/AntExample1/license.txt
@@ -2,9 +2,9 @@
Version 2.0, January 2004
http://www.apache.org/licenses/
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- 1. Definitions.
+ 1. Definitions .
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
diff --git a/Auto_Merge.sh b/Auto_Merge.sh
deleted file mode 100644
index 5597ea1..0000000
--- a/Auto_Merge.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Automatically merge the last commit through the following branches:
-# Integration-Releases -} master
-
-#git checkout -b issue-001 master
-
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-LAST_COMMIT=$(git rev-list -1 HEAD)
-
-echo Automatically merging commit $LAST_COMMIT from $CURRENT_BRANCH rippling to master
-
-case $CURRENT_BRANCH in
-issue-001)
-
- git checkout master
- git merge $CURRENT_BRANCH
- git push
- git checkout Integration-Releases
- git merge $CURRENT_BRANCH
- git push
- #git branch -d issue-#001
- ;;
-esac
\ No newline at end of file