[openmeetings-dev] [openmeetings] r4160 committed - - bean names are corrected

Thu, 01 Sep 2011 07:59:07 -0700 

Revision: 4160
Author:   solomax666
Date:     Thu Sep  1 07:57:50 2011
Log:      - bean names are corrected
http://code.google.com/p/openmeetings/source/detail?r=4160

Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/FileProcessor.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java /trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java 

=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/app/data/file/FileProcessor.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/app/data/file/FileProcessor.java Thu Sep 1 07:57:50 2011 
@@ -201,16 +201,7 @@
HashMap<String, Object> processThumb = generateThumbs.generateThumb("_thumb_", current_dir, completeName, 50); 
             returnError.put("processThumb", processThumb);
         } else if (isVideo) {
-
-            // ApplicationContext context =
- // WebApplicationContextUtils.getWebApplicationContext(getServletContext()); 
-
-            // FlvExplorerConverter flvExplorerConverter =
-            // (FlvExplorerConverter)
-            // context.getBean("openmeetings.FlvExplorerConverter");
-
- this.flvExplorerConverter.startConversion(fileExplorerItemId, completeName + newFileExtDot); 
-
+ flvExplorerConverter.startConversion(fileExplorerItemId, completeName + newFileExtDot); 
         }

         returnError.put("returnAttributes", returnAttributes);
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java Thu Sep 1 07:57:50 2011 
@@ -104,7 +104,6 @@
                return null;
        }

-       @SuppressWarnings("deprecation")
        @Override
        protected void service(HttpServletRequest httpServletRequest,
                        HttpServletResponse httpServletResponse) throws 
ServletException,
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java Thu Sep 1 07:57:50 2011 
@@ -75,7 +75,7 @@
                        if (ScopeApplicationAdapter.initComplete) {
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
-                               return (MainService) 
context.getBean("mainService");
+                               return (MainService) 
context.getBean("xmlcrm.service");
                        }
                } catch (Exception err) {
                        log.error("[getMainService]", err);
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java Wed Aug 31 10:02:46 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java Thu Sep 1 07:57:50 2011 
@@ -66,7 +66,7 @@
                        if (ScopeApplicationAdapter.initComplete) {
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
-                               return (ClientListManager) 
context.getBean("clientListManager");
+ return (ClientListManager) context.getBean("openmeetings.ClientListManager"); 
                        }
                } catch (Exception err) {
                        log.error("[getClientListManager]", err);
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java Wed Aug 31 10:02:46 2011 +++ /trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java Thu Sep 1 07:57:50 2011 
@@ -124,7 +124,7 @@
                        if (ScopeApplicationAdapter.initComplete) {
                                ApplicationContext context = 
WebApplicationContextUtils
                                                
.getWebApplicationContext(getServletContext());
-                               return (ClientListManager) 
context.getBean("clientListManager");
+ return (ClientListManager) context.getBean("openmeetings.ClientListManager"); 
                        }
                } catch (Exception err) {
                        log.error("[getClientListManager]", err);
=======================================
--- /trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java Tue Aug 30 13:17:16 2011 +++ /trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java Thu Sep 1 07:57:50 2011 
@@ -33,7 +33,7 @@
                try {
                        ApplicationContext context = WebApplicationContextUtils
                                        
.getWebApplicationContext(getServletContext());
-                       return (RoomWebService) 
context.getBean("roomServiceSoapProxy");
+                       return (RoomWebService) 
context.getBean("roomWebService");
                } catch (Exception err) {
                        log.error("[geRoomServiceProxy]", 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