introducing spring libraries

2 files changed, 41 insertions, 25 deletions

diff --git a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AuthManager.java b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AuthManager.java
index 3adae9d0..a51c974f 100644
--- a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AuthManager.java
+++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AuthManager.java
@@ -10,7 +10,7 @@ public class AuthManager {
 	public boolean authenticate(ConnectionDetails connectionDetails) {
 //		WebResource service = Client.create(new DefaultClientConfig()).resource(getBaseURI());
 //
-//		AuthStatus authStatus = service.path("services").path("login")
+//		AuthStatus authStatus = service.path("resources").path("login")
 //				.queryParam("user", connectionDetails.getUserId())
 //				.queryParam("password", connectionDetails.getPassword()).accept(MediaType.TEXT_XML)
 //				.get(AuthStatus.class);
@@ -27,6 +27,6 @@ public class AuthManager {
 	}
 
 	private static URI getBaseURI() {
-		return UriBuilder.fromUri("http://localhost:8080/glustersp").build();
+		return UriBuilder.fromUri("http://localhost:8080/glustermc").build();
 	}
 }
diff --git a/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml b/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
index 6a4f5044..39be40cb 100644
--- a/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
+++ b/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
@@ -1,25 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
-  <display-name>com.gluster.storage.management.server</display-name>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <welcome-file>default.htm</welcome-file>
-    <welcome-file>default.jsp</welcome-file>
-  </welcome-file-list>
-  <servlet>
-    <servlet-name>Jersey REST Service</servlet-name>
-    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-    <init-param>
-      <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>com.gluster.storage.management.server.resources</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Jersey REST Service</servlet-name>
-    <url-pattern>/resources/*</url-pattern>
-  </servlet-mapping>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	id="WebApp_ID" version="3.0">
+	<display-name>com.gluster.storage.management.server</display-name>
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>default.html</welcome-file>
+		<welcome-file>default.htm</welcome-file>
+		<welcome-file>default.jsp</welcome-file>
+	</welcome-file-list>
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:applicationContext.xml</param-value>
+	</context-param>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+	</listener>
+
+	<servlet>
+		<servlet-name>Jersey REST Service</servlet-name>
+		<!-- servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class-->
+		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
+		<init-param>
+			<param-name>com.sun.jersey.config.property.packages</param-name>
+			<param-value>com.gluster.storage.management.server.resources</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Jersey REST Service</servlet-name>
+		<url-pattern>/resources/*</url-pattern>
+	</servlet-mapping>
 </web-app>
\ No newline at end of file