X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fintegration%2FCmsLoginServlet.java;h=5bc13526c64f94363a15ec0c314dab96af3c10cb;hb=71196c25959b53964edf87aeb4387ed8b11b4868;hp=2adc5371d989349d9417a36441ec51ebba189dab;hpb=7e77ed8fc812ea81d5cecec67006fbe363150ef8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java b/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java
index 2adc5371d..5bc13526c 100644
--- a/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java
+++ b/org.argeo.cms/src/org/argeo/cms/integration/CmsLoginServlet.java
@@ -16,10 +16,10 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.auth.CmsSessionId;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
-import org.argeo.node.NodeConstants;
 import org.osgi.service.useradmin.Authorization;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,7 +31,6 @@ public class CmsLoginServlet extends HttpServlet {
 	public final static String PARAM_PASSWORD = "password";
 
 	private static final long serialVersionUID = 2478080654328751539L;
-//	private Gson gson = new GsonBuilder().setPrettyPrinting().create();
 	private ObjectMapper objectMapper = new ObjectMapper();
 
 	@Override
@@ -80,27 +79,6 @@ public class CmsLoginServlet extends HttpServlet {
 			JsonGenerator jg = objectMapper.getFactory().createGenerator(response.getWriter());
 			jg.writeObject(cmsSessionDescriptor);
 
-//				JsonWriter jsonWriter = gson.newJsonWriter(response.getWriter());
-//				jsonWriter.beginObject();
-//				// Authorization
-//				jsonWriter.name("username").value(authorization.getName());
-//				jsonWriter.name("displayName").value(authorization.toString());
-//				// Roles
-//				jsonWriter.name("roles").beginArray();
-//				for (String role : authorization.getRoles())
-//					if (!role.equals(authorization.getName()))
-//						jsonWriter.value(role);
-//				jsonWriter.endArray();
-//				// CMS session
-//				jsonWriter.name("cmsSession").beginObject();
-//				jsonWriter.name("uuid").value(cmsSessionId.getUuid().toString());
-//				jsonWriter.endObject();
-//
-//				// extensions
-//				enrichJson(jsonWriter);
-//
-//				jsonWriter.endObject();
-
 			String redirectTo = redirectTo(request);
 			if (redirectTo != null)
 				response.sendRedirect(redirectTo);