Merged 5.2.N (5.2.1) to HEAD (5.2)

125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/framework/jacksonextensions/NodeRefDeserializer.java

@@ -1,48 +1,48 @@
-package org.alfresco.rest.framework.jacksonextensions;
-
-import java.io.IOException;
-
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
-
-public class NodeRefDeserializer extends JsonDeserializer<NodeRef>
-{
-	private NodeRef getNodeRef(String nodeRefString)
-	{
-		NodeRef nodeRef = null;
-
-        if(!NodeRef.isNodeRef(nodeRefString))
-        {
-        	nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeRefString);
-        }
-        else
-        {
-        	nodeRef = new NodeRef(nodeRefString);
-        }
-
-		return nodeRef;
-	}
-
-	@Override
-	public NodeRef deserialize(JsonParser jp, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException
-	{
-        JsonToken curr = jp.getCurrentToken();
-
-        if (curr == JsonToken.VALUE_STRING)
-        {
-            String nodeRefString = jp.getText();
-            NodeRef nodeRef = getNodeRef(nodeRefString);
-            return nodeRef;
-        }
-        else
-        {
-        	throw new IOException("Unable to deserialize nodeRef: " + curr.asString());
-        }
-	}
-}
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.JsonToken;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.codehaus.jackson.map.JsonDeserializer;
+
+public class NodeRefDeserializer extends JsonDeserializer<NodeRef>
+{
+	private NodeRef getNodeRef(String nodeRefString)
+	{
+		NodeRef nodeRef = null;
+
+        if(!NodeRef.isNodeRef(nodeRefString))
+        {
+        	nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeRefString);
+        }
+        else
+        {
+        	nodeRef = new NodeRef(nodeRefString);
+        }
+
+		return nodeRef;
+	}
+
+	@Override
+	public NodeRef deserialize(JsonParser jp, DeserializationContext ctxt)
+			throws IOException, JsonProcessingException
+	{
+        JsonToken curr = jp.getCurrentToken();
+
+        if (curr == JsonToken.VALUE_STRING)
+        {
+            String nodeRefString = jp.getText();
+            NodeRef nodeRef = getNodeRef(nodeRefString);
+            return nodeRef;
+        }
+        else
+        {
+        	throw new IOException("Unable to deserialize nodeRef: " + curr.asString());
+        }
+	}
+}

source/java/org/alfresco/rest/framework/jacksonextensions/NodeRefSerializer.java

@@ -1,25 +1,25 @@
-package org.alfresco.rest.framework.jacksonextensions;
-
-import java.io.IOException;
-
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.SerializerProvider;
-import org.codehaus.jackson.map.ser.std.SerializerBase;
-
-public class NodeRefSerializer extends SerializerBase<NodeRef>
-{
-    protected NodeRefSerializer()
-    {
-        super(NodeRef.class);
-    }
-
-    @Override
-    public void serialize(NodeRef nodeRef, JsonGenerator jgen, SerializerProvider provider)
-                throws IOException, JsonGenerationException
-    {
-    	jgen.writeString(nodeRef.getId());
-    }
-
-}
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.map.SerializerProvider;
+import org.codehaus.jackson.map.ser.std.SerializerBase;
+
+public class NodeRefSerializer extends SerializerBase<NodeRef>
+{
+    protected NodeRefSerializer()
+    {
+        super(NodeRef.class);
+    }
+
+    @Override
+    public void serialize(NodeRef nodeRef, JsonGenerator jgen, SerializerProvider provider)
+                throws IOException, JsonGenerationException
+    {
+    	jgen.writeString(nodeRef.getId());
+    }
+
+}

source/java/org/alfresco/rest/framework/jacksonextensions/RestApiStringDeserializer.java

@@ -1,31 +1,31 @@
-package org.alfresco.rest.framework.jacksonextensions;
-
-import java.io.IOException;
-
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.deser.std.StringDeserializer;
-
-/**
- * Rest api string deserializer that ensures that empty strings are treated as null strings.
- * 
- * @author steveglover
- *
- */
-public class RestApiStringDeserializer extends StringDeserializer
-{
-    @Override
-    public String deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-    	String ret = super.deserialize(jp, ctxt);
-
-    	if(ret != null && ret.length() == 0)
-    	{
-    		ret = null;
-    	}
-
-    	return ret;
-    }
-}
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.codehaus.jackson.map.deser.std.StringDeserializer;
+
+/**
+ * Rest api string deserializer that ensures that empty strings are treated as null strings.
+ * 
+ * @author steveglover
+ *
+ */
+public class RestApiStringDeserializer extends StringDeserializer
+{
+    @Override
+    public String deserialize(JsonParser jp, DeserializationContext ctxt)
+        throws IOException, JsonProcessingException
+    {
+    	String ret = super.deserialize(jp, ctxt);
+
+    	if(ret != null && ret.length() == 0)
+    	{
+    		ret = null;
+    	}
+
+    	return ret;
+    }
+}

source/java/org/alfresco/rest/framework/jacksonextensions/TargetDeserializer.java

@@ -1,98 +1,98 @@
-package org.alfresco.rest.framework.jacksonextensions;
-
-import java.io.IOException;
-
-import org.alfresco.rest.api.model.Document;
-import org.alfresco.rest.api.model.DocumentTarget;
-import org.alfresco.rest.api.model.Folder;
-import org.alfresco.rest.api.model.FolderTarget;
-import org.alfresco.rest.api.model.Site;
-import org.alfresco.rest.api.model.SiteTarget;
-import org.alfresco.rest.api.model.Target;
-import org.alfresco.service.cmr.favourites.FavouritesService.Type;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.BeanProperty;
-import org.codehaus.jackson.map.BeanProperty.Std;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.type.SimpleType;
-import org.codehaus.jackson.type.JavaType;
-
-public class TargetDeserializer extends JsonDeserializer<Target>
-{
-	@Override
-	public Target deserialize(JsonParser jp, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException
-	{
-		Target target = null;
-        JsonToken curr = jp.getCurrentToken();
-        
-        if (curr == JsonToken.START_OBJECT)
-        {
-            while(jp.nextToken() != JsonToken.END_OBJECT)
-            {
-        		String fieldname = jp.getCurrentName();
-        		if(Type.SITE.toString().equals(fieldname.toUpperCase()))
-        		{
-        			jp.nextToken();
-        			try
-        			{
-        		        JavaType t = SimpleType.construct(Site.class);
-        		        BeanProperty p = new Std("", t, null, null);
-        		        JsonDeserializer<?> siteDeserializer = ctxt.getDeserializerProvider().findValueDeserializer(ctxt.getConfig(), t, p);
-
-        				Site site = (Site)siteDeserializer.deserialize(jp, ctxt);
-                    	target = new SiteTarget(site);
-        			}
-        			catch(JsonMappingException e)
-        			{
-        				throw new IllegalArgumentException("Target body is invalid for target type");
-        			}
-        		}
-        		else if(Type.FILE.toString().equals(fieldname.toUpperCase()))
-        		{
-        			jp.nextToken();
-        			try
-        			{
-        				JavaType t = SimpleType.construct(Document.class);
-        				BeanProperty p = new Std("", t, null, null);
-        		        JsonDeserializer<?> documentDeserializer = ctxt.getDeserializerProvider().findValueDeserializer(ctxt.getConfig(), t, p);
-
-	        			Document document = (Document)documentDeserializer.deserialize(jp, ctxt);
-	                	target = new DocumentTarget(document);
-        			}
-        			catch(JsonMappingException e)
-        			{
-        				throw new IllegalArgumentException("Target body is invalid for target type");
-        			}
-        		}
-        		else if(Type.FOLDER.toString().equals(fieldname.toUpperCase()))
-        		{
-        			jp.nextToken();
-        			try
-        			{
-        				JavaType t = SimpleType.construct(Folder.class);
-        				BeanProperty p = new Std("", t, null, null);
-        		        JsonDeserializer<?> folderDeserializer = ctxt.getDeserializerProvider().findValueDeserializer(ctxt.getConfig(), t, p);
-        		        
-	        			Folder folder = (Folder)folderDeserializer.deserialize(jp, ctxt);
-	        			target = new FolderTarget(folder);
-        			}
-        			catch(JsonMappingException e)
-        			{
-        				throw new IllegalArgumentException("Target body is invalid for target type");
-        			}
-        		}
-            }
-
-        	return target;
-        }
-        else
-        {
-        	throw new IOException("Unable to deserialize favourite: " + curr.asString());
-        }
-	}
-}
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.DocumentTarget;
+import org.alfresco.rest.api.model.Folder;
+import org.alfresco.rest.api.model.FolderTarget;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.model.SiteTarget;
+import org.alfresco.rest.api.model.Target;
+import org.alfresco.service.cmr.favourites.FavouritesService.Type;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.JsonToken;
+import org.codehaus.jackson.map.BeanProperty;
+import org.codehaus.jackson.map.BeanProperty.Std;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.codehaus.jackson.map.JsonDeserializer;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.type.SimpleType;
+import org.codehaus.jackson.type.JavaType;
+
+public class TargetDeserializer extends JsonDeserializer<Target>
+{
+	@Override
+	public Target deserialize(JsonParser jp, DeserializationContext ctxt)
+			throws IOException, JsonProcessingException
+	{
+		Target target = null;
+        JsonToken curr = jp.getCurrentToken();
+        
+        if (curr == JsonToken.START_OBJECT)
+        {
+            while(jp.nextToken() != JsonToken.END_OBJECT)
+            {
+        		String fieldname = jp.getCurrentName();
+        		if(Type.SITE.toString().equals(fieldname.toUpperCase()))
+        		{
+        			jp.nextToken();
+        			try
+        			{
+        		        JavaType t = SimpleType.construct(Site.class);
+        		        BeanProperty p = new Std("", t, null, null);
+        		        JsonDeserializer<?> siteDeserializer = ctxt.getDeserializerProvider().findValueDeserializer(ctxt.getConfig(), t, p);
+
+        				Site site = (Site)siteDeserializer.deserialize(jp, ctxt);
+                    	target = new SiteTarget(site);
+        			}
+        			catch(JsonMappingException e)
+        			{
+        				throw new IllegalArgumentException("Target body is invalid for target type");
+        			}
+        		}
+        		else if(Type.FILE.toString().equals(fieldname.toUpperCase()))
+        		{
+        			jp.nextToken();
+        			try
+        			{
+        				JavaType t = SimpleType.construct(Document.class);
+        				BeanProperty p = new Std("", t, null, null);
+        		        JsonDeserializer<?> documentDeserializer = ctxt.getDeserializerProvider().findValueDeserializer(ctxt.getConfig(), t, p);
+
+	        			Document document = (Document)documentDeserializer.deserialize(jp, ctxt);
+	                	target = new DocumentTarget(document);
+        			}
+        			catch(JsonMappingException e)
+        			{
+        				throw new IllegalArgumentException("Target body is invalid for target type");
+        			}
+        		}
+        		else if(Type.FOLDER.toString().equals(fieldname.toUpperCase()))
+        		{
+        			jp.nextToken();
+        			try
+        			{
+        				JavaType t = SimpleType.construct(Folder.class);
+        				BeanProperty p = new Std("", t, null, null);
+        		        JsonDeserializer<?> folderDeserializer = ctxt.getDeserializerProvider().findValueDeserializer(ctxt.getConfig(), t, p);
+        		        
+	        			Folder folder = (Folder)folderDeserializer.deserialize(jp, ctxt);
+	        			target = new FolderTarget(folder);
+        			}
+        			catch(JsonMappingException e)
+        			{
+        				throw new IllegalArgumentException("Target body is invalid for target type");
+        			}
+        		}
+            }
+
+        	return target;
+        }
+        else
+        {
+        	throw new IOException("Unable to deserialize favourite: " + curr.asString());
+        }
+	}
+}