Author: chris.laprun(a)jboss.com Date: 2007-02-12 12:14:58 -0500 (Mon, 12 Feb 2007) New Revision: 6218 Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl Log: - Re-organization and clean-ups. - Added section on using https in service definition. Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml 2007-02-12 16:40:07 UTC (rev 6217) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml 2007-02-12 17:14:58 UTC (rev 6218) @@ -22,5 +22,5 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <jboss-web> - <!--<depends>jboss.ws:service=WebServiceDeployerJSE</depends>--> + <depends>jboss.ws:service=WebServiceDeployerJSE</depends> </jboss-web> \ No newline at end of file Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml 2007-02-12 16:40:07 UTC (rev 6217) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml 2007-02-12 17:14:58 UTC (rev 6218) @@ -28,12 +28,6 @@ version="2.4"> <!-- Filter to put request and response in ServletAccess --> - <!-- - <filter> - <filter-name>RequestDumperFilter</filter-name> - <filter-class>org.jboss.portal.wsrp.servlet.RequestDumperFilter</filter-class> - </filter> - --> <filter> <filter-name>ServletAccessFilter</filter-name> <filter-class>org.jboss.portal.wsrp.servlet.ServletAccessFilter</filter-class> @@ -42,12 +36,6 @@ <filter-name>TransactionFilter</filter-name> <filter-class>org.jboss.portal.wsrp.servlet.TransactionFilter</filter-class> </filter> - <!-- - <filter-mapping> - <filter-name>RequestDumperFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - --> <filter-mapping> <filter-name>ServletAccessFilter</filter-name> <url-pattern>/*</url-pattern> @@ -57,31 +45,24 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <servlet> - <servlet-name>MarkupService</servlet-name> - <servlet-class>org.jboss.portal.wsrp.endpoints.MarkupEndpoint</servlet-class> - <init-param> - <param-name>wsrp-interface</param-name> - <param-value>org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType</param-value> - </init-param> - </servlet> - <servlet> - <servlet-name>ServiceDescriptionService</servlet-name> - <servlet-class>org.jboss.portal.wsrp.endpoints.ServiceDescriptionEndpoint</servlet-class> - <init-param> - <param-name>wsrp-interface</param-name> - <param-value>org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>ServiceDescriptionService</servlet-name> - <url-pattern>/ServiceDescriptionService</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>MarkupService</servlet-name> - <url-pattern>/MarkupService</url-pattern> - </servlet-mapping> + <!-- WSRP Endpoints --> <servlet> + <servlet-name>ServiceDescriptionService</servlet-name> + <servlet-class>org.jboss.portal.wsrp.endpoints.ServiceDescriptionEndpoint</servlet-class> + <init-param> + <param-name>wsrp-interface</param-name> + <param-value>org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>MarkupService</servlet-name> + <servlet-class>org.jboss.portal.wsrp.endpoints.MarkupEndpoint</servlet-class> + <init-param> + <param-name>wsrp-interface</param-name> + <param-value>org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType</param-value> + </init-param> + </servlet> + <servlet> <servlet-name>RegistrationService</servlet-name> <servlet-class>org.jboss.portal.wsrp.endpoints.RegistrationEndpoint</servlet-class> <init-param> @@ -97,7 +78,17 @@ <param-value>org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType</param-value> </init-param> </servlet> + + <!-- Mappings --> <servlet-mapping> + <servlet-name>ServiceDescriptionService</servlet-name> + <url-pattern>/ServiceDescriptionService</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>MarkupService</servlet-name> + <url-pattern>/MarkupService</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>RegistrationService</servlet-name> <url-pattern>/RegistrationService</url-pattern> </servlet-mapping> Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl 2007-02-12 16:40:07 UTC (rev 6217) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_services.wsdl 2007-02-12 17:14:58 UTC (rev 6218) @@ -50,4 +50,25 @@ <soap:address location="REPLACE_WITH_ACTUAL_URL"/> </wsdl:port> </wsdl:service> + + <!-- + Uncomment to use HTTP+SSL after activating the appropriate Tomcat Connector and comment out the above service + definition. Adapt host name and port as appropriate. + <wsdl:service name="WSRPService"> + <wsdl:port binding="bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPBaseService"> + <soap:address location="https://localhost:8443/portal-wsrp/ServiceDescriptionService"/> + </wsdl:port> + + <wsdl:port binding="bind:WSRP_v1_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService"> + <soap:address location="https://localhost:8443/portal-wsrp/MarkupService"/> + </wsdl:port> + + <wsdl:port binding="bind:WSRP_v1_Registration_Binding_SOAP" name="WSRPRegistrationService"> + <soap:address location="https://localhost:8443/portal-wsrp/RegistrationService"/> + </wsdl:port> + + <wsdl:port binding="bind:WSRP_v1_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService"> + <soap:address location="https://localhost:8443/portal-wsrp/PortletManagementService"/> + </wsdl:port> + </wsdl:service>--> </wsdl:definitions>