Author: sebawagner
Date: Fri Feb 15 01:53:11 2013
New Revision: 1446425
URL: http://svn.apache.org/r1446425
Log:
Make getServletContext in Axis service protected to make sure its now used by
Axis2
Added:
openmeetings/trunk/singlewebapp/.settings/org.eclipse.jdt.ui.prefs
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/BaseWebService.java
- copied, changed from r1446423,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/BaseWebService.java
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/BaseWebService.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebServiceFacade.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
Added: openmeetings/trunk/singlewebapp/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.settings/org.eclipse.jdt.ui.prefs?rev=1446425&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/.settings/org.eclipse.jdt.ui.prefs (added)
+++ openmeetings/trunk/singlewebapp/.settings/org.eclipse.jdt.ui.prefs Fri Feb
15 01:53:11 2013
@@ -0,0 +1,54 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/BaseWebService.java
(from r1446423,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/BaseWebService.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/BaseWebService.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/BaseWebService.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/BaseWebService.java&r1=1446423&r2=1446425&rev=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/BaseWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/BaseWebService.java
Fri Feb 15 01:53:11 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.axis;
+package org.apache.openmeetings.axis.services;
import javax.servlet.ServletContext;
@@ -38,7 +38,7 @@ public abstract class BaseWebService {
return beanUtil;
}
- public ServletContext getServletContext() {
+ protected ServletContext getServletContext() {
try {
MessageContext mc =
MessageContext.getCurrentMessageContext();
return (ServletContext) mc
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1446425&r1=1446424&r2=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
Fri Feb 15 01:53:11 2013
@@ -23,7 +23,6 @@ import java.util.Date;
import java.util.List;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.axis.BaseWebService;
import org.apache.openmeetings.data.calendar.beans.Week;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebServiceFacade.java?rev=1446425&r1=1446424&r2=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/FileWebServiceFacade.java
Fri Feb 15 01:53:11 2013
@@ -19,7 +19,6 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.axis.BaseWebService;
import org.apache.openmeetings.data.file.dto.FileExplorerObject;
import org.apache.openmeetings.data.file.dto.LibraryPresentation;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java?rev=1446425&r1=1446424&r2=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
Fri Feb 15 01:53:11 2013
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.axis.services;
-import org.apache.openmeetings.axis.BaseWebService;
import org.apache.openmeetings.persistence.beans.room.Room;
/**
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1446425&r1=1446424&r2=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
Fri Feb 15 01:53:11 2013
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.List;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.axis.BaseWebService;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.room.Room;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java?rev=1446425&r1=1446424&r2=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
Fri Feb 15 01:53:11 2013
@@ -19,7 +19,6 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.axis.BaseWebService;
import org.apache.openmeetings.persistence.beans.basic.Server;
public class ServerWebServiceFacade extends BaseWebService {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1446425&r1=1446424&r2=1446425&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
Fri Feb 15 01:53:11 2013
@@ -19,7 +19,6 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.axis.BaseWebService;
import org.apache.openmeetings.data.beans.basic.ErrorResult;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
