svn commit: r1376970 [2/2] - in /rave/branches/model-split: ./ rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ rave-components/rave-core/src/main/java/org/...

[mf...@apache.org]

Modified: rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml?rev=1376970&r1=1376969&r2=1376970&view=diff
==============================================================================
--- rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml (original)
+++ rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml Fri Aug 24 15:51:11 2012
@@ -19,11 +19,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
     <!-- make the the rave.shindig.properties props available to autowire injectors, location of the properties can
      be overridden by setting a system property "rave-shindig.override.properties" -->
@@ -33,6 +33,23 @@
         <property name="location" value="classpath:rave.shindig.properties"/>
     </bean>
 
+    <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean" name="propertyInjector" autowire-candidate="false" id="propertyInjector">
+        <property name="targetObject">
+            <!-- System.getProperties() -->
+            <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+                <property name="targetClass" value="java.lang.System" />
+                <property name="targetMethod" value="getProperties" />
+            </bean>
+        </property>
+        <property name="targetMethod" value="putAll" />
+        <property name="arguments">
+            <!-- The new Properties -->
+            <util:properties>
+                <prop key="shindig.spring.base-package">org.apache.rave:org.apache.log4j</prop>
+            </util:properties>
+        </property>
+    </bean>
+
     <!-- bean post-processor for JPA annotations -->
     <context:annotation-config/>
 
@@ -50,6 +67,24 @@
         <constructor-arg value="org.apache.rave.opensocial.repository.OpenSocialPersonRepository"/>
     </bean>
 
+    <bean id="mockLockService" class="org.easymock.EasyMock" factory-method="createNiceMock"  primary="true">
+        <constructor-arg value="org.apache.rave.service.LockService"/>
+    </bean>
+
+    <bean id="lockService" class="org.apache.rave.service.impl.DefaultLockService" />
+
+    <bean id="mockGroupService" class="org.easymock.EasyMock" factory-method="createNiceMock">
+        <constructor-arg value="org.apache.shindig.social.opensocial.spi.GroupService"/>
+    </bean>
+
+    <bean id="nonRaveBean" class="org.apache.log4j.spi.NOPLoggerRepository" />
+
+    <bean id="mockSpringBean" class="org.easymock.EasyMock" factory-method="createNiceMock">
+        <constructor-arg value="org.springframework.jdbc.core.ResultSetExtractor"/>
+    </bean>
+
+    <bean id="groupService" class="org.apache.rave.opensocial.service.impl.DefaultGroupService" />
+
     <bean id="personService" class="org.apache.rave.opensocial.service.impl.DefaultPersonService">
         <constructor-arg name="repository" ref="mockPersonRepo" />
     </bean>