Repository: juddi Updated Branches: refs/heads/master 5eda4a714 -> 5994cd063
http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml b/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml index 853c850..4e520b5 100644 --- a/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml +++ b/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml @@ -15,26 +15,26 @@ http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> <web-app> - <context-param> - <param-name>log4jConfigLocation</param-name> - <param-value>/WEB-INF/classes/log4j.properties</param-value> - </context-param> + <context-param> + <param-name>log4jConfigLocation</param-name> + <param-value>/WEB-INF/classes/log4j.properties</param-value> + </context-param> - <listener> - <!-- this class setups the encryption key for the session--> - <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> + <listener> + <!-- this class setups the encryption key for the session--> + <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> - </listener> - <servlet> + </listener> + <servlet> <servlet-name>AxisServlet</servlet-name> <display-name>Apache-Axis Servlet</display-name> <servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class> @@ -52,23 +52,23 @@ </servlet> - <servlet> - <servlet-name>RegistryServlet</servlet-name> - <display-name>Registry Servlet</display-name> - <servlet-class> - org.apache.juddi.servlets.RegistryServlet - </servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>RegistryServlet</servlet-name> + <display-name>Registry Servlet</display-name> + <servlet-class> + org.apache.juddi.servlets.RegistryServlet + </servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> - <servlet> - <servlet-name>NotifyServlet</servlet-name> - <display-name>Notify Servlet</display-name> - <servlet-class> - org.apache.juddi.servlets.NotifyServlet - </servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>NotifyServlet</servlet-name> + <display-name>Notify Servlet</display-name> + <servlet-class> + org.apache.juddi.servlets.NotifyServlet + </servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> @@ -88,41 +88,41 @@ </servlet-mapping> - <servlet-mapping> - <servlet-name>NotifyServlet</servlet-name> - <url-pattern>/notify/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>NotifyServlet</servlet-name> + <url-pattern>/notify/*</url-pattern> + </servlet-mapping> - <resource-ref> - <description>jUDDI DataSource</description> - <res-ref-name>jdbc/juddiDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - <res-sharing-scope>Shareable</res-sharing-scope> - </resource-ref> + <resource-ref> + <description>jUDDI DataSource</description> + <res-ref-name>jdbc/juddiDB</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> -<security-constraint> - <display-name>jUDDI Admin content</display-name> - <web-resource-collection> - <web-resource-name>admin</web-resource-name> - <url-pattern>/admin/*</url-pattern> + <security-constraint> + <display-name>jUDDI Admin content</display-name> + <web-resource-collection> + <web-resource-name>admin</web-resource-name> + <url-pattern>/admin/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>uddiadmin</role-name> - </auth-constraint> - <!-- uncomment to require SSL <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - --> - </security-constraint> + </web-resource-collection> + <auth-constraint> + <role-name>uddiadmin</role-name> + </auth-constraint> + <!-- uncomment to require SSL <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + --> + </security-constraint> <login-config> - <auth-method>BASIC</auth-method> - <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> - <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> - </login-config> - <security-role> - <role-name>uddiadmin</role-name> - </security-role> + <auth-method>BASIC</auth-method> + <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> + <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> + </login-config> + <security-role> + <role-name>uddiadmin</role-name> + </security-role> </web-app> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/beans.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/beans.xml b/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/beans.xml index 4392e1f..e956edd 100644 --- a/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/beans.xml +++ b/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/beans.xml @@ -69,7 +69,8 @@ </jaxws:properties> </jaxws:endpoint> -<!-- not yet implemented +<!-- + This is covered under the juddiv3replication in order to ensure client-cert auth <jaxws:endpoint id="replication" implementor="org.apache.juddi.api.impl.UDDIReplicationImpl" address="/replication"> <jaxws:properties> <entry key="schema-validation-enabled" value="true"/> @@ -77,7 +78,6 @@ </jaxws:endpoint> --> -<!-- ClientSide APIs <jaxws:endpoint id="valueset-validation" implementor="org.apache.juddi.api.impl.UDDIValueSetValidationImpl" address="/valueset-validation"> <jaxws:properties> <entry key="schema-validation-enabled" value="true"/> @@ -89,7 +89,6 @@ <entry key="schema-validation-enabled" value="true"/> </jaxws:properties> </jaxws:endpoint> ---> <jaxws:endpoint id="inquiryv2" implementor="org.apache.juddi.api.impl.UDDIv2InquiryImpl" address="/inquiryv2"> <jaxws:properties> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/web.xml b/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/web.xml index 7f544b7..2018539 100644 --- a/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/web.xml +++ b/juddiv3-war/JAX-WS/CXF-JBossAS7Up/WEB-INF/web.xml @@ -48,6 +48,26 @@ <param-value>org.apache.juddi.api.impl.UDDISecurityImpl</param-value> </init-param> </servlet> + + <servlet> + <servlet-name>UDDIValueSetCachingWS</servlet-name> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.apache.juddi.api.impl.UDDIValueSetCachingImpl</param-value> + </init-param> + </servlet> + + <servlet> + <servlet-name>UDDIValueSetValidationWS</servlet-name> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.apache.juddi.api.impl.UDDIValueSetValidationImpl</param-value> + </init-param> + </servlet> + + <servlet> <servlet-name>UDDIPublishWS</servlet-name> <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> @@ -112,6 +132,19 @@ <param-value>org.apache.juddi.api.impl.JUDDIApiImpl</param-value> </init-param> </servlet> + + + +<servlet-mapping> + <servlet-name>UDDIValueSetCachingWS</servlet-name> + <url-pattern>/services/valueset-caching/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIValueSetValidationWS</servlet-name> + <url-pattern>/services/valueset-validation/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>UDDISecurityWS</servlet-name> <url-pattern>/services/security/*</url-pattern> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml b/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml index b7c1e09..0b4049e 100644 --- a/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml +++ b/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml @@ -69,12 +69,14 @@ </jaxws:properties> </jaxws:endpoint> +<!-- + This is covered under the juddiv3replication in order to ensure client-cert auth <jaxws:endpoint id="replication" implementor="org.apache.juddi.api.impl.UDDIReplicationImpl" address="/replication"> <jaxws:properties> <entry key="schema-validation-enabled" value="true"/> </jaxws:properties> </jaxws:endpoint> - +--> <!-- ClientSide APIs --> <jaxws:endpoint id="valueset-validation" implementor="org.apache.juddi.api.impl.UDDIValueSetValidationImpl" address="/valueset-validation"> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml b/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml index bff48dc..bcaf621 100644 --- a/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml +++ b/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml @@ -15,101 +15,101 @@ http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> <web-app> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>WEB-INF/beans.xml</param-value> - </context-param> + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>WEB-INF/beans.xml</param-value> + </context-param> - <context-param> - <param-name>log4jConfigLocation</param-name> - <param-value>/WEB-INF/classes/log4j.properties</param-value> - </context-param> + <context-param> + <param-name>log4jConfigLocation</param-name> + <param-value>/WEB-INF/classes/log4j.properties</param-value> + </context-param> - <listener> - <listener-class> - org.springframework.web.context.ContextLoaderListener - </listener-class> - <!-- this class setups the encryption key for the session--> - <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> + <listener> + <listener-class> + org.springframework.web.context.ContextLoaderListener + </listener-class> + <!-- this class setups the encryption key for the session--> + <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> - </listener> + </listener> - <servlet> - <servlet-name>CXFServlet</servlet-name> - <display-name>CXF Servlet</display-name> - <servlet-class> - org.apache.cxf.transport.servlet.CXFServlet - </servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>CXFServlet</servlet-name> + <display-name>CXF Servlet</display-name> + <servlet-class> + org.apache.cxf.transport.servlet.CXFServlet + </servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> - <servlet> - <servlet-name>RegistryServlet</servlet-name> - <display-name>Registry Servlet</display-name> - <servlet-class> - org.apache.juddi.servlets.RegistryServlet - </servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>RegistryServlet</servlet-name> + <display-name>Registry Servlet</display-name> + <servlet-class> + org.apache.juddi.servlets.RegistryServlet + </servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> - <servlet> - <servlet-name>NotifyServlet</servlet-name> - <display-name>Notify Servlet</display-name> - <servlet-class> - org.apache.juddi.servlets.NotifyServlet - </servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>NotifyServlet</servlet-name> + <display-name>Notify Servlet</display-name> + <servlet-class> + org.apache.juddi.servlets.NotifyServlet + </servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> - <servlet-mapping> - <servlet-name>CXFServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>NotifyServlet</servlet-name> - <url-pattern>/notify/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>NotifyServlet</servlet-name> + <url-pattern>/notify/*</url-pattern> + </servlet-mapping> - <resource-ref> - <description>jUDDI DataSource</description> - <res-ref-name>jdbc/juddiDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - <res-sharing-scope>Shareable</res-sharing-scope> - </resource-ref> - <security-constraint> - <display-name>jUDDI Admin content</display-name> - <web-resource-collection> - <web-resource-name>admin</web-resource-name> - <url-pattern>/admin/*</url-pattern> + <resource-ref> + <description>jUDDI DataSource</description> + <res-ref-name>jdbc/juddiDB</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> + <security-constraint> + <display-name>jUDDI Admin content</display-name> + <web-resource-collection> + <web-resource-name>admin</web-resource-name> + <url-pattern>/admin/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>uddiadmin</role-name> - </auth-constraint> - <!-- uncomment to require SSL <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - --> - </security-constraint> + </web-resource-collection> + <auth-constraint> + <role-name>uddiadmin</role-name> + </auth-constraint> + <!-- uncomment to require SSL <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + --> + </security-constraint> <login-config> - <auth-method>BASIC</auth-method> - <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> - <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> - </login-config> - <security-role> - <role-name>uddiadmin</role-name> - </security-role> + <auth-method>BASIC</auth-method> + <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> + <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> + </login-config> + <security-role> + <role-name>uddiadmin</role-name> + </security-role> </web-app> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml b/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml index 093c312..0d80ca2 100644 --- a/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml +++ b/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml @@ -91,8 +91,10 @@ <param-value>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</param-value> </init-param> </servlet> - <servlet> + + <!-- + This is covered under the juddiv3replication in order to ensure client-cert auth <servlet> <servlet-name>UDDIReplicationWS</servlet-name> @@ -101,116 +103,120 @@ <param-name>jboss.ws.endpoint</param-name> <param-value>org.apache.juddi.api.impl.UDDIReplicationImpl</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>UDDIValueSetWS</servlet-name> - <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> - <init-param> - <param-name>jboss.ws.endpoint</param-name> - <param-value>org.apache.juddi.api.impl.UDDIValueSetValidationImpl</param-value> - </init-param> - </servlet> + </init-param> + </servlet> + --> + <servlet> + <servlet-name>UDDIValueSetWS</servlet-name> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.apache.juddi.api.impl.UDDIValueSetValidationImpl</param-value> + </init-param> + </servlet> <servlet> - <servlet-name>UDDIValueSetCachingWS</servlet-name> + <servlet-name>UDDIValueSetCachingWS</servlet-name> - <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> - <init-param> - <param-name>jboss.ws.endpoint</param-name> - <param-value>org.apache.juddi.api.impl.UDDIValueSetCachingImpl</param-value> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.apache.juddi.api.impl.UDDIValueSetCachingImpl</param-value> - </init-param> - </servlet> - <servlet-name>UDDICustodyTransferWS</servlet-name> - <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> - <init-param> - <param-name>jboss.ws.endpoint</param-name> - <param-value>org.apache.juddi.api.impl.UDDICustodyTransferImpl</param-value> - </init-param> - </servlet> - <servlet> - <servlet-name>JUDDIApiWS</servlet-name> - <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> - <init-param> - <param-name>jboss.ws.endpoint</param-name> - <param-value>org.apache.juddi.api.impl.JUDDIApiImpl</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>UDDISecurityWS</servlet-name> - <url-pattern>/services/security/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDIPublishWS</servlet-name> - <url-pattern>/services/publish/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDIValueSetCachingWS</servlet-name> - <url-pattern>/services/valueset-caching/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDIValueSetWS</servlet-name> - <url-pattern>/services/valueset-validation/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>UDDIReplicationWS</servlet-name> - <url-pattern>/services/replication/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDIPublishWSv2</servlet-name> - <url-pattern>/services/publishv2/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDIInquiryWS</servlet-name> - <url-pattern>/services/inquiry/*</url-pattern> - </servlet-mapping> + </init-param> + </servlet> + + <servlet> + <servlet-name>UDDICustodyTransferWS</servlet-name> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.apache.juddi.api.impl.UDDICustodyTransferImpl</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>JUDDIApiWS</servlet-name> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + <init-param> + <param-name>jboss.ws.endpoint</param-name> + <param-value>org.apache.juddi.api.impl.JUDDIApiImpl</param-value> + </init-param> + </servlet> <servlet-mapping> - <servlet-name>UDDIInquiryWSv2</servlet-name> - <url-pattern>/services/inquire/*</url-pattern> - </servlet-mapping> + <servlet-name>UDDISecurityWS</servlet-name> + <url-pattern>/services/security/*</url-pattern> + </servlet-mapping> <servlet-mapping> - <servlet-name>UDDISubscriptionWS</servlet-name> - <url-pattern>/services/subscription/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDISubscriptionListenerWS</servlet-name> - <url-pattern>/services/subscription-listener/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>UDDICustodyTransferWS</servlet-name> - <url-pattern>/services/custody-transfer/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>JUDDIApiWS</servlet-name> - <url-pattern>/services/juddi-api/*</url-pattern> - </servlet-mapping> + <servlet-name>UDDIPublishWS</servlet-name> + <url-pattern>/services/publish/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIValueSetCachingWS</servlet-name> + <url-pattern>/services/valueset-caching/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIValueSetWS</servlet-name> + <url-pattern>/services/valueset-validation/*</url-pattern> + </servlet-mapping> + <!-- + This is covered under the juddiv3replication in order to ensure client-cert auth + <servlet-mapping> + <servlet-name>UDDIReplicationWS</servlet-name> + <url-pattern>/services/replication/*</url-pattern> + </servlet-mapping> + --> + <servlet-mapping> + <servlet-name>UDDIPublishWSv2</servlet-name> + <url-pattern>/services/publishv2/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIInquiryWS</servlet-name> + <url-pattern>/services/inquiry/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIInquiryWSv2</servlet-name> + <url-pattern>/services/inquire/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDISubscriptionWS</servlet-name> + <url-pattern>/services/subscription/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDISubscriptionListenerWS</servlet-name> + <url-pattern>/services/subscription-listener/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDICustodyTransferWS</servlet-name> + <url-pattern>/services/custody-transfer/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>JUDDIApiWS</servlet-name> + <url-pattern>/services/juddi-api/*</url-pattern> + </servlet-mapping> - <security-constraint> - <display-name>jUDDI Admin content</display-name> - <web-resource-collection> - <web-resource-name>admin</web-resource-name> - <url-pattern>/admin/*</url-pattern> + <security-constraint> + <display-name>jUDDI Admin content</display-name> + <web-resource-collection> + <web-resource-name>admin</web-resource-name> + <url-pattern>/admin/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>uddiadmin</role-name> - </auth-constraint> - <!-- uncomment to require SSL <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - --> - </security-constraint> + </web-resource-collection> + <auth-constraint> + <role-name>uddiadmin</role-name> + </auth-constraint> + <!-- uncomment to require SSL <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + --> + </security-constraint> <login-config> - <auth-method>BASIC</auth-method> - <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> - <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> - </login-config> - <security-role> - <role-name>uddiadmin</role-name> - </security-role> + <auth-method>BASIC</auth-method> + <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> + <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> + </login-config> + <security-role> + <role-name>uddiadmin</role-name> + </security-role> </web-app> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml b/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml index d388982..6349e33 100644 --- a/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml +++ b/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml @@ -1,176 +1,198 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - /* * Copyright 2001-2004 The Apache Software Foundation. * * Licensed - under the Apache License, Version 2.0 (the "License"); * you may not - use this file except in compliance with the License. * You may obtain - a copy of the License at * * - http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by - applicable law or agreed to in writing, software * distributed under - the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. * See the - License for the specific language governing permissions and * - limitations under the License. */ - --> +<!-- + /* * Copyright 2001-2004 The Apache Software Foundation. * * Licensed + under the Apache License, Version 2.0 (the "License"); * you may not + use this file except in compliance with the License. * You may obtain + a copy of the License at * * + http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by + applicable law or agreed to in writing, software * distributed under + the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES + OR CONDITIONS OF ANY KIND, either express or implied. * See the + License for the specific language governing permissions and * + limitations under the License. */ +--> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> - <display-name>jUDDI</display-name> - <description> - jUDDI is Java-based implementation of an UDDI version 3.0 registry. + <display-name>jUDDI</display-name> + <description> + jUDDI is Java-based implementation of an UDDI version 3.0 registry. </description> - <listener> - <!-- this class setups the encryption key for the session--> - <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> + <listener> + <!-- this class setups the encryption key for the session--> + <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> - </listener> - <servlet> - <servlet-name>RegistryServlet</servlet-name> - <display-name>Registry Servlet</display-name> - <servlet-class>org.apache.juddi.servlets.RegistryServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet> - <servlet-name>NotifyServlet</servlet-name> - <display-name>Notify Servlet</display-name> - <servlet-class> - org.apache.juddi.servlets.NotifyServlet - </servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet> - <servlet-name>InquiryService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDIInquiryImpl</servlet-class> - </servlet> + </listener> + <servlet> + <servlet-name>RegistryServlet</servlet-name> + <display-name>Registry Servlet</display-name> + <servlet-class>org.apache.juddi.servlets.RegistryServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>NotifyServlet</servlet-name> + <display-name>Notify Servlet</display-name> + <servlet-class> + org.apache.juddi.servlets.NotifyServlet + </servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>InquiryService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDIInquiryImpl</servlet-class> + </servlet> - <servlet> - <servlet-name>InquiryServicev2</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDIv2InquiryImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>PublicationService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDIPublicationImpl</servlet-class> - </servlet> - <servlet> - <servlet-name>PublicationServicev2</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDIv2PublishImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>ReplicationService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDIReplicationImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>SecurityService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDISecurityImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>SubscriptionService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDISubscriptionImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>SubscriptionListenerService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>CustodyTransferService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.UDDICustodyTransferImpl</servlet-class> - </servlet> - - <servlet> - <servlet-name>JUDDIApiService</servlet-name> - <servlet-class>org.apache.juddi.api.impl.JUDDIApiImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>NotifyServlet</servlet-name> - <url-pattern>/notify/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>InquiryService</servlet-name> - <url-pattern>/services/inquiry</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>InquiryServicev2</servlet-name> - <url-pattern>/services/inquiryv2</url-pattern> - </servlet-mapping> + <servlet> + <servlet-name>InquiryServicev2</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDIv2InquiryImpl</servlet-class> + </servlet> + + <servlet> + <servlet-name>PublicationService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDIPublicationImpl</servlet-class> + </servlet> + <servlet> + <servlet-name>PublicationServicev2</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDIv2PublishImpl</servlet-class> + </servlet> + <!-- + This is covered under the juddiv3replication in order to ensure client-cert auth + <servlet> + <servlet-name>ReplicationService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDIReplicationImpl</servlet-class> + </servlet> + --> + <servlet> + <servlet-name>UDDIValueSetWS</servlet-name> + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + </servlet> + + <servlet> + <servlet-name>UDDIValueSetCachingWS</servlet-name> + + <servlet-class>org.jboss.wsf.stack.cxf.CXFServletExt</servlet-class> + </servlet> + + <servlet> + <servlet-name>SecurityService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDISecurityImpl</servlet-class> + </servlet> + + <servlet> + <servlet-name>SubscriptionService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDISubscriptionImpl</servlet-class> + </servlet> + + <servlet> + <servlet-name>SubscriptionListenerService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</servlet-class> + </servlet> + + <servlet> + <servlet-name>CustodyTransferService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.UDDICustodyTransferImpl</servlet-class> + </servlet> + + <servlet> + <servlet-name>JUDDIApiService</servlet-name> + <servlet-class>org.apache.juddi.api.impl.JUDDIApiImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>NotifyServlet</servlet-name> + <url-pattern>/notify/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>InquiryService</servlet-name> + <url-pattern>/services/inquiry</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>InquiryServicev2</servlet-name> + <url-pattern>/services/inquiryv2</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>PublicationService</servlet-name> - <url-pattern>/services/publish</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PublicationServicev2</servlet-name> - <url-pattern>/services/publishv2</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ReplicationService</servlet-name> - <url-pattern>/services/replication</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>SecurityService</servlet-name> - <url-pattern>/services/security</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>SubscriptionService</servlet-name> - <url-pattern>/services/subscription</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>SubscriptionListenerService</servlet-name> - <url-pattern>/services/subscription-listener</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>CustodyTransferService</servlet-name> - <url-pattern>/services/custody-transfer</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>JUDDIApiService</servlet-name> - <url-pattern>/services/juddi-api</url-pattern> - </servlet-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>index.jsp</welcome-file> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - <security-constraint> - <display-name>jUDDI Admin content</display-name> - <web-resource-collection> - <web-resource-name>admin</web-resource-name> - <url-pattern>/admin/*</url-pattern> - - - </web-resource-collection> - <auth-constraint> - <role-name>uddiadmin</role-name> - </auth-constraint> - <!-- uncomment to require SSL <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - --> - </security-constraint> - <login-config> - <auth-method>BASIC</auth-method> - <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> - <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> - </login-config> - <security-role> - <role-name>uddiadmin</role-name> - </security-role> + <servlet-mapping> + <servlet-name>PublicationService</servlet-name> + <url-pattern>/services/publish</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PublicationServicev2</servlet-name> + <url-pattern>/services/publishv2</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIValueSetCachingWS</servlet-name> + <url-pattern>/services/valueset-caching/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>UDDIValueSetWS</servlet-name> + <url-pattern>/services/valueset-validation/*</url-pattern> + </servlet-mapping> + + <!-- + This is covered under the juddiv3replication in order to ensure client-cert auth + <servlet-mapping> + <servlet-name>ReplicationService</servlet-name> + <url-pattern>/services/replication</url-pattern> + </servlet-mapping> + --> + <servlet-mapping> + <servlet-name>SecurityService</servlet-name> + <url-pattern>/services/security</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>SubscriptionService</servlet-name> + <url-pattern>/services/subscription</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>SubscriptionListenerService</servlet-name> + <url-pattern>/services/subscription-listener</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>CustodyTransferService</servlet-name> + <url-pattern>/services/custody-transfer</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>JUDDIApiService</servlet-name> + <url-pattern>/services/juddi-api</url-pattern> + </servlet-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.jsp</welcome-file> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + <security-constraint> + <display-name>jUDDI Admin content</display-name> + <web-resource-collection> + <web-resource-name>admin</web-resource-name> + <url-pattern>/admin/*</url-pattern> + + + </web-resource-collection> + <auth-constraint> + <role-name>uddiadmin</role-name> + </auth-constraint> + <!-- uncomment to require SSL <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + --> + </security-constraint> + <login-config> + <auth-method>BASIC</auth-method> + <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details --> + <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name> + </login-config> + <security-role> + <role-name>uddiadmin</role-name> + </security-role> </web-app> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7ae5049..aca35ac 100644 --- a/pom.xml +++ b/pom.xml @@ -305,6 +305,7 @@ under the License. <module>juddi-rest-cxf</module> <module>juddi-core-openjpa</module> <module>juddiv3-war</module> + <module>juddiv3-war-repl</module> <module>juddi-examples</module> <module>juddi-gui-dsig</module> <module>juddi-gui</module> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java ---------------------------------------------------------------------- diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java b/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java index 02539aa..f06c5c9 100644 --- a/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java +++ b/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java @@ -55,7 +55,7 @@ public class TckPublisher { logger.info("Loading tck.properties from " + f.getAbsolutePath()); } else { inputSteam = TckPublisher.class.getResourceAsStream("/tck.properties"); - logger.info("Loading tck.properties as a classpath resource, probable within uddi-tck-base.jar"); + logger.info("Loading tck.properties as a classpath resource, probably within uddi-tck-base.jar"); } tckProperties.load(inputSteam); } catch (IOException ioe) { http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java ---------------------------------------------------------------------- diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java index 8cf5a26..8259d6d 100644 --- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java +++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java @@ -54,7 +54,7 @@ public class TckPublisher { logger.info("Loading tck.properties from " + f.getAbsolutePath()); } else { inputSteam = TckPublisher.class.getResourceAsStream("/tck.properties"); - logger.info("Loading tck.properties as a classpath resource, probable within uddi-tck-base.jar"); + logger.info("Loading tck.properties as a classpath resource, probably within uddi-tck-base.jar"); } tckProperties.load(inputSteam); } catch (IOException ioe) { http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index 91d4c26..c3a6b15 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -177,10 +177,18 @@ <copy file="${basedir}/juddi_install_data_node2/UDDI_tModels.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/> <copy file="${basedir}/context.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/META-INF" overwrite="true"/> + <copy file="${basedir}/context.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/META-INF" overwrite="true"/> + <copy file="${basedir}/uddiNode2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddi-gui/WEB-INF/classes/META-INF/uddi.xml" overwrite="true"/> + <copy file="${basedir}/juddiv3Node2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true" /> + <copy file="${basedir}/juddiv3Node2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/WEB-INF/classes/juddiv3.xml" overwrite="true" /> + + + <copy file="${basedir}/juddiv3Node1.xml" tofile="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true" /> + <copy file="${basedir}/juddiv3Node1.xml" tofile="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/WEB-INF/classes/juddiv3.xml" overwrite="true" /> @@ -216,7 +224,7 @@ <cargo.logging>high</cargo.logging> <cargo.hostname>localhost</cargo.hostname> <cargo.servlet.port>8880</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed</cargo.jvmargs> + <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> </properties> </configuration> </configuration> @@ -242,7 +250,7 @@ <cargo.logging>high</cargo.logging> <cargo.hostname>localhost</cargo.hostname> <cargo.servlet.port>8980</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed</cargo.jvmargs> + <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> </properties> </configuration> </configuration> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck/server.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/server.xml b/uddi-tck/server.xml index 6c98bd7..d361fba 100644 --- a/uddi-tck/server.xml +++ b/uddi-tck/server.xml @@ -78,11 +78,13 @@ This connector uses the JSSE configuration, when using APR, the connector should be using the OpenSSL style configuration described in the APR documentation --> - <!-- + <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> - --> + clientAuth="want" sslProtocol="TLS" + truststoreFile="truststore.jks" truststorePass="password" + keystoreFile="conf/keystore.jks" keystorePass="password" + /> <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck/serverNode2.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/serverNode2.xml b/uddi-tck/serverNode2.xml index 1de8e6e..4f02569 100644 --- a/uddi-tck/serverNode2.xml +++ b/uddi-tck/serverNode2.xml @@ -84,6 +84,13 @@ clientAuth="false" sslProtocol="TLS" /> --> + <Connector port="9443" protocol="HTTP/1.1" SSLEnabled="true" + maxThreads="150" scheme="https" secure="true" + clientAuth="want" sslProtocol="TLS" + truststoreFile="truststore.jks" truststorePass="password" + keystoreFile="conf/keystore.jks" keystorePass="password" + /> + <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="9009" protocol="AJP/1.3" redirectPort="9443" /> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck/src/main/resources/META-INF/uddi.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/src/main/resources/META-INF/uddi.xml b/uddi-tck/src/main/resources/META-INF/uddi.xml index 0fdaff4..ec9e2a7 100644 --- a/uddi-tck/src/main/resources/META-INF/uddi.xml +++ b/uddi-tck/src/main/resources/META-INF/uddi.xml @@ -32,6 +32,7 @@ <properties> <property name="serverName" value="localhost" /> <property name="serverPort" value="8880" /> + <property name="serverSSLPort" value="8443" /> <!-- for UDDI nodes that use HTTP u/p, using the following <property name="basicAuthUsername" value="root" /> <property name="basicAuthPassword" value="password" /> @@ -48,7 +49,7 @@ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl> <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl> <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl> - <replicationUrl>http://${serverName}:${serverPort}/juddiv3/services/replication</replicationUrl> + <replicationUrl>https://${serverName}:${serverSSLPort}/juddiv3replication/services/replication</replicationUrl> <!-- this is just for juddi gui tests --> <juddigui>http://${serverName}:${serverPort}/juddi-gui/</juddigui> </node> @@ -60,6 +61,7 @@ <properties> <property name="serverName" value="localhost" /> <property name="serverPort" value="8980" /> + <property name="serverSSLPort" value="9443" /> <!-- for UDDI nodes that use HTTP u/p, using the following <property name="basicAuthUsername" value="root" /> <property name="basicAuthPassword" value="password" /> @@ -76,7 +78,7 @@ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl> <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl> <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl> - <replicationUrl>http://${serverName}:${serverPort}/juddiv3/services/replication</replicationUrl> + <replicationUrl>https://${serverName}:${serverSSLPort}/juddiv3replication/services/replication</replicationUrl> <!-- this is just for juddi gui tests --> <juddigui>http://${serverName}:${serverPort}/juddi-gui/</juddigui> </node> http://git-wip-us.apache.org/repos/asf/juddi/blob/5994cd06/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java index 47a3b29..e52e58c 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.juddi.v3.client.UDDIConstants; import org.apache.juddi.v3.client.UDDIService; import org.apache.juddi.v3.client.config.UDDIClient; +import org.apache.juddi.v3.client.cryptor.TransportSecurityHelper; import org.apache.juddi.v3.client.transport.Transport; import org.apache.juddi.v3_service.JUDDIApiPortType; import org.junit.AfterClass; @@ -107,8 +108,8 @@ public class JUDDI_300_MultiNodeIntegrationTest { private static UDDIPublicationPortType publishSamNode2; private static UDDIInquiryPortType inquiryMary; private static UDDIInquiryPortType inquirySamNode2; - private static UDDIReplicationPortType replicationMary; - private static UDDIReplicationPortType replicationSam; + //private static UDDIReplicationPortType replicationMary; + //private static UDDIReplicationPortType replicationSam; static TckBusiness maryBizNode1; static TckTModel maryTModelNode1; @@ -144,11 +145,12 @@ public class JUDDI_300_MultiNodeIntegrationTest { custodyMary = node1.getUDDICustodyTransferService(); inquiryMary = node1.getUDDIInquiryService(); publishMary = node1.getUDDIPublishService(); - UDDIService uddiService = new UDDIService(); + // UDDIService uddiService = new UDDIService(); - replicationMary = uddiService.getUDDIReplicationPort(); - - ((BindingProvider) replicationMary).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node1_MARY).getReplicationUrl()); + //replicationMary = uddiService.getUDDIReplicationPort(); + //((BindingProvider) replicationMary).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node1_MARY).getReplicationUrl()); + //TransportSecurityHelper.applyTransportSecurity((BindingProvider) replicationMary); + //logger.info("Using replication endpoint Node1...@" + ((BindingProvider)replicationMary).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); UDDISecurityPortType secNode1 = node1.getUDDISecurityService(); rootNode1Token = TckSecurity.getAuthToken(secNode1, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); maryTokenNode1 = TckSecurity.getAuthToken(secNode1, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); @@ -157,8 +159,11 @@ public class JUDDI_300_MultiNodeIntegrationTest { UDDISecurityPortType secNode2 = node2.getUDDISecurityService(); rootNode2Token = TckSecurity.getAuthToken(secNode2, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); samTokenNode2 = TckSecurity.getAuthToken(secNode2, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); - replicationSam = uddiService.getUDDIReplicationPort(); - ((BindingProvider) replicationSam).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node2_SAM).getReplicationUrl()); + //replicationSam = uddiService.getUDDIReplicationPort(); + //((BindingProvider) replicationSam).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node2_SAM).getReplicationUrl()); + //TransportSecurityHelper.applyTransportSecurity((BindingProvider) replicationSam); + //logger.info("Using replication endpoint Node2...@" + ((BindingProvider)replicationSam).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); + juddiApiServiceNode2 = node2.getJUDDIApiService(); custodySam = node2.getUDDICustodyTransferService(); inquirySamNode2 = node2.getUDDIInquiryService(); @@ -176,11 +181,11 @@ public class JUDDI_300_MultiNodeIntegrationTest { TckSecurity.setCredentials((BindingProvider) custodyMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); TckSecurity.setCredentials((BindingProvider) inquiryMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); TckSecurity.setCredentials((BindingProvider) publishMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); - TckSecurity.setCredentials((BindingProvider) replicationMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + //TckSecurity.setCredentials((BindingProvider) replicationMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); TckSecurity.setCredentials((BindingProvider) custodySam, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); TckSecurity.setCredentials((BindingProvider) inquirySamNode2, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); - TckSecurity.setCredentials((BindingProvider) replicationSam, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + //TckSecurity.setCredentials((BindingProvider) replicationSam, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); TckSecurity.setCredentials((BindingProvider) publishSamNode2, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); } @@ -248,9 +253,12 @@ public class JUDDI_300_MultiNodeIntegrationTest { Assert.fail(ex.getMessage()); } - if (replicationNode1.getCommunicationGraph() == null) { - replicationNode1.setCommunicationGraph(new CommunicationGraph()); - } + //if (replicationNode1.getCommunicationGraph() == null) { + replicationNode1.setCommunicationGraph(new CommunicationGraph()); + //} + + replicationNode1.getOperator().clear(); + replicationNode1.getSignature().clear(); Operator op = new Operator(); op.setOperatorNodeID("uddi:juddi.apache.org:node1"); @@ -259,9 +267,9 @@ public class JUDDI_300_MultiNodeIntegrationTest { op.getContact().add(new Contact()); op.getContact().get(0).getPersonName().add(new PersonName("bob", "en")); op.getContact().get(0).setUseType("admin"); - if (!Contains(replicationNode1.getOperator(), op)) { + //if (!Contains(replicationNode1.getOperator(), op)) { replicationNode1.getOperator().add(op); - } + //} op = new Operator(); op.setOperatorNodeID("uddi:another.juddi.apache.org:node2"); @@ -270,15 +278,16 @@ public class JUDDI_300_MultiNodeIntegrationTest { op.getContact().add(new Contact()); op.getContact().get(0).getPersonName().add(new PersonName("mary", "en")); op.getContact().get(0).setUseType("admin"); - if (!Contains(replicationNode1.getOperator(), op)) { + //if (!Contains(replicationNode1.getOperator(), op)) + { replicationNode1.getOperator().add(op); } - if (!replicationNode1.getCommunicationGraph().getNode().contains("uddi:another.juddi.apache.org:node2")) { + //if (!replicationNode1.getCommunicationGraph().getNode().contains("uddi:another.juddi.apache.org:node2")) { replicationNode1.getCommunicationGraph().getNode().add("uddi:another.juddi.apache.org:node2"); - } - if (!replicationNode1.getCommunicationGraph().getNode().contains("uddi:juddi.apache.org:node1")) { + //} + //if (!replicationNode1.getCommunicationGraph().getNode().contains("uddi:juddi.apache.org:node1")) { replicationNode1.getCommunicationGraph().getNode().add("uddi:juddi.apache.org:node1"); - } + //} replicationNode1.setSerialNumber(0L); replicationNode1.setTimeOfConfigurationUpdate(""); replicationNode1.setMaximumTimeToGetChanges(BigInteger.ONE); @@ -292,9 +301,12 @@ public class JUDDI_300_MultiNodeIntegrationTest { if (TckCommon.isDebug()) { JAXB.marshal(replicationNode1, System.out); } - logger.info("Setting replication config on Node 1..."); + + logger.info(manager.getClientConfig().getConfigurationFile() + " Setting replication config on Node 1...@" + ((BindingProvider) juddiApiServiceNode1).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); + logger.info("Setting replication url on Node 1...@" + manager.getClientConfig().getUDDINode(CFG_node1_MARY).getReplicationUrl()); juddiApiServiceNode1.setReplicationNodes(rootNode1Token, replicationNode1); - logger.info("Setting replication config on Node 2..."); + logger.info("Setting replication config on Node 2...@" + ((BindingProvider) juddiApiServiceNode2).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); + logger.info("Setting replication url on Node 2...@" + manager.getClientConfig().getUDDINode(CFG_node2_SAM).getReplicationUrl()); juddiApiServiceNode2.setReplicationNodes(rootNode2Token, replicationNode1); } catch (Exception ex) { @@ -702,14 +714,15 @@ public class JUDDI_300_MultiNodeIntegrationTest { while (timeout > 0) { logger.info("Waiting for the update..."); try { - + tModelDetail = inquirySamNode2.getTModelDetail(findTModel); Assert.assertNotNull(tModelDetail); Assert.assertNotNull(tModelDetail.getTModel()); Assert.assertNotNull(tModelDetail.getTModel().get(0)); Assert.assertEquals(tModelDetail.getTModel().get(0).getTModelKey(), TckTModel.MARY_PUBLISHER_TMODEL_KEY); - if (tModelDetail.getTModel().get(0).isDeleted()) + if (tModelDetail.getTModel().get(0).isDeleted()) { break; + } } catch (Exception ex) { logger.warn(ex.getMessage()); tModelDetail = null; @@ -760,9 +773,10 @@ public class JUDDI_300_MultiNodeIntegrationTest { resetBusinesses(); resetTmodels(); - try{ - samTModelNode2.saveTmodels(rootNode2Token); - }catch (Exception ex){} + try { + samTModelNode2.saveTmodels(rootNode2Token); + } catch (Exception ex) { + } samTModelNode2.saveSamSyndicatorTmodel(samTokenNode2); samBizNode2.saveSamSyndicatorBusiness(samTokenNode2); @@ -1005,10 +1019,10 @@ public class JUDDI_300_MultiNodeIntegrationTest { DeleteBusiness db = new DeleteBusiness(); db.setAuthInfo(samTokenNode2); db.getBusinessKey().add(TckBusiness.SAM_BUSINESS_KEY); - try{ - publishSamNode2.deleteBusiness(db); + try { + publishSamNode2.deleteBusiness(db); + } catch (Exception ex) { } - catch (Exception ex){} int timeout = TckPublisher.getSubscriptionTimeout(); GetBusinessDetail findTModel = new GetBusinessDetail(); findTModel.setAuthInfo(maryTokenNode1); @@ -1049,10 +1063,10 @@ public class JUDDI_300_MultiNodeIntegrationTest { * @throws Exception */ private void getReplicationStatus() throws Exception { - logger.info("Getting replication status....Mary's node1..."); - waitUntilSynched(replicationMary); - logger.info("Getting replication status....Sam's node2..."); - waitUntilSynched(replicationSam); + // logger.info("Getting replication status....Mary's node1..."); + // waitUntilSynched(replicationMary); + // logger.info("Getting replication status....Sam's node2..."); + // waitUntilSynched(replicationSam); } private void waitUntilSynched(UDDIReplicationPortType repl) throws Exception { @@ -1245,7 +1259,9 @@ public class JUDDI_300_MultiNodeIntegrationTest { * <a href="http://www.uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908178";>7.3.9</a> * for more info on collision detection * - * requires support for conditional new data inserts and concurrence from nodes. + * requires support for conditional new data inserts and concurrence + * from nodes. + * * @throws Exception */ @Test @@ -1256,9 +1272,8 @@ public class JUDDI_300_MultiNodeIntegrationTest { maryTModelNode1.saveMaryPublisherTmodel(maryTokenNode1); samTModelNode2.saveMaryPublisherTmodel(samTokenNode2); - - //TODO assert both records removed + //TODO assert both records removed } finally { resetTmodels(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
