Revision: 4156
Author:   solomax666
Date:     Wed Aug 31 10:02:46 2011
Log:      - UploadHandler servlet was not working (invalid bean name)
- ServletContextAttributeExporter was removed from config since it is not used anymore
http://code.google.com/p/openmeetings/source/detail?r=4156

Modified:
 /trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java

=======================================
--- /trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Wed Aug 31 10:02:46 2011
@@ -19,117 +19,6 @@
<bean id="jpaTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
                <property name="entityManagerFactory" ref="entityManagerFactory" 
/>
        </bean>
-
- <bean class="org.springframework.web.context.support.ServletContextAttributeExporter">
-               <property name="attributes">
-                       <map>
-                               <entry key="cfgManagement">
-                                       <ref bean="cfgManagement"/>
-                               </entry>
-                               <entry key="sessionManagement">
-                                       <ref bean="sessionManagement"/>
-                               </entry>
-                               <entry key="userManagement">
-                                       <ref bean="userManagement"/>
-                               </entry>
-                               <entry key="fieldmanagment">
-                                       <ref bean="fieldmanagment"/>
-                               </entry>
-                               <entry key="appointmentDao">
-                                       <ref bean="appointmentDao"/>
-                               </entry>
-                               <entry key="organisationmanagement">
-                                       <ref bean="organisationmanagement"/>
-                               </entry>
-                               <entry key="roommanagement">
-                                       <ref bean="roommanagement"/>
-                               </entry>
-                               <entry key="fileExplorerItemDao">
-                                       <ref bean="fileExplorerItemDao"/>
-                               </entry>
-                               <entry key="flvRecordingDao">
-                                       <ref bean="flvRecordingDao"/>
-                               </entry>
-                               <entry key="flvRecordingMetaDataDao">
-                                       <ref bean="flvRecordingMetaDataDao"/>
-                               </entry>
-                               <entry key="roomModeratorsDao">
-                                       <ref bean="roomModeratorsDao"/>
-                               </entry>
-                               <entry key="usersDao">
-                                       <ref bean="usersDao"/>
-                               </entry>
-                               <entry key="meetingMemberDao">
-                                       <ref bean="meetingMemberDao"/>
-                               </entry>
-                               <entry key="ldapConfigDao">
-                                       <ref bean="ldapConfigDao"/>
-                               </entry>
-                               <entry key="privateMessagesDao">
-                                       <ref bean="privateMessagesDao"/>
-                               </entry>
-                               <entry key="privateMessageFolderDao">
-                                       <ref bean="privateMessageFolderDao"/>
-                               </entry>
-                               <entry key="userContactsDao">
-                                       <ref bean="userContactsDao"/>
-                               </entry>
-                               <entry key="statemanagement">
-                                       <ref bean="statemanagement"/>
-                               </entry>
-                               <entry key="omTimeZoneDaoImpl">
-                                       <ref bean="omTimeZoneDaoImpl"/>
-                               </entry>
-                               <entry key="appointmentCategoryDaoImpl">
-                                       <ref bean="appointmentCategoryDaoImpl"/>
-                               </entry>
-                               <entry key="appointmentReminderTypDaoImpl">
-                                       <ref 
bean="appointmentReminderTypDaoImpl"/>
-                               </entry>
-                               <entry key="appointmentLogic">
-                                       <ref bean="appointmentLogic"/>
-                               </entry>
-                               <entry key="fieldLanguageDaoImpl">
-                                       <ref bean="fieldLanguageDaoImpl"/>
-                               </entry>
-                               <entry key="scopeApplicationAdapter">
-                                       <ref bean="web.handler"/>
-                               </entry>
-                               <entry key="mainService">
-                                       <ref bean="xmlcrm.service"/>
-                               </entry>
-                               <entry key="generateImage">
-                                       <ref bean="generateImage"/>
-                               </entry>
-                               <entry key="generateThumbs">
-                                       <ref bean="generateThumbs"/>
-                               </entry>
-                               <entry key="generatePDF">
-                                       <ref bean="generatePDF"/>
-                               </entry>
-                               <entry key="importInitvalues">
-                    <ref bean="importInitvalues"/>
-                </entry>
-                               <entry key="authLevelManagement">
-                    <ref bean="authLevelManagement"/>
-                </entry>
-                               <entry key="fileProcessor">
-                    <ref bean="openmeetings.FileProcessor"/>
-                </entry>
-                               <entry key="clientListManager">
-                    <ref bean="openmeetings.ClientListManager"/>
-                </entry>
-                               <entry key="rtpStreamingHandler">
-                    <ref bean="rtpStreamingHandler"/>
-                </entry>
-                <!--
-                <entry key="mainService">
-                    <ref bean="xmlcrm.service"/>
-                </entry>
-                 -->
-                       </map>
-               </property>
-       </bean>

     <!-- New Class for the Streaming Handlers -->
<bean id="web.handler" class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter"/>
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java Wed Aug 31 10:02:46 2011
@@ -74,7 +74,7 @@
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
                                return (ScopeApplicationAdapter) context
-                                               
.getBean("scopeApplicationAdapter");
+                                               .getBean("web.handler");
                        }
                } catch (Exception err) {
                        log.error("[getScopeApplicationAdapter]", err);
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java Wed Aug 31 10:02:46 2011
@@ -53,7 +53,7 @@
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
                                return (ScopeApplicationAdapter) context
-                                               
.getBean("scopeApplicationAdapter");
+                                               .getBean("web.handler");
                        }
                } catch (Exception err) {
                        log.error("[getScopeApplicationAdapter]", err);
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java Wed Aug 31 10:02:46 2011
@@ -111,7 +111,7 @@
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
                                return (ScopeApplicationAdapter) context
-                                               
.getBean("scopeApplicationAdapter");
+                                               .getBean("web.handler");
                        }
                } catch (Exception err) {
                        log.error("[getScopeApplicationAdapter]", err);
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java Wed Aug 31 10:02:46 2011
@@ -87,7 +87,7 @@
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
                                return (ScopeApplicationAdapter) context
-                                               
.getBean("scopeApplicationAdapter");
+                                               .getBean("web.handler");
                        }
                } catch (Exception err) {
                        log.error("[getScopeApplicationAdapter]", err);

--
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.

Reply via email to