Author: julien_viet Date: 2010-07-23 04:16:26 -0400 (Fri, 23 Jul 2010) New Revision: 3691 Removed: portal/trunk/component/web/src/main/java/org/exoplatform/json/ portal/trunk/component/web/src/test/java/org/exoplatform/json/ portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/GetApplicationHandler.java portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/HelloJCRHandler.java Modified: portal/trunk/component/web/src/main/java/conf/portal/configuration.xml Log: remove legacy JSON to bean mapper Modified: portal/trunk/component/web/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/trunk/component/web/src/main/java/conf/portal/configuration.xml 2010-07-23 07:43:11 UTC (rev 3690) +++ portal/trunk/component/web/src/main/java/conf/portal/configuration.xml 2010-07-23 08:16:26 UTC (rev 3691) @@ -25,10 +25,6 @@ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> <component> - <type>org.exoplatform.json.JSONService</type> - </component> - - <component> <type>org.exoplatform.upload.UploadService</type> <init-params> <value-param> Deleted: portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/GetApplicationHandler.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/GetApplicationHandler.java 2010-07-23 07:43:11 UTC (rev 3690) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/GetApplicationHandler.java 2010-07-23 08:16:26 UTC (rev 3691) @@ -1,169 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.command.handler; - -import org.exoplatform.application.registry.Application; -import org.exoplatform.application.registry.ApplicationCategory; -import org.exoplatform.application.registry.ApplicationRegistryService; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; -import org.exoplatform.json.BeanToJSONPlugin; -import org.exoplatform.json.JSONService; -import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.web.WebAppController; -import org.exoplatform.web.command.Command; - -import java.io.IOException; -import java.io.Writer; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * Created by The eXo Platform SARL - * Author : Nhu Dinh Thuan - * nhudinhthuan(a)exoplatform.com - * May 31, 2007 - */ -public class GetApplicationHandler extends Command -{ - - private ApplicationType<?>[] applicationType; - - public void setApplicationTypes(ApplicationType<?>[] type) - { - applicationType = type; - } - - @SuppressWarnings("unused") - public void execute(WebAppController controller, HttpServletRequest req, HttpServletResponse res) throws Exception - { - res.setHeader("Cache-Control", "no-cache"); - Writer writer = res.getWriter(); - try - { - writer.append(getApplications(req.getRemoteUser())); - } - catch (Exception e) - { - e.printStackTrace(); - throw new IOException(e.getMessage()); - } - } - - @SuppressWarnings("unchecked") - private StringBuilder getApplications(String remoteUser) throws Exception - { - ExoContainer container = ExoContainerContext.getCurrentContainer(); - ApplicationRegistryService prService = - (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class); - - if (applicationType == null) - applicationType = new ApplicationType<?>[0]; - List<ApplicationCategory> appCategories = prService.getApplicationCategories(remoteUser, applicationType); - ApplicationCategoryToJSONPlugin toJSON = new ApplicationCategoryToJSONPlugin(); - - StringBuilder value = new StringBuilder(); - JSONService jsonService = new JSONService(); - jsonService.register(ApplicationCategory.class, toJSON); - - if (appCategories.size() < 1) - return value; - - value.append("{\n").append(" applicationRegistry : {\n"); - for (int i = 0; i < appCategories.size(); i++) - { - ApplicationCategory category = appCategories.get(i); - jsonService.toJSONScript(category, value, 1); - if (i < appCategories.size() - 1) - value.append(" ,\n"); - } - value.append(" }\n").append("}\n"); - - return value; - } - - private class ApplicationCategoryToJSONPlugin extends BeanToJSONPlugin<ApplicationCategory> - { - - @SuppressWarnings("unchecked") - public void toJSONScript(ApplicationCategory category, StringBuilder builder, int indentLevel) throws Exception - { - StringBuilder builderPortlet = toJSONScript(category, indentLevel + 2); - if (builderPortlet.length() < 1) - return; - - appendIndentation(builder, indentLevel); - builder.append('\'').append(category.getName()).append("' : {\n"); - appendIndentation(builder, indentLevel + 1); - builder.append("'name' : '").append(category.getDisplayName()).append("',\n"); - appendIndentation(builder, indentLevel + 1); - builder.append("'applications' : {\n"); - builder.append(builderPortlet); - appendIndentation(builder, indentLevel + 1); - builder.append("}\n"); - appendIndentation(builder, indentLevel); - builder.append("}\n"); - } - - @SuppressWarnings("unchecked") - private StringBuilder toJSONScript(ApplicationCategory category, int indentLevel) throws Exception - { - StringBuilder builder = new StringBuilder(); - List<Application> applications = category.getApplications(); - - for (int j = 0; j < applications.size(); j++) - { - toJSONScript(applications.get(j), builder, indentLevel); - if (j < applications.size() - 1) - { - appendIndentation(builder, indentLevel); - builder.append(",\n"); - } - } - - return builder; - } - - private void toJSONScript(Application application, StringBuilder builder, int indentLevel) - { - appendIndentation(builder, indentLevel); - builder.append('\'').append(application.getId()).append("' : {\n"); - appendIndentation(builder, indentLevel + 1); - //TODO: Tung.Pham modified - //---------------------------- - //builder.append("'title' : ").append("'").append(application.getApplicationName()).append("',\n"); - builder.append("'name' : ").append("'").append(application.getApplicationName()).append("',\n"); - appendIndentation(builder, indentLevel + 1); - builder.append("'title' : ").append("'").append(application.getDisplayName()).append("',\n"); - //------------------------------ - appendIndentation(builder, indentLevel + 1); - builder.append("'des' : ").append("'").append(application.getDescription()).append("',\n"); - appendIndentation(builder, indentLevel + 1); - builder.append("'id' : ").append("'").append(application.getId()).append("',\n"); - appendIndentation(builder, indentLevel + 1); - builder.append("'type' : ").append("'").append(application.getType()).append("'\n"); - appendIndentation(builder, indentLevel); - builder.append("}\n"); - } - } - -} Deleted: portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/HelloJCRHandler.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/HelloJCRHandler.java 2010-07-23 07:43:11 UTC (rev 3690) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/web/command/handler/HelloJCRHandler.java 2010-07-23 08:16:26 UTC (rev 3691) @@ -1,46 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.command.handler; - -import org.exoplatform.web.WebAppController; -import org.exoplatform.web.command.Command; - -import java.io.PrintWriter; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * Created by The eXo Platform SARL - * Author : Nguyen Ba Uoc - * thuy.le(a)exoplatform.com - * July 24, 2007 - */ -public class HelloJCRHandler extends Command -{ - - public void execute(WebAppController controller, HttpServletRequest req, HttpServletResponse res) throws Exception - { - res.setContentType("text/xml"); - PrintWriter out = res.getWriter(); - out.println("Hello from server"); - System.out.println("Client request"); - } -} \ No newline at end of file