Author: mfortun Date: 2011-05-18 16:25:50 +0200 (Wed, 18 May 2011) New Revision: 902 Url: http://nuiton.org/repositories/revision/wikitty/902 Log: * add light properties that only instanciate client service * remove unused import in jsp * multicontext bug correction Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-18 14:25:50 UTC (rev 902) @@ -80,7 +80,7 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), - "wikitty-publication-ws-fallback.properties", String.class, false, false); + "wikitty-publication-ws-lightfallback.properties", String.class, false, false); @@ -144,10 +144,11 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), - "wikitty-publication-ws-default.properties", String.class, false, false); + "wikitty-publication-ws-light.properties", String.class, false, false); + //wikitty-publication-ws-light.properties + //wikitty-publication-ws-default.properties - public final String key; public final String description; public String defaultValue; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 14:25:50 UTC (rev 902) @@ -67,6 +67,7 @@ .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); + WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws, configFallBack, fallservice); result.setSecurityToken(token); @@ -101,6 +102,7 @@ if (serviceFallback == null) { serviceFallback = WikittyServiceFactory .buildWikittyService(config); + } } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-18 14:25:50 UTC (rev 902) @@ -25,6 +25,8 @@ protected WikittyUser user; public WikittyPublicationSession() { + //proxy = WikittyPublicationProxy.getInstance(null); + //proxy = WikittyPublicationProxy.getInstanceWithFallback(null); proxy = WikittyPublicationProxy.getInstanceWithFallback(null); } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-18 14:25:50 UTC (rev 902) @@ -70,7 +70,7 @@ </action> </package> - <!-- Action aviable only to logged user --> + <!-- Action aviable only to logged user extends="restrictedArea"--> <package name="publication" extends="restrictedArea"> <action name="*/edit/*" Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-18 14:25:50 UTC (rev 902) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resourc... $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# This program 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 3 of the +# License, or (at your option) any later version. +# +# This program 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 General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + + +wikitty.service.server.url=http://localhost:2222/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-18 14:25:50 UTC (rev 902) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resourc... $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# This program 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 3 of the +# License, or (at your option) any later version. +# +# This program 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 General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + + +wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-18 14:25:50 UTC (rev 902) @@ -29,17 +29,15 @@ --%> <%@page import="org.nuiton.wikitty.publication.action.PublicationActionEdit"%> -<%@page import="org.nuiton.wikitty.publication.ActionEval"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.FieldType"%> <%@page import="java.util.Collection"%> <%@page import="org.nuiton.wikitty.WikittyProxy"%> <%@page import="org.nuiton.wikitty.WikittyService"%> <%@page import="org.nuiton.wikitty.entities.WikittyExtension"%> -<%@page import="org.nuiton.wikitty.publication.ActionEdit"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@page import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> + <% PublicationActionEdit action = PublicationActionEdit.getAction(); Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-18 14:25:50 UTC (rev 902) @@ -36,10 +36,6 @@ <%@page import="org.nuiton.wikitty.search.Search"%> <%@page import="org.nuiton.wikitty.publication.WikittyPublicationSession"%> -<%@page import="org.nuiton.wikitty.publication.ActionEval"%> -<%@page import="org.nuiton.wikitty.publication.ActionEdit"%> -<%@page - import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -96,7 +92,7 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:url var="editlink" action="/wiki/edit"> + <td><s:url var="editlink" action="wiki/edit"> <s:param name="id"><%=w.getId()%></s:param> </s:url> <s:a href="%{editlink}" id="regenPermToken"> <s:text name="edit" />