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=1588795&r1=1588794&r2=1588795&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 Sun Apr 20 17:08:45 2014 @@ -18,13 +18,19 @@ under the License. --> -<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:mvc="http://www.springframework.org/schema/mvc"; +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:mvc="http://www.springframework.org/schema/mvc"; xmlns:context="http://www.springframework.org/schema/context"; + xmlns:jaxrs="http://cxf.apache.org/jaxrs"; + xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd - http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd";> + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd";> <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean"> <property name="persistenceUnitName" value="openmeetings" /> </bean> @@ -310,4 +316,66 @@ <bean id="calendarWebService" class="org.apache.openmeetings.axis.services.CalendarWebService" /> <bean id="jabberWebService" class="org.apache.openmeetings.axis.services.JabberWebService" /> <bean id="serverWebService" class="org.apache.openmeetings.axis.services.ServerWebService" /> + + <bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider"> + <!-- (writeXsiType=false) --> + <property name="ignoreNamespaces" value="true" /> + </bean> + <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/> + <jaxrs:server id="serverRest" address="/rest"> + <jaxrs:serviceBeans> + <ref bean="userWebService"/> + <ref bean="roomWebService"/> + <ref bean="fileWebService"/> + <ref bean="calendarWebService"/> + <ref bean="jabberWebService"/> + <ref bean="serverWebService"/> + </jaxrs:serviceBeans> + <jaxrs:providers> + <ref bean="jaxbProvider"/> + </jaxrs:providers> + </jaxrs:server> + <!-- jaxrs:server id="serverJson" address="/json"> + <jaxrs:serviceBeans> + <ref bean="userWebService"/> + <ref bean="roomWebService"/> + <ref bean="fileWebService"/> + <ref bean="calendarWebService"/> + <ref bean="jabberWebService"/> + <ref bean="serverWebService"/> + </jaxrs:serviceBeans> + <jaxrs:providers> + <ref bean="jsonProvider"/> + </jaxrs:providers> + </jaxrs:server--> + <jaxws:endpoint id="userServiceWS" address="/UserService" + implementor="#userWebService" + endpointName="UserServiceEndpoint" + serviceName="UserService" + /> + <jaxws:endpoint id="roomServiceWS" address="/RoomService" + implementor="#roomWebService" + endpointName="RoomServiceEndpoint" + serviceName="RoomService" + /> + <jaxws:endpoint id="fileServiceWS" address="/FileService" + implementor="#fileWebService" + endpointName="FileServiceEndpoint" + serviceName="FileService" + /> + <jaxws:endpoint id="calendarServiceWS" address="/CalendarService" + implementor="#calendarWebService" + endpointName="CalendarServiceEndpoint" + serviceName="CalendarService" + /> + <jaxws:endpoint id="jabberServiceWS" address="/JabberService" + implementor="#jabberWebService" + endpointName="JabberServiceEndpoint" + serviceName="JabberService" + /> + <jaxws:endpoint id="serverServiceWS" address="/ServerService" + implementor="#serverWebService" + endpointName="ServerServiceEndpoint" + serviceName="ServerService" + /> </beans>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1588795&r1=1588794&r2=1588795&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original) +++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml Sun Apr 20 17:08:45 2014 @@ -34,6 +34,20 @@ <listener-class>org.apache.openmeetings.util.OMContextListener</listener-class> </listener> + <servlet> + <servlet-name>CXFServlet</servlet-name> + <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class> + <init-param> + <param-name>config-location</param-name> + <param-value>classpath:openmeetings-applicationContext.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + <filter> <filter-name>LoggerContextFilter</filter-name> <filter-class>org.red5.logging.LoggerContextFilter</filter-class> @@ -64,7 +78,7 @@ <filter-name>OpenmeetingsApplication</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - + <context-param> <param-name>contextConfigLocation</param-name> <param-value>/WEB-INF/red5-*.xml</param-value> @@ -77,7 +91,7 @@ <param-name>parentContextKey</param-name> <param-value>default.context</param-value> </context-param> - + <!-- remove the following servlet tags if you want to disable remoting for this application --> <servlet> <servlet-name>spring-mvc</servlet-name> @@ -95,12 +109,6 @@ <servlet-name>ExportToImage</servlet-name> <servlet-class>org.apache.openmeetings.servlet.outputhandler.ExportToImage</servlet-class> </servlet> - <!-- Axis2 Settings --> - <servlet> - <servlet-name>AxisServlet</servlet-name> - <servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> <servlet-mapping> <servlet-name>spring-mvc</servlet-name> @@ -114,11 +122,6 @@ <servlet-name>ExportToImage</servlet-name> <url-pattern>/ExportToImage</url-pattern> </servlet-mapping> - <!-- Axis2 --> - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> <mime-mapping> <extension>inc</extension> <mime-type>text/plain</mime-type>
