svn commit: r596221 - in /incubator/cxf/trunk/tools/wsdlto: core/src/main/java/org/apache/cxf/tools/wsdlto/ frontend/jaxws/src/main/resources/META-INF/

[em...@apache.org]

Author: ema
Date: Mon Nov 19 00:25:08 2007
New Revision: 596221

URL: http://svn.apache.org/viewvc?rev=596221&view=rev
Log:
Renamed service.validator.xml to avoid loading the same name file from cxf-rt-bindings-xml.jar when it is placed in classpath before cxf-tools-frontend-jaxws.jar.

Added:
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml
Removed:
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/service.validator.xml
Modified:
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=596221&r1=596220&r2=596221&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Mon Nov 19 00:25:08 2007
@@ -72,7 +72,7 @@
 
     protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToJavaContainer.class);
     private static final String DEFAULT_NS2PACKAGE = "http://www.w3.org/2005/08/addressing";
-    private static final String SERVICE_VALIDATOR = "META-INF/service.validator.xml";
+    private static final String SERVICE_VALIDATOR = "META-INF/tools.service.validator.xml";
     String toolName;
 
     public WSDLToJavaContainer(String name, ToolSpec toolspec) throws Exception {

Added: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml?rev=596221&view=auto
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml (added)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml Mon Nov 19 00:25:08 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you 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 properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry>
+    <entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry>
+</properties>