From 429d3149d5cf042f1aabc5836d7df451c7da06bd Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Tue, 5 Jul 2011 13:16:45 +0530
Subject: Changed base URI of REST resources to include the API version

---
 src/com.gluster.storage.management.core/.classpath     |   1 +
 .../META-INF/MANIFEST.MF                               |   5 ++++-
 .../build.properties                                   |   5 ++++-
 .../lib/log4j-1.2.16.jar                               | Bin 0 -> 481534 bytes
 .../gluster/storage/management/core/model/User.java    |   3 +++
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar

(limited to 'src/com.gluster.storage.management.core')

diff --git a/src/com.gluster.storage.management.core/.classpath b/src/com.gluster.storage.management.core/.classpath
index b41cbcdb..221aeec4 100644
--- a/src/com.gluster.storage.management.core/.classpath
+++ b/src/com.gluster.storage.management.core/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="junit"/>
diff --git a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
index a32970c8..fae660fb 100644
--- a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
@@ -9,5 +9,8 @@ Export-Package: com.gluster.storage.management.core.constants,
  com.gluster.storage.management.core.exceptions,
  com.gluster.storage.management.core.model,
  com.gluster.storage.management.core.response,
- com.gluster.storage.management.core.utils
+ com.gluster.storage.management.core.utils,
+ org.apache.log4j
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
+Bundle-ClassPath: lib/log4j-1.2.16.jar,
+ .
diff --git a/src/com.gluster.storage.management.core/build.properties b/src/com.gluster.storage.management.core/build.properties
index 34d2e4d2..89d32a46 100644
--- a/src/com.gluster.storage.management.core/build.properties
+++ b/src/com.gluster.storage.management.core/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               lib/
+src.includes = lib/,\
+               src/
diff --git a/src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar b/src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar
new file mode 100644
index 00000000..3f9d8476
Binary files /dev/null and b/src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar differ
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java
index da92ca14..ed5d12f7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java
@@ -19,6 +19,7 @@
 package com.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 @XmlRootElement
 public class User {
@@ -31,6 +32,8 @@ public class User {
 	public void setUserId(String userId) {
 		this.userId = userId;
 	}
+	
+	@XmlTransient
 	public String getPassword() {
 		return password;
 	}
-- 
cgit