[portal-commits] JBoss Portal SVN: r7371 - in trunk/wsrp: src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2007-06-01 17:54:37 -0400 (Fri, 01 Jun 2007)
New Revision: 7371
Modified:
trunk/wsrp/build.xml
trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml
Log:
More work on ConsumerRegistryTestCase: (still not working, now failing to get a JTA
transaction, probably need to look into AOP for that):
- Added necessary dependencies for ConsumerRegistryTestCase.
- Fixed bean injections in ConsumerRegistryService.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-06-01 21:46:43 UTC (rev 7370)
+++ trunk/wsrp/build.xml 2007-06-01 21:54:37 UTC (rev 7371)
@@ -781,11 +781,20 @@
<sysproperty key="test.root"
value="${build.lib}/tests"/>
</x-sysproperty>
<x-classpath>
- <fileset dir="${build.lib}"
includes="portal-wsrp-lib.jar"/>
- <fileset dir="${build.lib.test}"
includes="test-consumer-lib.jar"/>
+ <pathelement location="${build.lib}/portal-wsrp.sar"/>
+ <!-- Access to conf/consumer/hibernate/domain.hbm.xml -->
+ <pathelement location="${build.lib}/portal-wsrp-lib.jar"/>
+ <pathelement
location="${build.lib.test}/test-consumer-lib.jar"/>
<pathelement location="${jboss.portal-test.root}/etc"/>
<!-- Needed to access datasources.xml -->
<path refid="jboss.microcontainer.classpath"/>
+
+ <!-- Required for test framework -->
+ <path refid="apache.collections.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="aop.classpath"/>
+ <path refid="asm.asm.classpath"/>
+
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
<path refid="ws.classpath"/>
Modified:
trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml
===================================================================
---
trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml 2007-06-01
21:46:43 UTC (rev 7370)
+++
trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml 2007-06-01
21:54:37 UTC (rev 7371)
@@ -74,12 +74,8 @@
<bean name="ConsumerRegistry"
class="org.jboss.portal.wsrp.consumer.ConsumerRegistryService">
<property
name="sessionFactoryJNDIName">java:/SessionFactory</property>
- <property name="federatingPortletInvoker">
- <inject bean="FederatingPortletInvoker"
property="federatingPortletInvoker"/>
- </property>
- <property name="portalEventListenerRegistry">
- <inject bean="PortalEventListenerRegistry"
property="portalEventListenerRegistry"/>
- </property>
+ <property name="federatingPortletInvoker"><inject
bean="FederatingPortletInvoker"/></property>
+ <property name="portalEventListenerRegistry"><inject
bean="PortalEventListenerRegistry"/></property>
</bean>
<bean name="TestBean"
class="org.jboss.portal.test.wsrp.consumer.ConsumerRegistryTestCase">