Author: solomax
Date: Wed Oct 28 03:44:43 2015
New Revision: 1710934
URL: http://svn.apache.org/viewvc?rev=1710934&view=rev
Log:
[OPENMEETINGS-1118] wsdl for services generated as expecting
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Wed Oct 28 03:44:43 2015
@@ -287,44 +287,12 @@
<ref bean="userWebService"/>
</jaxrs:serviceBeans>
</jaxrs:server>
- <jaxws:endpoint id="calendarServiceWS" address="/CalendarService"
- implementor="#calendarWebService"
- endpointName="CalendarServiceEndpoint"
- serviceName="CalendarService"
- />
- <jaxws:endpoint id="errorServiceWS" address="/ErrorService"
- implementor="#errorWebService"
- endpointName="ErrorServiceEndpoint"
- serviceName="ErrorService"
- />
- <jaxws:endpoint id="groupServiceWS" address="/GroupService"
- implementor="#groupWebService"
- endpointName="GroupServiceEndpoint"
- serviceName="GroupService"
- />
- <jaxws:endpoint id="fileServiceWS" address="/FileService"
- implementor="#fileWebService"
- endpointName="FileServiceEndpoint"
- serviceName="FileService"
- />
- <jaxws:endpoint id="recordServiceWS" address="/RecordService"
- implementor="#recordWebService"
- endpointName="RecordServiceEndpoint"
- serviceName="RecordService"
- />
- <jaxws:endpoint id="roomServiceWS" address="/RoomService"
- implementor="#roomWebService"
- endpointName="RoomServiceEndpoint"
- serviceName="RoomService"
- />
- <jaxws:endpoint id="serverServiceWS" address="/ServerService"
- implementor="#serverWebService"
- endpointName="ServerServiceEndpoint"
- serviceName="ServerService"
- />
- <jaxws:endpoint id="userServiceWS" address="/UserService"
- implementor="#userWebService"
- endpointName="UserServiceEndpoint"
- serviceName="UserService"
- />
+ <jaxws:endpoint id="calendarServiceWS" address="/CalendarService"
implementor="#calendarWebService"/>
+ <jaxws:endpoint id="errorServiceWS" address="/ErrorService"
implementor="#errorWebService" />
+ <jaxws:endpoint id="groupServiceWS" address="/GroupService"
implementor="#groupWebService" />
+ <jaxws:endpoint id="fileServiceWS" address="/FileService"
implementor="#fileWebService" />
+ <jaxws:endpoint id="recordServiceWS" address="/RecordService"
implementor="#recordWebService" />
+ <jaxws:endpoint id="roomServiceWS" address="/RoomService"
implementor="#roomWebService" />
+ <jaxws:endpoint id="serverServiceWS" address="/ServerService"
implementor="#serverWebService" />
+ <jaxws:endpoint id="userServiceWS" address="/UserService"
implementor="#userWebService" />
</beans>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Wed Oct 28 03:44:43 2015
@@ -56,9 +56,9 @@ import org.springframework.beans.factory
* @webservice CalendarService
*
*/
-@WebService
+@WebService(serviceName="org.apache.openmeetings.webservice.CalendarWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/calendar")
public class CalendarWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(CalendarWebService.class, webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
Wed Oct 28 03:44:43 2015
@@ -45,9 +45,9 @@ import org.springframework.beans.factory
* @webservice ErrorService
*
*/
-@WebService(name = "ErrorService")
+@WebService(serviceName="org.apache.openmeetings.webservice.ErrorWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/error")
public class ErrorWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(ErrorWebService.class, webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
Wed Oct 28 03:44:43 2015
@@ -62,9 +62,9 @@ import org.springframework.beans.factory
* @webservice FileService
*
*/
-@WebService
+@WebService(serviceName="org.apache.openmeetings.webservice.FileWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/file")
public class FileWebService {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
Wed Oct 28 03:44:43 2015
@@ -62,9 +62,9 @@ import org.springframework.beans.factory
* @webservice GroupService
*
*/
-@WebService(name = "GroupService")
+@WebService(serviceName="org.apache.openmeetings.webservice.GroupWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/group")
public class GroupWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(GroupWebService.class, webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
Wed Oct 28 03:44:43 2015
@@ -52,9 +52,9 @@ import org.springframework.beans.factory
* @webservice RecordingService
*
*/
-@WebService(name = "RecordingService")
+@WebService(serviceName="org.apache.openmeetings.webservice.RecordingWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/record")
public class RecordingWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(RecordingWebService.class, webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Wed Oct 28 03:44:43 2015
@@ -67,9 +67,9 @@ import org.springframework.beans.factory
* @webservice RoomService
*
*/
-@WebService
+@WebService(serviceName="org.apache.openmeetings.webservice.RoomWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/room")
public class RoomWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(RoomWebService.class, webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
Wed Oct 28 03:44:43 2015
@@ -56,9 +56,9 @@ import org.springframework.beans.factory
* @webservice ServerService
*
*/
-@WebService
+@WebService(serviceName="org.apache.openmeetings.webservice.ServerWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
-@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
@Path("/server")
public class ServerWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(ServerWebService.class, webAppRootKey);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1710934&r1=1710933&r2=1710934&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Wed Oct 28 03:44:43 2015
@@ -68,13 +68,12 @@ import org.springframework.beans.factory
* @webservice UserService
*
*/
-@WebService(name = "UserService", targetNamespace = UserWebService.USER_NS)
+@WebService(serviceName="org.apache.openmeetings.webservice.UserWebService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
@Produces({MediaType.APPLICATION_JSON})
@Path("/user")
public class UserWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
- public static final String USER_NS =
"http://webservice.openmeetings.apache.org/user";;
@Autowired
private ConfigurationDao cfgDao;
@Autowired
