Revision: 4060
Author: solomax666
Date: Sun Aug 14 18:39:18 2011
Log: - dummy test seems to work as expected
http://code.google.com/p/openmeetings/source/detail?r=4060
Modified:
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
/branches/dev/injection/WebContent/WEB-INF/red5-web.xml
/branches/dev/injection/src/test/org/openmeetings/test/adresses/TestAddEmailToAdress.java
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 14 12:12:21 2011
+++
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 14 18:39:18 2011
@@ -115,7 +115,38 @@
</property>
</bean>
-
+ <!-- New Class for the Streaming Handlers -->
+ <bean id="web.handler"
class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter"/>
+ <bean id="openmeetings.ClientListManager"
class="org.openmeetings.app.remote.red5.ClientListManager" />
+ <bean id="openmeetings.EmoticonsManager"
class="org.openmeetings.app.remote.red5.EmoticonsManager" />
+ <bean id="openmeetings.WhiteBoardObjectListManager"
class="org.openmeetings.app.remote.red5.WhiteBoardObjectListManager" />
+ <bean id="openmeetings.WhiteBoardObjectListManagerById"
class="org.openmeetings.app.remote.red5.WhiteBoardObjectListManagerById" />
+
+ <!-- Services -->
+ <import
resource="red5-services/appointmentcategoryservice.service.xml"/>
+ <import
resource="red5-services/appointmentreminderservice.service.xml"/>
+ <import resource="red5-services/calendarservice.service.xml"/>
+ <import resource="red5-services/meetingmemberservice.service.xml"/>
+ <import resource="red5-services/fileservice.service.xml"/>
+ <import resource="red5-services/conferenceservice.service.xml"/>
+ <import resource="red5-services/userservice.service.xml"/>
+ <import resource="red5-services/organisationservice.service.xml"/>
+ <import resource="red5-services/configservice.service.xml"/>
+ <import resource="red5-services/errorservice.service.xml"/>
+ <import resource="red5-services/pollservice.service.xml"/>
+ <import resource="red5-services/xmlcrm.service.xml"/>
+ <import resource="red5-services/languageservice.service.xml"/>
+ <import resource="red5-services/chatservice.service.xml"/>
+ <import resource="red5-services/streamservice.service.xml"/>
+ <import resource="red5-services/invitationservice.service.xml"/>
+ <import resource="red5-services/whiteboardservice.service.xml"/>
+ <import resource="red5-services/printservice.service.xml"/>
+ <import resource="red5-services/flvrecorderservice.service.xml"/>
+ <import resource="red5-services/ldapconfigservice.service.xml"/>
+
+ <!-- Scheduled tasks -->
+ <import resource="red5-services/schedulerJobs.service.xml"/>
+
<!-- Interface Transactional -->
<bean id="appointmentReminderTypDaoImpl"
class="org.openmeetings.app.data.calendar.daos.AppointmentReminderTypDaoImpl"
/>
<bean id="appointmentCategoryDaoImpl"
class="org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl"
/>
=======================================
--- /branches/dev/injection/WebContent/WEB-INF/red5-web.xml Sun Aug 14
12:12:21 2011
+++ /branches/dev/injection/WebContent/WEB-INF/red5-web.xml Sun Aug 14
18:39:18 2011
@@ -17,42 +17,5 @@
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
- <!-- New Class for the Streaming Handlers -->
- <bean id="web.handler"
class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter"/>
- <bean id="openmeetings.ClientListManager"
class="org.openmeetings.app.remote.red5.ClientListManager" />
- <bean id="openmeetings.EmoticonsManager"
class="org.openmeetings.app.remote.red5.EmoticonsManager" />
- <bean id="openmeetings.WhiteBoardObjectListManager"
class="org.openmeetings.app.remote.red5.WhiteBoardObjectListManager" />
- <bean id="openmeetings.WhiteBoardObjectListManagerById"
class="org.openmeetings.app.remote.red5.WhiteBoardObjectListManagerById" />
-
- <!-- DATABASE Connection via hibernate
- <bean id="theSessionFactory"
class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
- <property name="configLocation"
- value="conf/hibernate.cfg.xml"/>
- </bean>
- -->
-
<import resource="openmeetings-applicationContext.xml" />
- <import
resource="red5-services/appointmentcategoryservice.service.xml"/>
- <import
resource="red5-services/appointmentreminderservice.service.xml"/>
- <import resource="red5-services/calendarservice.service.xml"/>
- <import resource="red5-services/meetingmemberservice.service.xml"/>
- <import resource="red5-services/fileservice.service.xml"/>
- <import resource="red5-services/conferenceservice.service.xml"/>
- <import resource="red5-services/userservice.service.xml"/>
- <import resource="red5-services/organisationservice.service.xml"/>
- <import resource="red5-services/configservice.service.xml"/>
- <import resource="red5-services/errorservice.service.xml"/>
- <import resource="red5-services/pollservice.service.xml"/>
- <import resource="red5-services/xmlcrm.service.xml"/>
- <import resource="red5-services/languageservice.service.xml"/>
- <import resource="red5-services/chatservice.service.xml"/>
- <import resource="red5-services/streamservice.service.xml"/>
- <import resource="red5-services/invitationservice.service.xml"/>
- <import resource="red5-services/whiteboardservice.service.xml"/>
- <import resource="red5-services/printservice.service.xml"/>
- <import resource="red5-services/flvrecorderservice.service.xml"/>
- <import resource="red5-services/ldapconfigservice.service.xml"/>
-
- <import resource="red5-services/schedulerJobs.service.xml"/>
-
</beans>
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/adresses/TestAddEmailToAdress.java
Sun Aug 14 12:12:21 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/adresses/TestAddEmailToAdress.java
Sun Aug 14 18:39:18 2011
@@ -10,7 +10,7 @@
@RunWith(SpringJUnit4ClassRunner.class)
@TestExecutionListeners({})
-@ContextConfiguration(locations={"classpath:/red5-common.xml",
"classpath:/red5-web.xml"})
+@ContextConfiguration(locations={"classpath:/openmeetings-applicationContext.xml"})
public class TestAddEmailToAdress extends AbstractJUnit4SpringContextTests
{
private static final Logger log =
Logger.getLogger(TestAddEmailToAdress.class);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
