Author: ymartel Date: 2012-06-04 17:52:06 +0200 (Mon, 04 Jun 2012) New Revision: 174 Url: http://chorem.org/repositories/revision/chorem/174 Log: Migrate to webmotion 2.2 Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java trunk/chorem-webmotion/src/main/resources/mapping trunk/pom.xml Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java 2012-06-04 05:08:40 UTC (rev 173) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java 2012-06-04 15:52:06 UTC (rev 174) @@ -1,8 +1,6 @@ package org.chorem.webmotion.filters; -import java.lang.reflect.Method; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; @@ -11,6 +9,9 @@ import org.debux.webmotion.server.call.Executor; import org.debux.webmotion.server.mapping.Mapping; +import java.lang.reflect.Method; +import java.util.Map; + /** * Inject dans les parametres des actions le client wikitty a utiliser pour les * actions (ChoremClient) @@ -20,6 +21,8 @@ * * Last update: $Date$ * by : $Author$ + * + * @deprecated filter has been replaced by {@link org.chorem.webmotion.injector.InjectorListener} */ public class ChoremClientFilter extends WebMotionFilter { Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2012-06-04 15:52:06 UTC (rev 174) @@ -0,0 +1,40 @@ +package org.chorem.webmotion.injector; + +import org.chorem.ChoremClient; +import org.debux.webmotion.server.WebMotionServerListener; +import org.debux.webmotion.server.call.Call; +import org.debux.webmotion.server.call.ServerContext; +import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler.Injector; +import org.debux.webmotion.server.mapping.Mapping; + +import java.lang.reflect.Type; + +/** + * @author ymartel <martel@codelutin.com> + */ +public class InjectorListener implements WebMotionServerListener { + + @Override + public void onStart(ServerContext context) { + // Get Client + String token = ""; + final ChoremClient client = ChoremClient.getClient(null); + + // Declare injector + context.addInjector(new Injector() { + @Override + public Object getValue(Mapping mapping, Call call, Class<?> type, Type generic) { + if (ChoremClient.class.isAssignableFrom(type)) { + return client; + } + return null; + } + }); + } + + @Override + public void onStop(ServerContext context) { + // Do nothing + } + +} Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2012-06-04 05:08:40 UTC (rev 173) +++ trunk/chorem-webmotion/src/main/resources/mapping 2012-06-04 15:52:06 UTC (rev 174) @@ -2,9 +2,10 @@ package.views=WEB-INF/jsp package.filters=org.chorem.webmotion.filters package.actions=org.chorem.webmotion.actions +server.listener.class=org.chorem.webmotion.injector.InjectorListener [filters] -* /* ChoremClientFilter.inject +#* /* ChoremClientFilter.inject #GET /wikitty/{extension}/view/{id} DecoratorFilter.decorate slotEntityFooter={extension}Footer.jsp * /wikitty-json/* DecoratorFilter.decorate wmDecoratorNo=true * /fragment/* DecoratorFilter.decorate wmDecoratorNo=true @@ -22,7 +23,7 @@ * /wikitty/edit/{id} action:GenericAction.edit * /wikitty/delete/{id} action:GenericAction.delete * /wikitty/save action:GenericAction.save -* /wikitty/view/{id}/{extension}/{field} action:GenericAction.download +* /wikitty/view/{id}/{extension}/{field} action:GenericAction.download wmDecoratorNo=true * /wikitty-json/searchField?q={query} action:GenericAction.searchFieldJson * /wikitty-json/search?q={query} action:GenericAction.searchJson * /wikitty-json/search?term={query} action:GenericAction.searchJson Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-04 05:08:40 UTC (rev 173) +++ trunk/pom.xml 2012-06-04 15:52:06 UTC (rev 174) @@ -107,7 +107,7 @@ <servletApiVersion>2.5</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> <h2Version>1.2.134</h2Version> - <webmotionVersion>2.1</webmotionVersion> + <webmotionVersion>2.2</webmotionVersion> <jstlVersion>1.2</jstlVersion> <!-- license to use -->