diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..4871a1a
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
index 62c8935..ff734a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-.idea/
\ No newline at end of file
+.idea/
+/target/
+/bin/
diff --git a/.project b/.project
new file mode 100644
index 0000000..6a18449
--- /dev/null
+++ b/.project
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OAPS-Jifry</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 0000000..f179e11
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..e9441bb
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..d9c67f2
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..7add3ce
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="WZF_OAPS">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <property name="context-root" value="WZF_OAPS"/>
+        <property name="java-output-path" value="/OAPS-Jifry/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..735eb31
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="2.3"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/target/WZF_OAPS/Search.jsp b/target/WZF_OAPS/Search.jsp
index fb5e49f..29de7ec 100644
--- a/target/WZF_OAPS/Search.jsp
+++ b/target/WZF_OAPS/Search.jsp
@@ -151,6 +151,34 @@ footer
 select * from article a , subject s where a.sid=s.sid  and  hide="No" and (title like '%<%=request.getAttribute("search2") %>%' or abstracts like '%<%=request.getAttribute("search2") %>%' or highlight like '%<%=request.getAttribute("search2") %>%') order by time desc
 </sql:query>
 
+<!--  -->
+
+<!-- method highlighter reads picks user input keyword and database search results
+as arguments. It confirms if the input keyword is in the result set retrieved from
+database. if this is true, then the entire search results is highlighted. Else the result
+isn't highlighted -->
+<%!
+   public String highlighter(String s,String searchResults){
+	 String finalOutput = null;
+	 
+  if(searchResults !=  null){
+   
+    if(s.contains(searchResults))
+    {
+        finalOutput = "<span style='background-color:yellow'> " + s+ "  </span>";
+    }
+    else
+    {
+    	finalOutput = s;
+    }
+  
+  }
+  
+	return finalOutput;
+}
+
+ %>
+
 <div>
 <table class="table2">
 <tr>
@@ -160,8 +188,27 @@ select * from article a , subject s where a.sid=s.sid  and  hide="No" and (title
 <th>Time</th>
 <th>Popularity</th>
 </tr>
+
 <c:forEach items="${result.rows}" var="row">
-<c:set value="${search2}" var="search2"></c:set>
+
+<!-- setting results from database  into c: tag variable-->
+	<c:set  value="${search2}" var="search2"></c:set> 
+	<c:set var="subj_name" value="${row.subject}"/>
+ 	<c:set var="subj_title" value="${row.title}"></c:set> 
+ 
+	<!-- this scriplet accesses user input search string from servlet as well as from
+	database inorder to be used as arguments for the highlighter function -->
+	
+<%
+	String searchResults = (String)request.getAttribute("search2");
+	String subj_name = (String)pageContext.getAttribute("subj_name");
+	String subj_title = (String)pageContext.getAttribute("subj_title");
+	
+	//printing output in console for the purpose of debugging
+	System.out.println(searchResults);
+	System.out.println(subj_name );
+	System.out.println(subj_title );
+%>
 <tr>
 <td><c:out value="${row.subject}"></c:out></td>
 <td><a href="Controller?page=view-article&title=${row.title}"> <c:out value="${row.title}"></c:out> </a></td>
diff --git a/target/classes/com/database/DB.class b/target/classes/com/database/DB.class
index e88e1e3..1b366e0 100644
Binary files a/target/classes/com/database/DB.class and b/target/classes/com/database/DB.class differ
diff --git a/target/classes/com/filter/Filter_AdminLogin.class b/target/classes/com/filter/Filter_AdminLogin.class
index 7896c5d..11aeca9 100644
Binary files a/target/classes/com/filter/Filter_AdminLogin.class and b/target/classes/com/filter/Filter_AdminLogin.class differ
diff --git a/target/classes/com/javaBean/Administrator.class b/target/classes/com/javaBean/Administrator.class
index 60b84cf..06417df 100644
Binary files a/target/classes/com/javaBean/Administrator.class and b/target/classes/com/javaBean/Administrator.class differ
diff --git a/target/classes/com/javaBean/Article.class b/target/classes/com/javaBean/Article.class
index 4d61b9b..5b60d0e 100644
Binary files a/target/classes/com/javaBean/Article.class and b/target/classes/com/javaBean/Article.class differ
diff --git a/target/classes/com/javaBean/Author.class b/target/classes/com/javaBean/Author.class
index 4613e37..4236225 100644
Binary files a/target/classes/com/javaBean/Author.class and b/target/classes/com/javaBean/Author.class differ
diff --git a/target/classes/com/javaBean/Subject.class b/target/classes/com/javaBean/Subject.class
index 6ffed53..500288d 100644
Binary files a/target/classes/com/javaBean/Subject.class and b/target/classes/com/javaBean/Subject.class differ
diff --git a/target/classes/com/javaBeans/AdministorController.class b/target/classes/com/javaBeans/AdministorController.class
index b52da27..7addaac 100644
Binary files a/target/classes/com/javaBeans/AdministorController.class and b/target/classes/com/javaBeans/AdministorController.class differ
diff --git a/target/classes/com/javaBeans/AuthorController.class b/target/classes/com/javaBeans/AuthorController.class
index 6a2aa01..684aaba 100644
Binary files a/target/classes/com/javaBeans/AuthorController.class and b/target/classes/com/javaBeans/AuthorController.class differ
diff --git a/target/classes/com/javaBeans/Controller.class b/target/classes/com/javaBeans/Controller.class
index 34d4385..fb20113 100644
Binary files a/target/classes/com/javaBeans/Controller.class and b/target/classes/com/javaBeans/Controller.class differ
diff --git a/target/classes/com/javaBeans/DownloadServlet.class b/target/classes/com/javaBeans/DownloadServlet.class
index fa6d4a4..3a1ecca 100644
Binary files a/target/classes/com/javaBeans/DownloadServlet.class and b/target/classes/com/javaBeans/DownloadServlet.class differ
diff --git a/target/classes/com/javaBeans/UploadServlet.class b/target/classes/com/javaBeans/UploadServlet.class
index 4d6fbae..939bedb 100644
Binary files a/target/classes/com/javaBeans/UploadServlet.class and b/target/classes/com/javaBeans/UploadServlet.class differ