Author: vjrj Date: 2009-09-12 17:04:00 +0200 (Sat, 12 Sep 2009) New Revision: 1143 Modified: trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveInterceptorModule.java trunk/src/main/resources/kune.properties Log: Incomplete - task wave server integration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-31 16:10:13 UTC (rev 1142) +++ trunk/pom.xml 2009-09-12 15:04:00 UTC (rev 1143) @@ -345,7 +345,7 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>kune-wave-server</artifactId> - <version>0.0.2</version> + <version>0.0.2.1</version> </dependency> <dependency> <groupId>commons-cli</groupId> Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-08-31 16:10:13 UTC (rev 1142) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-09-12 15:04:00 UTC (rev 1143) @@ -82,6 +82,7 @@ if (sessionScope != null) { bindScope(SessionScoped.class, sessionScope); } + bind(WavePropertiesParser.class).asEagerSingleton(); } }; } Modified: trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveInterceptorModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveInterceptorModule.java 2009-08-31 16:10:13 UTC (rev 1142) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveInterceptorModule.java 2009-09-12 15:04:00 UTC (rev 1143) @@ -5,6 +5,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.waveprotocol.wave.examples.fedone.waveserver.WaveClientRpcImpl; +import org.waveprotocol.wave.examples.fedone.waveserver.WaveServerModule; +import org.waveprotocol.wave.examples.fedone.waveserver.WaveClientRpc.ProtocolOpenRequest; import com.google.inject.AbstractModule; import com.google.inject.matcher.Matchers; @@ -15,7 +17,13 @@ } public Object invoke(final MethodInvocation invocation) throws Throwable { - LOG.info("Wave method intercepted: " + invocation.getMethod().toString()); + if (invocation.getMethod().getName().equals("open")) { + final ProtocolOpenRequest openRequest = (ProtocolOpenRequest) (invocation.getArguments()[1]); + LOG.info("Wave open method intercepted of: " + openRequest.getParticipantId()); + } + if (invocation.getMethod().getName().equals("create")) { + LOG.info("Wave create method intercepted"); + } return invocation.proceed(); } } @@ -24,7 +32,11 @@ @Override protected void configure() { - bindInterceptor(Matchers.identicalTo(WaveClientRpcImpl.class), Matchers.any(), new WaveInterceptor()); + // WaveClientRpcImpl.class.getMethod("open", RpcController.class, + // ProtocolOpenRequest.class, RpcCallback<ProtocolWaveletUpdate>.class) + // new WaveClientRpcImpl(null).open(null, null, null) + final WaveInterceptor waveInterceptor = new WaveInterceptor(); + bindInterceptor(Matchers.identicalTo(WaveClientRpcImpl.class), Matchers.any(), waveInterceptor); + bindInterceptor(Matchers.identicalTo(WaveServerModule.class), Matchers.any(), waveInterceptor); } - } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-08-31 16:10:13 UTC (rev 1142) +++ trunk/src/main/resources/kune.properties 2009-09-12 15:04:00 UTC (rev 1143) @@ -70,7 +70,8 @@ kune.wave.certificate_private_key = war/WEB-INF/localhost.key kune.wave.certificate_files = war/WEB-INF/localhost.cer kune.wave.certificate_domain = localhost -kune.wave.waveserver_disable_verification = true +kune.wave.waveserver_disable_verification = false +kune.wave.waveserver_disable_signer_verification = true ### More info about properties # http://en.wikipedia.org/wiki/.properties