cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1057393 [4/5] - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/common/logging/ common/common/src/test/java/org/apache/cxf/staxutils/resources/ distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/sample/test/ distr...
Date Mon, 10 Jan 2011 22:07:13 GMT
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java Mon Jan 10 22:07:10 2011
@@ -1,61 +1,61 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.https;
-
-import java.security.cert.X509Certificate;
-
-import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.http.MessageTrustDecider;
-import org.apache.cxf.transport.http.URLConnectionInfo;
-import org.apache.cxf.transport.http.UntrustedURLConnectionIOException;
-
-final class HttpsMessageTrustDecider extends MessageTrustDecider {
-    private final CertConstraints certConstraints;
-    private final MessageTrustDecider orig;
-
-    HttpsMessageTrustDecider(CertConstraints certConstraints,
-            MessageTrustDecider orig) {
-        this.certConstraints = certConstraints;
-        this.orig = orig;
-    }
-
-    public void establishTrust(String conduitName,
-            URLConnectionInfo connectionInfo,
-            Message message)
-        throws UntrustedURLConnectionIOException {
-        if (orig != null) {
-            orig.establishTrust(conduitName, connectionInfo, message);
-        }
-        HttpsURLConnectionInfo info = (HttpsURLConnectionInfo)connectionInfo;
-
-        if (info.getServerCertificates() == null 
-                || info.getServerCertificates().length == 0) {
-            throw new UntrustedURLConnectionIOException(
-                "No server certificates were found"
-            );
-        } else {
-            X509Certificate[] certs = (X509Certificate[])info.getServerCertificates();
-            if (!certConstraints.matches(certs[0])) {
-                throw new UntrustedURLConnectionIOException(
-                    "The server certificate(s) do not match the defined cert constraints"
-                );
-            }
-        }
-    }
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.https;
+
+import java.security.cert.X509Certificate;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.transport.http.MessageTrustDecider;
+import org.apache.cxf.transport.http.URLConnectionInfo;
+import org.apache.cxf.transport.http.UntrustedURLConnectionIOException;
+
+final class HttpsMessageTrustDecider extends MessageTrustDecider {
+    private final CertConstraints certConstraints;
+    private final MessageTrustDecider orig;
+
+    HttpsMessageTrustDecider(CertConstraints certConstraints,
+            MessageTrustDecider orig) {
+        this.certConstraints = certConstraints;
+        this.orig = orig;
+    }
+
+    public void establishTrust(String conduitName,
+            URLConnectionInfo connectionInfo,
+            Message message)
+        throws UntrustedURLConnectionIOException {
+        if (orig != null) {
+            orig.establishTrust(conduitName, connectionInfo, message);
+        }
+        HttpsURLConnectionInfo info = (HttpsURLConnectionInfo)connectionInfo;
+
+        if (info.getServerCertificates() == null 
+                || info.getServerCertificates().length == 0) {
+            throw new UntrustedURLConnectionIOException(
+                "No server certificates were found"
+            );
+        } else {
+            X509Certificate[] certs = (X509Certificate[])info.getServerCertificates();
+            if (!certConstraints.matches(certs[0])) {
+                throw new UntrustedURLConnectionIOException(
+                    "The server certificate(s) do not match the defined cert constraints"
+                );
+            }
+        }
+    }
 }
\ No newline at end of file

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java Mon Jan 10 22:07:10 2011
@@ -1,148 +1,148 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.servlet.servicelist;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.transport.AbstractDestination;
-
-public class FormattedServiceListWriter implements ServiceListWriter {
-    private String styleSheetPath;
-    private String title;
-    private Map<String, String> atomMap;
-
-    public FormattedServiceListWriter(String styleSheetPath, 
-                                      String title, 
-                                      Map<String, String> atomMap) {
-        this.styleSheetPath = styleSheetPath;
-        this.title = title;
-        this.atomMap = atomMap;
-    }
-
-    public String getContentType() {
-        return "text/html; charset=UTF-8";
-    }
-
-    public void writeServiceList(PrintWriter writer,
-                                 AbstractDestination[] soapDestinations,
-                                 AbstractDestination[] restDestinations) throws IOException {
-        writer.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" "
-                     + "\"http://www.w3.org/TR/html4/loose.dtd\">");
-        writer.write("<HTML><HEAD>");
-        writer.write("<LINK type=\"text/css\" rel=\"stylesheet\" href=\"" + styleSheetPath + "\">");
-        writer.write("<meta http-equiv=content-type content=\"text/html; charset=UTF-8\">");
-        if (title != null) {
-            writer.write("<title>" + title + "</title>");
-        } else {
-            writer.write("<title>CXF - Service list</title>");
-        }
-        writer.write("</head><body>");
-
-        if (soapDestinations.length > 0 || restDestinations.length > 0) {
-            writeSOAPEndpoints(writer, soapDestinations);
-            writeRESTfulEndpoints(writer, restDestinations);
-        } else {
-            writer.write("<span class=\"heading\">No services have been found.</span>");
-        }
-
-        writer.write("</body></html>");
-    }
-
-    private void writeSOAPEndpoints(PrintWriter writer, 
-                                    AbstractDestination[] destinations)
-        throws IOException {
-        writer.write("<span class=\"heading\">Available SOAP services:</span><br/>");
-        writer.write("<table>");
-        for (AbstractDestination sd : destinations) {
-            writerSoapEndpoint(writer, sd);
-        }
-        writer.write("</table><br/><br/>");
-    }
-
-    private void writerSoapEndpoint(PrintWriter writer, AbstractDestination sd) {
-        writer.write("<tr><td>");
-        writer.write("<span class=\"porttypename\">"
-                     + sd.getEndpointInfo().getInterface().getName().getLocalPart() + "</span>");
-        writer.write("<ul>");
-        for (OperationInfo oi : sd.getEndpointInfo().getInterface().getOperations()) {
-            if (oi.getProperty("operation.is.synthetic") != Boolean.TRUE) {
-                writer.write("<li>" + oi.getName().getLocalPart() + "</li>");
-            }
-        }
-        writer.write("</ul>");
-        writer.write("</td><td>");
-        String address = sd.getEndpointInfo().getAddress();
-        writer.write("<span class=\"field\">Endpoint address:</span> " + "<span class=\"value\">"
-                     + address + "</span>");
-        writer.write("<br/><span class=\"field\">WSDL :</span> " + "<a href=\"" + address
-                     + "?wsdl\">" + sd.getEndpointInfo().getService().getName() + "</a>");
-        writer.write("<br/><span class=\"field\">Target namespace:</span> "
-                     + "<span class=\"value\">"
-                     + sd.getEndpointInfo().getService().getTargetNamespace() + "</span>");
-        addAtomLinkIfNeeded(address, atomMap, writer);
-        writer.write("</td></tr>");
-    }
-
-    private void writeRESTfulEndpoints(PrintWriter writer, AbstractDestination[] restfulDests)
-        throws IOException {
-        writer.write("<span class=\"heading\">Available RESTful services:</span><br/>");
-        writer.write("<table>");
-        for (AbstractDestination sd : restfulDests) {
-            writeRESTfulEndpoint(writer, sd);
-        }
-        writer.write("</table>");
-    }
-
-    private void writeRESTfulEndpoint(PrintWriter writer, AbstractDestination sd) {
-        writer.write("<tr><td>");
-        String address = sd.getEndpointInfo().getAddress();
-        writer.write("<span class=\"field\">Endpoint address:</span> " + "<span class=\"value\">"
-                     + address + "</span>");
-        writer.write("<br/><span class=\"field\">WADL :</span> " + "<a href=\"" + address
-                     + "?_wadl&_type=xml\">" + address + "?_wadl&type=xml" + "</a>");
-        addAtomLinkIfNeeded(address, atomMap, writer);
-        writer.write("</td></tr>");
-    }
-
-    private static void addAtomLinkIfNeeded(String address, Map<String, String> extMap, PrintWriter pw) {
-        String atomAddress = getExtensionEndpointAddress(address, extMap);
-        if (atomAddress != null) {
-            pw.write("<br/><span class=\"field\">Atom Log Feed :</span> " + "<a href=\"" + atomAddress
-                     + "\">" + atomAddress + "</a>");
-        }
-    }
-
-    private static String getExtensionEndpointAddress(String endpointAddress, Map<String, String> extMap) {
-        if (extMap != null) {
-            for (Map.Entry<String, String> entry : extMap.entrySet()) {
-                if (endpointAddress.endsWith(entry.getKey())) {
-                    endpointAddress = endpointAddress.substring(0, endpointAddress.length()
-                                                                   - entry.getKey().length());
-                    endpointAddress += entry.getValue();
-                    return endpointAddress;
-                }
-            }
-        }
-        return null;
-    }
-
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.servlet.servicelist;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.transport.AbstractDestination;
+
+public class FormattedServiceListWriter implements ServiceListWriter {
+    private String styleSheetPath;
+    private String title;
+    private Map<String, String> atomMap;
+
+    public FormattedServiceListWriter(String styleSheetPath, 
+                                      String title, 
+                                      Map<String, String> atomMap) {
+        this.styleSheetPath = styleSheetPath;
+        this.title = title;
+        this.atomMap = atomMap;
+    }
+
+    public String getContentType() {
+        return "text/html; charset=UTF-8";
+    }
+
+    public void writeServiceList(PrintWriter writer,
+                                 AbstractDestination[] soapDestinations,
+                                 AbstractDestination[] restDestinations) throws IOException {
+        writer.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" "
+                     + "\"http://www.w3.org/TR/html4/loose.dtd\">");
+        writer.write("<HTML><HEAD>");
+        writer.write("<LINK type=\"text/css\" rel=\"stylesheet\" href=\"" + styleSheetPath + "\">");
+        writer.write("<meta http-equiv=content-type content=\"text/html; charset=UTF-8\">");
+        if (title != null) {
+            writer.write("<title>" + title + "</title>");
+        } else {
+            writer.write("<title>CXF - Service list</title>");
+        }
+        writer.write("</head><body>");
+
+        if (soapDestinations.length > 0 || restDestinations.length > 0) {
+            writeSOAPEndpoints(writer, soapDestinations);
+            writeRESTfulEndpoints(writer, restDestinations);
+        } else {
+            writer.write("<span class=\"heading\">No services have been found.</span>");
+        }
+
+        writer.write("</body></html>");
+    }
+
+    private void writeSOAPEndpoints(PrintWriter writer, 
+                                    AbstractDestination[] destinations)
+        throws IOException {
+        writer.write("<span class=\"heading\">Available SOAP services:</span><br/>");
+        writer.write("<table>");
+        for (AbstractDestination sd : destinations) {
+            writerSoapEndpoint(writer, sd);
+        }
+        writer.write("</table><br/><br/>");
+    }
+
+    private void writerSoapEndpoint(PrintWriter writer, AbstractDestination sd) {
+        writer.write("<tr><td>");
+        writer.write("<span class=\"porttypename\">"
+                     + sd.getEndpointInfo().getInterface().getName().getLocalPart() + "</span>");
+        writer.write("<ul>");
+        for (OperationInfo oi : sd.getEndpointInfo().getInterface().getOperations()) {
+            if (oi.getProperty("operation.is.synthetic") != Boolean.TRUE) {
+                writer.write("<li>" + oi.getName().getLocalPart() + "</li>");
+            }
+        }
+        writer.write("</ul>");
+        writer.write("</td><td>");
+        String address = sd.getEndpointInfo().getAddress();
+        writer.write("<span class=\"field\">Endpoint address:</span> " + "<span class=\"value\">"
+                     + address + "</span>");
+        writer.write("<br/><span class=\"field\">WSDL :</span> " + "<a href=\"" + address
+                     + "?wsdl\">" + sd.getEndpointInfo().getService().getName() + "</a>");
+        writer.write("<br/><span class=\"field\">Target namespace:</span> "
+                     + "<span class=\"value\">"
+                     + sd.getEndpointInfo().getService().getTargetNamespace() + "</span>");
+        addAtomLinkIfNeeded(address, atomMap, writer);
+        writer.write("</td></tr>");
+    }
+
+    private void writeRESTfulEndpoints(PrintWriter writer, AbstractDestination[] restfulDests)
+        throws IOException {
+        writer.write("<span class=\"heading\">Available RESTful services:</span><br/>");
+        writer.write("<table>");
+        for (AbstractDestination sd : restfulDests) {
+            writeRESTfulEndpoint(writer, sd);
+        }
+        writer.write("</table>");
+    }
+
+    private void writeRESTfulEndpoint(PrintWriter writer, AbstractDestination sd) {
+        writer.write("<tr><td>");
+        String address = sd.getEndpointInfo().getAddress();
+        writer.write("<span class=\"field\">Endpoint address:</span> " + "<span class=\"value\">"
+                     + address + "</span>");
+        writer.write("<br/><span class=\"field\">WADL :</span> " + "<a href=\"" + address
+                     + "?_wadl&_type=xml\">" + address + "?_wadl&type=xml" + "</a>");
+        addAtomLinkIfNeeded(address, atomMap, writer);
+        writer.write("</td></tr>");
+    }
+
+    private static void addAtomLinkIfNeeded(String address, Map<String, String> extMap, PrintWriter pw) {
+        String atomAddress = getExtensionEndpointAddress(address, extMap);
+        if (atomAddress != null) {
+            pw.write("<br/><span class=\"field\">Atom Log Feed :</span> " + "<a href=\"" + atomAddress
+                     + "\">" + atomAddress + "</a>");
+        }
+    }
+
+    private static String getExtensionEndpointAddress(String endpointAddress, Map<String, String> extMap) {
+        if (extMap != null) {
+            for (Map.Entry<String, String> entry : extMap.entrySet()) {
+                if (endpointAddress.endsWith(entry.getKey())) {
+                    endpointAddress = endpointAddress.substring(0, endpointAddress.length()
+                                                                   - entry.getKey().length());
+                    endpointAddress += entry.getValue();
+                    return endpointAddress;
+                }
+            }
+        }
+        return null;
+    }
+
+}

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java Mon Jan 10 22:07:10 2011
@@ -1,175 +1,175 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.servlet.servicelist;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.AbstractDestination;
-import org.apache.cxf.transport.http.DestinationRegistry;
-
-public class ServiceListGeneratorServlet extends HttpServlet {
-    private DestinationRegistry destinationRegistry;
-    private Bus bus;
-    private String serviceListStyleSheet;
-    private String title;
-
-    public ServiceListGeneratorServlet(DestinationRegistry destinationRegistry, Bus bus) {
-        this.destinationRegistry = destinationRegistry;
-        this.bus = bus;
-        this.title = "CXF - Service list";
-    }
-
-    public void setServiceListStyleSheet(String serviceListStyleSheet) {
-        this.serviceListStyleSheet = serviceListStyleSheet;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void service(HttpServletRequest request, 
-                        HttpServletResponse response) throws ServletException, IOException {
-        PrintWriter writer = response.getWriter();
-        AbstractDestination[] destinations = destinationRegistry.getSortedDestinations();
-        if (request.getParameter("stylesheet") != null) {
-            renderStyleSheet(request, response);
-            return;
-        }
-        List<String> privateEndpoints;
-        Map<String, String> atomMap;
-        
-        if (bus != null) {
-            privateEndpoints = (List<String>)bus.getProperty("org.apache.cxf.private.endpoints");
-            // TODO : we may introduce a bus extension instead
-
-            atomMap = (Map<String, String>)bus
-                .getProperty("org.apache.cxf.extensions.logging.atom.pull");
-        } else {
-            privateEndpoints = new ArrayList<String>();
-            atomMap = new HashMap<String, String>();
-        }
-        
-        AbstractDestination[] soapEndpoints = getSOAPEndpoints(destinations, privateEndpoints);
-        AbstractDestination[] restEndpoints = getRestEndpoints(destinations, privateEndpoints);
-        ServiceListWriter serviceListWriter;
-        if ("false".equals(request.getParameter("formatted"))) {
-            boolean renderWsdlList = "true".equals(request.getParameter("wsdlList"));
-            serviceListWriter = new UnformattedServiceListWriter(renderWsdlList);
-        } else {
-            String styleSheetPath;
-            if (serviceListStyleSheet != null) {
-                styleSheetPath = request.getContextPath() + "/" + serviceListStyleSheet;
-                
-            } else {
-                styleSheetPath = request.getRequestURI() + "/?stylesheet=1";
-            }
-            serviceListWriter = new FormattedServiceListWriter(styleSheetPath, title, atomMap);
-            
-        }
-        response.setContentType(serviceListWriter.getContentType());
-        serviceListWriter.writeServiceList(writer, soapEndpoints, restEndpoints);
-    }
-    
-
-    private boolean isPrivate(EndpointInfo ei, List<String> privateEndpoints) {
-        if (privateEndpoints != null) {
-            for (String s : privateEndpoints) {
-                if (ei.getAddress().endsWith(s)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private AbstractDestination[] getSOAPEndpoints(AbstractDestination[] destinations,
-                                                   List<String> privateEndpoints) {
-        List<AbstractDestination> soapEndpoints = new ArrayList<AbstractDestination>();
-        for (AbstractDestination sd : destinations) {
-            if (null != sd.getEndpointInfo().getName() && null != sd.getEndpointInfo().getInterface()
-                && !isPrivate(sd.getEndpointInfo(), privateEndpoints)) {
-                soapEndpoints.add(sd);
-            }
-        }
-        return soapEndpoints.toArray(new AbstractDestination[]{});
-    }
-    
-    private AbstractDestination[] getRestEndpoints(AbstractDestination[] destinations,
-                                                   List<String> privateEndpoints) {
-        List<AbstractDestination> restfulDests = new ArrayList<AbstractDestination>();
-        for (AbstractDestination sd : destinations) {
-            // use some more reasonable check - though this one seems to be the only option at the moment
-            if (null == sd.getEndpointInfo().getInterface()
-                && !isPrivate(sd.getEndpointInfo(), privateEndpoints)) {
-                restfulDests.add(sd);
-            }
-        }
-        return restfulDests.toArray(new AbstractDestination[]{});
-    }
-    
-
-    private void renderStyleSheet(HttpServletRequest request, HttpServletResponse response)
-        throws IOException {
-        response.setContentType("text/css; charset=UTF-8");
-        URL url = this.getClass().getResource("servicelist.css");
-        if (url != null) {
-            IOUtils.copy(url.openStream(), response.getOutputStream());
-        }
-    }
-
-    public void init(ServletConfig servletConfig) {
-        String configServiceListStyleSheet = servletConfig.getInitParameter("service-list-stylesheet");
-        if (configServiceListStyleSheet != null) {
-            this.serviceListStyleSheet = configServiceListStyleSheet;
-        }
-        String configTitle = servletConfig.getInitParameter("service-list-title");
-        if (configTitle != null) {
-            this.title = configTitle;
-        }
-    }
-
-    public ServletConfig getServletConfig() {
-        return null;
-    }
-
-    public String getServletInfo() {
-        return null;
-    }
-
-    public void destroy() { 
-    }
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.servlet.servicelist;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.AbstractDestination;
+import org.apache.cxf.transport.http.DestinationRegistry;
+
+public class ServiceListGeneratorServlet extends HttpServlet {
+    private DestinationRegistry destinationRegistry;
+    private Bus bus;
+    private String serviceListStyleSheet;
+    private String title;
+
+    public ServiceListGeneratorServlet(DestinationRegistry destinationRegistry, Bus bus) {
+        this.destinationRegistry = destinationRegistry;
+        this.bus = bus;
+        this.title = "CXF - Service list";
+    }
+
+    public void setServiceListStyleSheet(String serviceListStyleSheet) {
+        this.serviceListStyleSheet = serviceListStyleSheet;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void service(HttpServletRequest request, 
+                        HttpServletResponse response) throws ServletException, IOException {
+        PrintWriter writer = response.getWriter();
+        AbstractDestination[] destinations = destinationRegistry.getSortedDestinations();
+        if (request.getParameter("stylesheet") != null) {
+            renderStyleSheet(request, response);
+            return;
+        }
+        List<String> privateEndpoints;
+        Map<String, String> atomMap;
+        
+        if (bus != null) {
+            privateEndpoints = (List<String>)bus.getProperty("org.apache.cxf.private.endpoints");
+            // TODO : we may introduce a bus extension instead
+
+            atomMap = (Map<String, String>)bus
+                .getProperty("org.apache.cxf.extensions.logging.atom.pull");
+        } else {
+            privateEndpoints = new ArrayList<String>();
+            atomMap = new HashMap<String, String>();
+        }
+        
+        AbstractDestination[] soapEndpoints = getSOAPEndpoints(destinations, privateEndpoints);
+        AbstractDestination[] restEndpoints = getRestEndpoints(destinations, privateEndpoints);
+        ServiceListWriter serviceListWriter;
+        if ("false".equals(request.getParameter("formatted"))) {
+            boolean renderWsdlList = "true".equals(request.getParameter("wsdlList"));
+            serviceListWriter = new UnformattedServiceListWriter(renderWsdlList);
+        } else {
+            String styleSheetPath;
+            if (serviceListStyleSheet != null) {
+                styleSheetPath = request.getContextPath() + "/" + serviceListStyleSheet;
+                
+            } else {
+                styleSheetPath = request.getRequestURI() + "/?stylesheet=1";
+            }
+            serviceListWriter = new FormattedServiceListWriter(styleSheetPath, title, atomMap);
+            
+        }
+        response.setContentType(serviceListWriter.getContentType());
+        serviceListWriter.writeServiceList(writer, soapEndpoints, restEndpoints);
+    }
+    
+
+    private boolean isPrivate(EndpointInfo ei, List<String> privateEndpoints) {
+        if (privateEndpoints != null) {
+            for (String s : privateEndpoints) {
+                if (ei.getAddress().endsWith(s)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private AbstractDestination[] getSOAPEndpoints(AbstractDestination[] destinations,
+                                                   List<String> privateEndpoints) {
+        List<AbstractDestination> soapEndpoints = new ArrayList<AbstractDestination>();
+        for (AbstractDestination sd : destinations) {
+            if (null != sd.getEndpointInfo().getName() && null != sd.getEndpointInfo().getInterface()
+                && !isPrivate(sd.getEndpointInfo(), privateEndpoints)) {
+                soapEndpoints.add(sd);
+            }
+        }
+        return soapEndpoints.toArray(new AbstractDestination[]{});
+    }
+    
+    private AbstractDestination[] getRestEndpoints(AbstractDestination[] destinations,
+                                                   List<String> privateEndpoints) {
+        List<AbstractDestination> restfulDests = new ArrayList<AbstractDestination>();
+        for (AbstractDestination sd : destinations) {
+            // use some more reasonable check - though this one seems to be the only option at the moment
+            if (null == sd.getEndpointInfo().getInterface()
+                && !isPrivate(sd.getEndpointInfo(), privateEndpoints)) {
+                restfulDests.add(sd);
+            }
+        }
+        return restfulDests.toArray(new AbstractDestination[]{});
+    }
+    
+
+    private void renderStyleSheet(HttpServletRequest request, HttpServletResponse response)
+        throws IOException {
+        response.setContentType("text/css; charset=UTF-8");
+        URL url = this.getClass().getResource("servicelist.css");
+        if (url != null) {
+            IOUtils.copy(url.openStream(), response.getOutputStream());
+        }
+    }
+
+    public void init(ServletConfig servletConfig) {
+        String configServiceListStyleSheet = servletConfig.getInitParameter("service-list-stylesheet");
+        if (configServiceListStyleSheet != null) {
+            this.serviceListStyleSheet = configServiceListStyleSheet;
+        }
+        String configTitle = servletConfig.getInitParameter("service-list-title");
+        if (configTitle != null) {
+            this.title = configTitle;
+        }
+    }
+
+    public ServletConfig getServletConfig() {
+        return null;
+    }
+
+    public String getServletInfo() {
+        return null;
+    }
+
+    public void destroy() { 
+    }
+}

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListWriter.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListWriter.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListWriter.java Mon Jan 10 22:07:10 2011
@@ -1,32 +1,32 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.servlet.servicelist;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import org.apache.cxf.transport.AbstractDestination;
-
-public interface ServiceListWriter {
-    String getContentType();
-    void writeServiceList(PrintWriter writer, 
-                          AbstractDestination[] soapDestinations,
-                          AbstractDestination[] restDestinations) throws IOException;
-    
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.servlet.servicelist;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import org.apache.cxf.transport.AbstractDestination;
+
+public interface ServiceListWriter {
+    String getContentType();
+    void writeServiceList(PrintWriter writer, 
+                          AbstractDestination[] soapDestinations,
+                          AbstractDestination[] restDestinations) throws IOException;
+    
+}

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListWriter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java Mon Jan 10 22:07:10 2011
@@ -1,70 +1,70 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.servlet.servicelist;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import org.apache.cxf.transport.AbstractDestination;
-
-public class UnformattedServiceListWriter implements ServiceListWriter {
-    boolean renderWsdlList;
-
-    public UnformattedServiceListWriter(boolean renderWsdlList) {
-        this.renderWsdlList = renderWsdlList;
-    }
-
-    public String getContentType() {
-        return "text/plain; charset=UTF-8";
-    }
-
-    public void writeServiceList(PrintWriter writer, 
-                                 AbstractDestination[] soapDestinations,
-                                 AbstractDestination[] restDestinations) throws IOException {
-        if (soapDestinations.length > 0 && restDestinations.length > 0) {
-            writeUnformattedSOAPEndpoints(writer, soapDestinations);
-            writeUnformattedRESTfulEndpoints(writer, restDestinations);
-        } else {
-            writer.write("No services have been found.");
-        }
-    }
-    
-    private void writeUnformattedSOAPEndpoints(PrintWriter writer,
-                                               AbstractDestination[] destinations) throws IOException {
-        for (AbstractDestination sd : destinations) {
-            String address = sd.getEndpointInfo().getAddress();
-            writer.write(address);
-
-            if (renderWsdlList) {
-                writer.write("?wsdl");
-            }
-            writer.write('\n');
-        }
-        writer.write('\n');
-    }
-
-    private void writeUnformattedRESTfulEndpoints(PrintWriter writer,
-                                                  AbstractDestination[] destinations) throws IOException {
-        for (AbstractDestination sd : destinations) {
-            String address = sd.getEndpointInfo().getAddress();
-            writer.write(address + "?_wadl&_type=xml\n");
-        }
-    }
-
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.servlet.servicelist;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import org.apache.cxf.transport.AbstractDestination;
+
+public class UnformattedServiceListWriter implements ServiceListWriter {
+    boolean renderWsdlList;
+
+    public UnformattedServiceListWriter(boolean renderWsdlList) {
+        this.renderWsdlList = renderWsdlList;
+    }
+
+    public String getContentType() {
+        return "text/plain; charset=UTF-8";
+    }
+
+    public void writeServiceList(PrintWriter writer, 
+                                 AbstractDestination[] soapDestinations,
+                                 AbstractDestination[] restDestinations) throws IOException {
+        if (soapDestinations.length > 0 && restDestinations.length > 0) {
+            writeUnformattedSOAPEndpoints(writer, soapDestinations);
+            writeUnformattedRESTfulEndpoints(writer, restDestinations);
+        } else {
+            writer.write("No services have been found.");
+        }
+    }
+    
+    private void writeUnformattedSOAPEndpoints(PrintWriter writer,
+                                               AbstractDestination[] destinations) throws IOException {
+        for (AbstractDestination sd : destinations) {
+            String address = sd.getEndpointInfo().getAddress();
+            writer.write(address);
+
+            if (renderWsdlList) {
+                writer.write("?wsdl");
+            }
+            writer.write('\n');
+        }
+        writer.write('\n');
+    }
+
+    private void writeUnformattedRESTfulEndpoints(PrintWriter writer,
+                                                  AbstractDestination[] destinations) throws IOException {
+        for (AbstractDestination sd : destinations) {
+            String address = sd.getEndpointInfo().getAddress();
+            writer.write(address + "?_wadl&_type=xml\n");
+        }
+    }
+
+}

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DigestAuthSupplierTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DigestAuthSupplierTest.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DigestAuthSupplierTest.java (original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DigestAuthSupplierTest.java Mon Jan 10 22:07:10 2011
@@ -1,100 +1,100 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.http;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.cxf.configuration.security.AuthorizationPolicy;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.transport.http.auth.DigestAuthSupplier;
-import org.apache.cxf.transport.http.auth.HttpAuthHeader;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class DigestAuthSupplierTest {
-
-    /**
-     * Tests that parseHeader correctly parses parameters that contain ==
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCXF2370() throws Exception {
-        String origNonce = "MTI0ODg3OTc5NzE2OTplZGUyYTg0Yzk2NTFkY2YyNjc1Y2JjZjU2MTUzZmQyYw==";
-        String fullHeader = "Digest realm=\"MyCompany realm.\", qop=\"auth\"," + "nonce=\"" + origNonce
-                            + "\"";
-        Map<String, String> map = new HttpAuthHeader(fullHeader).getParams();
-        assertEquals(origNonce, map.get("nonce"));
-        assertEquals("auth", map.get("qop"));
-        assertEquals("MyCompany realm.", map.get("realm"));
-    }
-
-    @Test
-    public void testEncode() throws MalformedURLException {
-        String origNonce = "MTI0ODg3OTc5NzE2OTplZGUyYTg0Yzk2NTFkY2YyNjc1Y2JjZjU2MTUzZmQyYw==";
-        String fullHeader = "Digest realm=\"MyCompany realm.\", qop=\"auth\"," + "nonce=\"" + origNonce
-                            + "\"";
-        
-        /**
-         * Initialize DigestAuthSupplier that always uses the same cnonce so we always
-         * get the same response
-         */
-        DigestAuthSupplier authSupplier = new DigestAuthSupplier() {
-
-            @Override
-            public String createCnonce() throws UnsupportedEncodingException {
-                return "27db039b76362f3d55da10652baee38c";
-            }
-            
-        };
-        IMocksControl control = EasyMock.createControl();
-        AuthorizationPolicy authorizationPolicy = new AuthorizationPolicy();
-        authorizationPolicy.setUserName("testUser");
-        authorizationPolicy.setPassword("testPassword");
-        URL url = new URL("http://myserver");
-        Message message = new MessageImpl();
-        control.replay();
-        
-        String authToken = authSupplier
-            .getAuthorization(authorizationPolicy, url, message, fullHeader);
-        HttpAuthHeader authHeader = new HttpAuthHeader(authToken);
-        assertEquals("Digest", authHeader.getAuthType());
-        Map<String, String> params = authHeader.getParams();
-        Map<String, String> expectedParams = new HashMap<String, String>();
-        expectedParams.put("response", "28e616b6868f60aaf9b19bb5b172f076");
-        expectedParams.put("cnonce", "27db039b76362f3d55da10652baee38c");
-        expectedParams.put("username", "testUser");
-        expectedParams.put("nc", "00000001");
-        expectedParams.put("nonce", "MTI0ODg3OTc5NzE2OTplZGUyYTg0Yzk2NTFkY2YyNjc1Y2JjZjU2MTUzZmQyYw==");
-        expectedParams.put("realm", "MyCompany realm.");
-        expectedParams.put("qop", "auth");
-        expectedParams.put("uri", "");
-        assertEquals(expectedParams, params);
-        control.verify();
-    }
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.http;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.transport.http.auth.DigestAuthSupplier;
+import org.apache.cxf.transport.http.auth.HttpAuthHeader;
+import org.easymock.classextension.EasyMock;
+import org.easymock.classextension.IMocksControl;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DigestAuthSupplierTest {
+
+    /**
+     * Tests that parseHeader correctly parses parameters that contain ==
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testCXF2370() throws Exception {
+        String origNonce = "MTI0ODg3OTc5NzE2OTplZGUyYTg0Yzk2NTFkY2YyNjc1Y2JjZjU2MTUzZmQyYw==";
+        String fullHeader = "Digest realm=\"MyCompany realm.\", qop=\"auth\"," + "nonce=\"" + origNonce
+                            + "\"";
+        Map<String, String> map = new HttpAuthHeader(fullHeader).getParams();
+        assertEquals(origNonce, map.get("nonce"));
+        assertEquals("auth", map.get("qop"));
+        assertEquals("MyCompany realm.", map.get("realm"));
+    }
+
+    @Test
+    public void testEncode() throws MalformedURLException {
+        String origNonce = "MTI0ODg3OTc5NzE2OTplZGUyYTg0Yzk2NTFkY2YyNjc1Y2JjZjU2MTUzZmQyYw==";
+        String fullHeader = "Digest realm=\"MyCompany realm.\", qop=\"auth\"," + "nonce=\"" + origNonce
+                            + "\"";
+        
+        /**
+         * Initialize DigestAuthSupplier that always uses the same cnonce so we always
+         * get the same response
+         */
+        DigestAuthSupplier authSupplier = new DigestAuthSupplier() {
+
+            @Override
+            public String createCnonce() throws UnsupportedEncodingException {
+                return "27db039b76362f3d55da10652baee38c";
+            }
+            
+        };
+        IMocksControl control = EasyMock.createControl();
+        AuthorizationPolicy authorizationPolicy = new AuthorizationPolicy();
+        authorizationPolicy.setUserName("testUser");
+        authorizationPolicy.setPassword("testPassword");
+        URL url = new URL("http://myserver");
+        Message message = new MessageImpl();
+        control.replay();
+        
+        String authToken = authSupplier
+            .getAuthorization(authorizationPolicy, url, message, fullHeader);
+        HttpAuthHeader authHeader = new HttpAuthHeader(authToken);
+        assertEquals("Digest", authHeader.getAuthType());
+        Map<String, String> params = authHeader.getParams();
+        Map<String, String> expectedParams = new HashMap<String, String>();
+        expectedParams.put("response", "28e616b6868f60aaf9b19bb5b172f076");
+        expectedParams.put("cnonce", "27db039b76362f3d55da10652baee38c");
+        expectedParams.put("username", "testUser");
+        expectedParams.put("nc", "00000001");
+        expectedParams.put("nonce", "MTI0ODg3OTc5NzE2OTplZGUyYTg0Yzk2NTFkY2YyNjc1Y2JjZjU2MTUzZmQyYw==");
+        expectedParams.put("realm", "MyCompany realm.");
+        expectedParams.put("qop", "auth");
+        expectedParams.put("uri", "");
+        assertEquals(expectedParams, params);
+        control.verify();
+    }
+}

Propchange: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DigestAuthSupplierTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DigestAuthSupplierTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HttpAuthHeaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HttpAuthHeaderTest.java?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HttpAuthHeaderTest.java (original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HttpAuthHeaderTest.java Mon Jan 10 22:07:10 2011
@@ -1,42 +1,42 @@
-/**
- * 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.
- */
-package org.apache.cxf.transport.http;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.cxf.transport.http.auth.HttpAuthHeader;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class HttpAuthHeaderTest {
-
-    @Test
-    public void testParse() {
-        HttpAuthHeader authHeader = new HttpAuthHeader("Digest nonce=\"TUzZmQyYw==\", username=\"testUser\"");
-        assertEquals("Digest", authHeader.getAuthType());
-        Map<String, String> params = authHeader.getParams();
-        Map<String, String> expectedParams = new HashMap<String, String>();
-        expectedParams.put("username", "testUser");
-        expectedParams.put("nonce", "TUzZmQyYw==");
-        assertEquals(expectedParams, params);
-    }
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.transport.http;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cxf.transport.http.auth.HttpAuthHeader;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class HttpAuthHeaderTest {
+
+    @Test
+    public void testParse() {
+        HttpAuthHeader authHeader = new HttpAuthHeader("Digest nonce=\"TUzZmQyYw==\", username=\"testUser\"");
+        assertEquals("Digest", authHeader.getAuthType());
+        Map<String, String> params = authHeader.getParams();
+        Map<String, String> expectedParams = new HashMap<String, String>();
+        expectedParams.put("username", "testUser");
+        expectedParams.put("nonce", "TUzZmQyYw==");
+        assertEquals(expectedParams, params);
+    }
+}

Propchange: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HttpAuthHeaderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HttpAuthHeaderTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/DefaultMessageIdCache.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/example-sts-issued-saml-assertion.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/example-sts-issued-saml-assertion.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_Basic256Sha256_policy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_Basic256Sha256_policy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_with_sst_issued_token_policy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_with_sst_issued_token_policy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/transport_binding_policy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/transport_binding_policy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/wss-242.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/wss-242.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/systests/container-integration/grizzly/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/container-integration/grizzly/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/container-integration/grizzly/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/HugeResponseInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/HugeResponseInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/MalformedResponseInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/MalformedResponseInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespBreakThreshold.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespBreakThreshold.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespBreakThreshold.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestMustUnderstandHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestMustUnderstandHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd (original)
+++ cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd Mon Jan 10 22:07:10 2011
@@ -1,36 +1,36 @@
-<?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.
-        -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
-	<xsd:element name="ckRequete" type="ckRequeteType">
-	</xsd:element>
-	<xsd:complexType name="requeteIdType">
-		<xsd:attribute name="id" type="GUIDType" use="required">
-		</xsd:attribute>
-	</xsd:complexType>
-	<xsd:simpleType name="GUIDType">
-		<xsd:restriction base="xsd:string">
-		     <xsd:maxLength value="10" />
-                </xsd:restriction>
-	</xsd:simpleType>
-	
-	<xsd:complexType name="ckRequeteType">
-		<xsd:sequence>
-			<xsd:element name="requete" type="requeteIdType">
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
+<?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.
+        -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
+	<xsd:element name="ckRequete" type="ckRequeteType">
+	</xsd:element>
+	<xsd:complexType name="requeteIdType">
+		<xsd:attribute name="id" type="GUIDType" use="required">
+		</xsd:attribute>
+	</xsd:complexType>
+	<xsd:simpleType name="GUIDType">
+		<xsd:restriction base="xsd:string">
+		     <xsd:maxLength value="10" />
+                </xsd:restriction>
+	</xsd:simpleType>
+	
+	<xsd:complexType name="ckRequeteType">
+		<xsd:sequence>
+			<xsd:element name="requete" type="requeteIdType">
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+</xsd:schema>

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd (original)
+++ cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd Mon Jan 10 22:07:10 2011
@@ -1,62 +1,62 @@
-<?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.
-        -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
-	
-	<xsd:complexType name="ckReponseType">
-		<xsd:sequence>
-			<xsd:element name="produit" type="produitPosteActionType" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="produitPosteActionType">
-		<xsd:sequence>
-			<xsd:element name="action" type="actionCheckMajType"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="actionCheckMajType">
-		<xsd:attribute name="status" type="statusType" use="required"/>
-	</xsd:complexType>
-	<xsd:simpleType name="statusType">
-		<xsd:restriction base="xsd:int">
-			<xsd:enumeration value="0">
-				<xsd:annotation>
-					<xsd:documentation>Aucune</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="1">
-				<xsd:annotation>
-					<xsd:documentation>Installation</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="2">
-				<xsd:annotation>
-					<xsd:documentation>mis a jour</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="3">
-				<xsd:annotation>
-					<xsd:documentation>inconnu</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="4">
-				<xsd:annotation>
-					<xsd:documentation>Erreur</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
+<?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.
+        -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
+	
+	<xsd:complexType name="ckReponseType">
+		<xsd:sequence>
+			<xsd:element name="produit" type="produitPosteActionType" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="produitPosteActionType">
+		<xsd:sequence>
+			<xsd:element name="action" type="actionCheckMajType"/>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="actionCheckMajType">
+		<xsd:attribute name="status" type="statusType" use="required"/>
+	</xsd:complexType>
+	<xsd:simpleType name="statusType">
+		<xsd:restriction base="xsd:int">
+			<xsd:enumeration value="0">
+				<xsd:annotation>
+					<xsd:documentation>Aucune</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="1">
+				<xsd:annotation>
+					<xsd:documentation>Installation</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="2">
+				<xsd:annotation>
+					<xsd:documentation>mis a jour</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="3">
+				<xsd:annotation>
+					<xsd:documentation>inconnu</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="4">
+				<xsd:annotation>
+					<xsd:documentation>Erreur</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
+</xsd:schema>

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd?rev=1057393&r1=1057392&r2=1057393&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd (original)
+++ cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd Mon Jan 10 22:07:10 2011
@@ -1,21 +1,21 @@
-<?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.
-        -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
-	<xsd:include schemaLocation="response-in.xsd"/>
-	<xsd:element name="ckReponse" type="ckReponseType">
-	</xsd:element>
-</xsd:schema>
+<?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.
+        -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
+	<xsd:include schemaLocation="response-in.xsd"/>
+	<xsd:element name="ckReponse" type="ckReponseType">
+	</xsd:element>
+</xsd:schema>

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message