[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Transactional Client was last edited by davsclaus (11:39 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Transactional+Client |-- Error handling in Camel was last edited by davsclaus (11:34 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Error+handling+in+Camel Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- 5.5.2 Change Password in ApacheDS 1.5.5 was created by ck (03:39 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/5.5.2+Change+Password+in+ApacheDS+1.5.5 |-- 5.4.3 Kerberos in ApacheDS 1.5.5 was created by ck (02:42 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/5.4.3+Kerberos+in+ApacheDS+1.5.5 Apache Sling Website (SLINGxSITE) http://cwiki.apache.org/confluence/display/SLINGxSITE | |-Pages Added or Edited in This Space |-- Advanced Topics was last edited by fmeschbe (02:15 PM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Advanced+Topics |-- Provisioning and Startup was last edited by fmeschbe (02:13 PM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Provisioning+and+Startup |-- Architecture was last edited by fmeschbe (02:11 PM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Architecture |-- Documentation was last edited by fmeschbe (02:00 PM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Documentation |-- Getting and Building Sling was last edited by fmeschbe (11:58 AM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Getting+and+Building+Sling Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Apache Geronimo Board Report - 2009-04 - April was last edited by kevan (06:47 AM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Apache+Geronimo+Board+Report+-+2009-04+-+April Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- Database Support was last edited by ari (04:36 PM). | http://cwiki.apache.org/confluence/display/CAYDOC/Database+Support Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- Committers was last edited by lrese...@apache.org (05:43 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Committers Apache Ki (KI) http://cwiki.apache.org/confluence/display/KI | |-Pages Added or Edited in This Space |-- Features Overview was last edited by lhazlewood (12:06 PM). | http://cwiki.apache.org/confluence/display/KI/Features+Overview Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- news was last edited by clement.escoffier (01:35 AM). | http://cwiki.apache.org/confluence/display/FELIX/news |-- downloads was last edited by clement.escoffier (01:34 AM). | http://cwiki.apache.org/confluence/display/FELIX/downloads Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- Apache ActiveMQ Board Report - January 2009 was last edited by chirino (06:04 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Apache+ActiveMQ+Board+Report+-+January+2009 |-- Apache ActiveMQ Board Report - April 2009 was created by chirino (04:30 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Apache+ActiveMQ+Board+Report+-+April+2009 Apache Stonehenge (STONEHENGE) http://cwiki.apache.org/confluence/display/STONEHENGE | |-Pages Added or Edited in This Space |-- Stonehenge .NET StockTrader Installation Guide was last edited by abub (02:53 PM). | http://cwiki.apache.org/confluence/display/STONEHENGE/Stonehenge+.NET+StockTrader+Installation+Guide Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Conformance Testing was last edited by kujun...@gmail.com (12:46 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Conformance+Testing Apache Directory Development (DIRxDEV) http://cwiki.apache.org/confluence/display/DIRxDEV | |-Pages Added or Edited in This Space |-- Exporting a Confluence space as a Website was last edited by pamarcelot (03:44 PM). | http://cwiki.apache.org/confluence/display/DIRxDEV/Exporting+a+Confluence+space+as+a+Website Apache Buildr (BUILDR) http://cwiki.apache.org/confluence/display/BUILDR | |-Pages Added or Edited in This Space |-- How to explode a .wa
svn commit: r764839 - in /struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor: OsgiInterceptorTest.java SomeAction.java
Author: musachy
Date: Tue Apr 14 15:46:42 2009
New Revision: 764839
URL: http://svn.apache.org/viewvc?rev=764839&view=rev
Log:
Add a couple of tests
Added:
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/SomeAction.java
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java?rev=764839&r1=764838&r2=764839&view=diff
==
---
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java
(original)
+++
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java
Tue Apr 14 15:46:42 2009
@@ -3,12 +3,15 @@
import org.easymock.EasyMock;
import org.apache.struts2.osgi.OsgiHost;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import javax.servlet.ServletContext;
import com.opensymphony.xwork2.ActionInvocation;
import junit.framework.TestCase;
+import java.util.List;
+
public class OsgiInterceptorTest extends TestCase {
public void testBundleContextAware() throws Exception {
ServletContext servletContext =
EasyMock.createStrictMock(ServletContext.class);
@@ -50,4 +53,33 @@
EasyMock.verify(bundleContextAware);
}
+
+public void testServiceAware() throws Exception {
+ServletContext servletContext =
EasyMock.createStrictMock(ServletContext.class);
+BundleContext bundleContext =
EasyMock.createStrictMock(BundleContext.class);
+ActionInvocation actionInvocation =
EasyMock.createStrictMock(ActionInvocation.class);
+SomeAction someAction = new SomeAction();
+
+//service refs
+ServiceReference objectRef =
EasyMock.createNiceMock(ServiceReference.class);
+Object someObject = new Object();
+
+
EasyMock.expect(servletContext.getAttribute(OsgiHost.OSGI_BUNDLE_CONTEXT)).andReturn(bundleContext);
+EasyMock.expect(actionInvocation.getAction()).andReturn(someAction);
+EasyMock.expect(actionInvocation.invoke()).andReturn("");
+
EasyMock.expect(bundleContext.getAllServiceReferences(Object.class.getName(),
null)).andReturn(new ServiceReference[] {objectRef});
+
EasyMock.expect(bundleContext.getService(objectRef)).andReturn(someObject);
+
+EasyMock.replay(bundleContext);
+EasyMock.replay(servletContext);
+EasyMock.replay(actionInvocation);
+
+OsgiInterceptor osgiInterceptor = new OsgiInterceptor();
+osgiInterceptor.setServletContext(servletContext);
+osgiInterceptor.intercept(actionInvocation);
+
+List objects = someAction.getServices();
+assertNotNull(objects);
+assertSame(someObject, objects.get(0));
+}
}
Added:
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/SomeAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/SomeAction.java?rev=764839&view=auto
==
---
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/SomeAction.java
(added)
+++
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/interceptor/SomeAction.java
Tue Apr 14 15:46:42 2009
@@ -0,0 +1,36 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.osgi.interceptor;
+
+import java.util.List;
+
+public class SomeAction implements ServiceAware {
+private List services;
+
+
+public List getServices() {
+return services;
+}
+
+public void setServices(List services) {
+thi
