cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r630380 [1/2] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/service/model/ api/src/main/java/org/apache/cxf/transport/ api/src/test/java/org/apache/cxf/ common/common/src/main/java/org/apache/...
Date Sat, 23 Feb 2008 02:46:17 GMT
Author: dkulp
Date: Fri Feb 22 18:46:14 2008
New Revision: 630380

URL: http://svn.apache.org/viewvc?rev=630380&view=rev
Log:
Fix some of the svn properties.  (more to come)

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java   (contents, props changed)
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java   (contents, props changed)
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java   (contents, props changed)
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java   (contents, props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java   (props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java   (props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java   (props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java   (contents, props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java   (contents, props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java   (contents, props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java   (contents, props changed)
    incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java   (contents, props changed)
    incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat   (contents, props changed)
    incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat   (contents, props changed)
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2js.bat   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/README.txt   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/HelloWorld.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/client-beans.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/web.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt   (contents, props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/build.xml   (contents, props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/client/Client.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorldImpl.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/Server.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/README.txt   (contents, props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/build.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/client/Client.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/server/HelloWorld.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/server/HelloWorldImpl.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/server/Server.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/wsdl/cxf-servlet.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/bin/gencerts.sh   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/README.txt   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/build.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/HelloWorld.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/Client.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/client-beans.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/servlet/Server.java   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/beans-ruby.xml   (props changed)
    incubator/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/web.xml   (props changed)

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java Fri Feb 22 18:46:14 2008
@@ -1,78 +1,78 @@
-/**
- * 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;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
-
-/***
- * Only public/static/final fields can be resolved
- * The prefix MUST ends with _PREFIX
- * Namespace MUST starts with NS_
- * The value of the _PREFIX is the suffix of NS_
- 
- e.g
-    public static final String WSAW_PREFIX = "wsaw";
-    public static final String NS_WSAW = "http://www.w3.org/2006/05/addressing/wsdl"; 
-***/
-
-public final class NSManager {
-    private final Map<String, String> cache = new HashMap<String, String>();
-
-
-    public NSManager() {
-        resolveConstants(JAXWSAConstants.class);
-        resolveConstants(WSDLConstants.class);
-    }
-
-    private void resolveConstants(final Class clz) {
-        for (Field field : clz.getFields()) {
-            if (field.getName().endsWith("_PREFIX") && isPulicStaticFinal(field)) {
-                try {
-                    String prefix = (String) field.get(clz);
-                    Field nsField = clz.getField("NS_" + prefix.toUpperCase());
-                    if (nsField != null) {
-                        cache.put((String)nsField.get(clz), prefix);
-                    }
-                } catch (Exception e) {
-                    // ignore
-                }
-            }
-        }
-    }
-
-    public String getPrefixFromNS(String namespace) {
-        return cache.get(namespace);
-    }
-
-    private boolean isPulicStaticFinal(final Field field) {
-        return field.getModifiers() == (Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL);
-    }
-
-    public Set<String> getNamespaces() {
-        return this.cache.keySet();
-    }
+/**
+ * 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;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
+
+/***
+ * Only public/static/final fields can be resolved
+ * The prefix MUST ends with _PREFIX
+ * Namespace MUST starts with NS_
+ * The value of the _PREFIX is the suffix of NS_
+ 
+ e.g
+    public static final String WSAW_PREFIX = "wsaw";
+    public static final String NS_WSAW = "http://www.w3.org/2006/05/addressing/wsdl"; 
+***/
+
+public final class NSManager {
+    private final Map<String, String> cache = new HashMap<String, String>();
+
+
+    public NSManager() {
+        resolveConstants(JAXWSAConstants.class);
+        resolveConstants(WSDLConstants.class);
+    }
+
+    private void resolveConstants(final Class clz) {
+        for (Field field : clz.getFields()) {
+            if (field.getName().endsWith("_PREFIX") && isPulicStaticFinal(field)) {
+                try {
+                    String prefix = (String) field.get(clz);
+                    Field nsField = clz.getField("NS_" + prefix.toUpperCase());
+                    if (nsField != null) {
+                        cache.put((String)nsField.get(clz), prefix);
+                    }
+                } catch (Exception e) {
+                    // ignore
+                }
+            }
+        }
+    }
+
+    public String getPrefixFromNS(String namespace) {
+        return cache.get(namespace);
+    }
+
+    private boolean isPulicStaticFinal(final Field field) {
+        return field.getModifiers() == (Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL);
+    }
+
+    public Set<String> getNamespaces() {
+        return this.cache.keySet();
+    }
 }

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java Fri Feb 22 18:46:14 2008
@@ -1,29 +1,29 @@
-/**
- * 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.service.model;
-
-import javax.xml.namespace.QName;
-
-/**
- * All elements of the service model that are named by a QName implement this interface.
- */
-public interface NamedItem {
-    QName getName();
-}
+/**
+ * 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.service.model;
+
+import javax.xml.namespace.QName;
+
+/**
+ * All elements of the service model that are named by a QName implement this interface.
+ */
+public interface NamedItem {
+    QName getName();
+}

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/NamedItem.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java Fri Feb 22 18:46:14 2008
@@ -1,33 +1,33 @@
-/**
- * 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;
-
-import org.apache.cxf.service.model.EndpointInfo;
-
-/**
- * A destination that has a specific endpoint.
- */
-public interface DestinationWithEndpoint {
-    /**
-     * Return the ServiceModel endpoint description for this destination.
-     * @return the endpoint description.
-     */
-    EndpointInfo getEndpointInfo();
-}
+/**
+ * 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;
+
+import org.apache.cxf.service.model.EndpointInfo;
+
+/**
+ * A destination that has a specific endpoint.
+ */
+public interface DestinationWithEndpoint {
+    /**
+     * Return the ServiceModel endpoint description for this destination.
+     * @return the endpoint description.
+     */
+    EndpointInfo getEndpointInfo();
+}

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/transport/DestinationWithEndpoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java Fri Feb 22 18:46:14 2008
@@ -1,36 +1,36 @@
-/**
- * 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;
-
-import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class NSManagerTest extends Assert {
-    @Test
-    public void testGetPrefix() {
-        NSManager nsMan = new NSManager();
-        assertEquals("wsaw", nsMan.getPrefixFromNS(JAXWSAConstants.NS_WSAW));
-
-        assertEquals("soap", nsMan.getPrefixFromNS(WSDLConstants.NS_SOAP));
-        assertEquals("soap12", nsMan.getPrefixFromNS(WSDLConstants.NS_SOAP12));
-    }
+/**
+ * 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;
+
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NSManagerTest extends Assert {
+    @Test
+    public void testGetPrefix() {
+        NSManager nsMan = new NSManager();
+        assertEquals("wsaw", nsMan.getPrefixFromNS(JAXWSAConstants.NS_WSAW));
+
+        assertEquals("soap", nsMan.getPrefixFromNS(WSDLConstants.NS_SOAP));
+        assertEquals("soap12", nsMan.getPrefixFromNS(WSDLConstants.NS_SOAP12));
+    }
 }

Propchange: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java Fri Feb 22 18:46:14 2008
@@ -1,54 +1,54 @@
-/**
- * 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.common.xmlschema;
-
-/**
- * Exception thrown when we detect an attempt to set an impossible XML Schema reference. 
- */
-public class InvalidXmlSchemaReferenceException extends RuntimeException {
-
-    /**
-     * 
-     */
-    public InvalidXmlSchemaReferenceException() {
-    }
-
-    /**
-     * @param message
-     */
-    public InvalidXmlSchemaReferenceException(String message) {
-        super(message);
-    }
-
-    /**
-     * @param cause
-     */
-    public InvalidXmlSchemaReferenceException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public InvalidXmlSchemaReferenceException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+/**
+ * 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.common.xmlschema;
+
+/**
+ * Exception thrown when we detect an attempt to set an impossible XML Schema reference. 
+ */
+public class InvalidXmlSchemaReferenceException extends RuntimeException {
+
+    /**
+     * 
+     */
+    public InvalidXmlSchemaReferenceException() {
+    }
+
+    /**
+     * @param message
+     */
+    public InvalidXmlSchemaReferenceException(String message) {
+        super(message);
+    }
+
+    /**
+     * @param cause
+     */
+    public InvalidXmlSchemaReferenceException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public InvalidXmlSchemaReferenceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java Fri Feb 22 18:46:14 2008
@@ -1,235 +1,235 @@
-/**
- * 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.common.xmlschema;
-
-import java.io.Reader;
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.xml.sax.InputSource;
-
-import org.apache.ws.commons.schema.ValidationEventHandler;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
-import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.apache.ws.commons.schema.utils.NamespacePrefixList;
-import org.apache.ws.commons.schema.utils.TargetNamespaceValidator;
-
-/**
- * Wrapper class for XmlSchemaCollection that deals with various quirks and bugs.
- * One bug is WSCOMMONS-272.
- */
-public class SchemaCollection {
-    
-    private XmlSchemaCollection schemaCollection;
-    
-    public SchemaCollection() {
-        this(new XmlSchemaCollection());
-    }
-    
-    public SchemaCollection(XmlSchemaCollection col) {
-        schemaCollection = col;
-        col.getExtReg().setDefaultExtensionDeserializer(new FixedExtensionDeserializer());
-        if (schemaCollection.getNamespaceContext() == null) {
-        //      an empty prefix map avoids extra checks for null.
-            schemaCollection.setNamespaceContext(new NamespaceMap());
-        }
-    }
-
-    public boolean equals(Object obj) {
-        return schemaCollection.equals(obj);
-    }
-
-    public XmlSchemaElement getElementByQName(QName qname) {
-        return schemaCollection.getElementByQName(qname);
-    }
-
-    public ExtensionRegistry getExtReg() {
-        return schemaCollection.getExtReg();
-    }
-
-    public NamespacePrefixList getNamespaceContext() {
-        return schemaCollection.getNamespaceContext();
-    }
-
-    public XmlSchemaType getTypeByQName(QName schemaTypeName) {
-        return schemaCollection.getTypeByQName(schemaTypeName);
-    }
-
-    public XmlSchema[] getXmlSchema(String systemId) {
-        return schemaCollection.getXmlSchema(systemId);
-    }
-
-    public XmlSchema[] getXmlSchemas() {
-        return schemaCollection.getXmlSchemas();
-    }
-
-    public int hashCode() {
-        return schemaCollection.hashCode();
-    }
-
-    public void init() {
-        schemaCollection.init();
-    }
-
-    public XmlSchema read(Document doc, String uri, ValidationEventHandler veh,
-                          TargetNamespaceValidator validator) {
-        return schemaCollection.read(doc, uri, veh, validator);
-    }
-
-    public XmlSchema read(Document doc, String uri, ValidationEventHandler veh) {
-        return schemaCollection.read(doc, uri, veh);
-    }
-
-    public XmlSchema read(Document doc, ValidationEventHandler veh) {
-        return schemaCollection.read(doc, veh);
-    }
-
-    public XmlSchema read(Element elem, String uri) {
-        return schemaCollection.read(elem, uri);
-    }
-
-    public XmlSchema read(Element elem) {
-        return schemaCollection.read(elem);
-    }
-
-    public XmlSchema read(InputSource inputSource, ValidationEventHandler veh) {
-        return schemaCollection.read(inputSource, veh);
-    }
-
-    public XmlSchema read(Reader r, ValidationEventHandler veh) {
-        return schemaCollection.read(r, veh);
-    }
-
-    public XmlSchema read(Source source, ValidationEventHandler veh) {
-        return schemaCollection.read(source, veh);
-    }
-
-    public void setBaseUri(String baseUri) {
-        schemaCollection.setBaseUri(baseUri);
-    }
-
-    public void setExtReg(ExtensionRegistry extReg) {
-        schemaCollection.setExtReg(extReg);
-    }
-
-    public void setNamespaceContext(NamespacePrefixList namespaceContext) {
-        schemaCollection.setNamespaceContext(namespaceContext);
-    }
-
-    public void setSchemaResolver(URIResolver schemaResolver) {
-        schemaCollection.setSchemaResolver(schemaResolver);
-    }
-    
-    /**
-     * This function is not part of the XmlSchema API. Who knows why?
-     * @param namespaceURI targetNamespace
-     * @return schema, or null.
-     */
-    public XmlSchema getSchemaByTargetNamespace(String namespaceURI) {
-        for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
-            if (schema.getTargetNamespace().equals(namespaceURI)) {
-                return schema;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * This is a really ugly trick to get around a bug or oversight in XmlSchema, which is that
-     * there is no way to programmatically construct an XmlSchema instance that ends up cataloged
-     * in a collection. If there is a fix to WSCOMMONS-272, this can go away.
-     * @param namespaceURI TNS for new schema.
-     * @return new schema
-     */
-
-    public XmlSchema newXmlSchemaInCollection(String namespaceURI) {
-        StringBuffer tinyXmlSchemaDocument = new StringBuffer();
-        tinyXmlSchemaDocument.append("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema' ");
-        tinyXmlSchemaDocument.append("targetNamespace='" + namespaceURI + "'/>");
-        StringReader reader = new StringReader(tinyXmlSchemaDocument.toString());
-        return schemaCollection.read(reader, new ValidationEventHandler() { });
-    }
-    
-    /**
-     * Validate that a qualified name points to some namespace in the schema.
-     * @param qname
-     */
-    public void validateQNameNamespace(QName qname) {
-        // astonishingly, xmlSchemaCollection has no accessor by target URL.
-        if ("".equals(qname.getNamespaceURI())) {
-            return; // references to the 'unqualified' namespace are OK even if there is no schema for it. 
-        }
-        for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
-            if (schema.getTargetNamespace().equals(qname.getNamespaceURI())) {
-                return;
-            }
-        }
-        throw new InvalidXmlSchemaReferenceException(qname + " refers to unknown namespace.");
-    }
-
-    public void validateElementName(QName referrer, QName elementQName) {
-        XmlSchemaElement element = schemaCollection.getElementByQName(elementQName);
-        if (element == null) {
-            throw new InvalidXmlSchemaReferenceException(referrer 
-                                                         + " references element "
-                                                         + elementQName);
-        }
-    }
-
-    public void validateTypeName(QName referrer, QName typeQName) {
-        XmlSchemaType type = schemaCollection.getTypeByQName(typeQName);
-        if (type == null) {
-            throw new InvalidXmlSchemaReferenceException(referrer 
-                                                         + " references type "
-                                                         + typeQName);
-        }
-    }
-    
-    public void addGlobalElementToSchema(XmlSchemaElement element) {
-        XmlSchema schema = getSchemaByTargetNamespace(element.getQName().getNamespaceURI());
-        if (schema == null) {
-            schema = newXmlSchemaInCollection(element.getQName().getNamespaceURI());
-        }
-        schema.getItems().add(element);
-        // believe it or not, it is up to us to do both of these adds!
-        schema.getElements().add(element.getQName(), element);
-    }
-    
-    public static void addGlobalElementToSchema(XmlSchema schema, XmlSchemaElement element) {
-        schema.getItems().add(element);
-        // believe it or not, it is up to us to do both of these adds!
-        schema.getElements().add(element.getQName(), element);
-    }
-    
-    public static void addGlobalTypeToSchema(XmlSchema schema, XmlSchemaType type) {
-        schema.getItems().add(type);
-        schema.addType(type);
-    }
-}
+/**
+ * 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.common.xmlschema;
+
+import java.io.Reader;
+import java.io.StringReader;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.xml.sax.InputSource;
+
+import org.apache.ws.commons.schema.ValidationEventHandler;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
+import org.apache.ws.commons.schema.resolver.URIResolver;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
+import org.apache.ws.commons.schema.utils.NamespacePrefixList;
+import org.apache.ws.commons.schema.utils.TargetNamespaceValidator;
+
+/**
+ * Wrapper class for XmlSchemaCollection that deals with various quirks and bugs.
+ * One bug is WSCOMMONS-272.
+ */
+public class SchemaCollection {
+    
+    private XmlSchemaCollection schemaCollection;
+    
+    public SchemaCollection() {
+        this(new XmlSchemaCollection());
+    }
+    
+    public SchemaCollection(XmlSchemaCollection col) {
+        schemaCollection = col;
+        col.getExtReg().setDefaultExtensionDeserializer(new FixedExtensionDeserializer());
+        if (schemaCollection.getNamespaceContext() == null) {
+        //      an empty prefix map avoids extra checks for null.
+            schemaCollection.setNamespaceContext(new NamespaceMap());
+        }
+    }
+
+    public boolean equals(Object obj) {
+        return schemaCollection.equals(obj);
+    }
+
+    public XmlSchemaElement getElementByQName(QName qname) {
+        return schemaCollection.getElementByQName(qname);
+    }
+
+    public ExtensionRegistry getExtReg() {
+        return schemaCollection.getExtReg();
+    }
+
+    public NamespacePrefixList getNamespaceContext() {
+        return schemaCollection.getNamespaceContext();
+    }
+
+    public XmlSchemaType getTypeByQName(QName schemaTypeName) {
+        return schemaCollection.getTypeByQName(schemaTypeName);
+    }
+
+    public XmlSchema[] getXmlSchema(String systemId) {
+        return schemaCollection.getXmlSchema(systemId);
+    }
+
+    public XmlSchema[] getXmlSchemas() {
+        return schemaCollection.getXmlSchemas();
+    }
+
+    public int hashCode() {
+        return schemaCollection.hashCode();
+    }
+
+    public void init() {
+        schemaCollection.init();
+    }
+
+    public XmlSchema read(Document doc, String uri, ValidationEventHandler veh,
+                          TargetNamespaceValidator validator) {
+        return schemaCollection.read(doc, uri, veh, validator);
+    }
+
+    public XmlSchema read(Document doc, String uri, ValidationEventHandler veh) {
+        return schemaCollection.read(doc, uri, veh);
+    }
+
+    public XmlSchema read(Document doc, ValidationEventHandler veh) {
+        return schemaCollection.read(doc, veh);
+    }
+
+    public XmlSchema read(Element elem, String uri) {
+        return schemaCollection.read(elem, uri);
+    }
+
+    public XmlSchema read(Element elem) {
+        return schemaCollection.read(elem);
+    }
+
+    public XmlSchema read(InputSource inputSource, ValidationEventHandler veh) {
+        return schemaCollection.read(inputSource, veh);
+    }
+
+    public XmlSchema read(Reader r, ValidationEventHandler veh) {
+        return schemaCollection.read(r, veh);
+    }
+
+    public XmlSchema read(Source source, ValidationEventHandler veh) {
+        return schemaCollection.read(source, veh);
+    }
+
+    public void setBaseUri(String baseUri) {
+        schemaCollection.setBaseUri(baseUri);
+    }
+
+    public void setExtReg(ExtensionRegistry extReg) {
+        schemaCollection.setExtReg(extReg);
+    }
+
+    public void setNamespaceContext(NamespacePrefixList namespaceContext) {
+        schemaCollection.setNamespaceContext(namespaceContext);
+    }
+
+    public void setSchemaResolver(URIResolver schemaResolver) {
+        schemaCollection.setSchemaResolver(schemaResolver);
+    }
+    
+    /**
+     * This function is not part of the XmlSchema API. Who knows why?
+     * @param namespaceURI targetNamespace
+     * @return schema, or null.
+     */
+    public XmlSchema getSchemaByTargetNamespace(String namespaceURI) {
+        for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
+            if (schema.getTargetNamespace().equals(namespaceURI)) {
+                return schema;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * This is a really ugly trick to get around a bug or oversight in XmlSchema, which is that
+     * there is no way to programmatically construct an XmlSchema instance that ends up cataloged
+     * in a collection. If there is a fix to WSCOMMONS-272, this can go away.
+     * @param namespaceURI TNS for new schema.
+     * @return new schema
+     */
+
+    public XmlSchema newXmlSchemaInCollection(String namespaceURI) {
+        StringBuffer tinyXmlSchemaDocument = new StringBuffer();
+        tinyXmlSchemaDocument.append("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema' ");
+        tinyXmlSchemaDocument.append("targetNamespace='" + namespaceURI + "'/>");
+        StringReader reader = new StringReader(tinyXmlSchemaDocument.toString());
+        return schemaCollection.read(reader, new ValidationEventHandler() { });
+    }
+    
+    /**
+     * Validate that a qualified name points to some namespace in the schema.
+     * @param qname
+     */
+    public void validateQNameNamespace(QName qname) {
+        // astonishingly, xmlSchemaCollection has no accessor by target URL.
+        if ("".equals(qname.getNamespaceURI())) {
+            return; // references to the 'unqualified' namespace are OK even if there is no schema for it. 
+        }
+        for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
+            if (schema.getTargetNamespace().equals(qname.getNamespaceURI())) {
+                return;
+            }
+        }
+        throw new InvalidXmlSchemaReferenceException(qname + " refers to unknown namespace.");
+    }
+
+    public void validateElementName(QName referrer, QName elementQName) {
+        XmlSchemaElement element = schemaCollection.getElementByQName(elementQName);
+        if (element == null) {
+            throw new InvalidXmlSchemaReferenceException(referrer 
+                                                         + " references element "
+                                                         + elementQName);
+        }
+    }
+
+    public void validateTypeName(QName referrer, QName typeQName) {
+        XmlSchemaType type = schemaCollection.getTypeByQName(typeQName);
+        if (type == null) {
+            throw new InvalidXmlSchemaReferenceException(referrer 
+                                                         + " references type "
+                                                         + typeQName);
+        }
+    }
+    
+    public void addGlobalElementToSchema(XmlSchemaElement element) {
+        XmlSchema schema = getSchemaByTargetNamespace(element.getQName().getNamespaceURI());
+        if (schema == null) {
+            schema = newXmlSchemaInCollection(element.getQName().getNamespaceURI());
+        }
+        schema.getItems().add(element);
+        // believe it or not, it is up to us to do both of these adds!
+        schema.getElements().add(element.getQName(), element);
+    }
+    
+    public static void addGlobalElementToSchema(XmlSchema schema, XmlSchemaElement element) {
+        schema.getItems().add(element);
+        // believe it or not, it is up to us to do both of these adds!
+        schema.getElements().add(element.getQName(), element);
+    }
+    
+    public static void addGlobalTypeToSchema(XmlSchema schema, XmlSchemaType type) {
+        schema.getItems().add(type);
+        schema.addType(type);
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java Fri Feb 22 18:46:14 2008
@@ -1,31 +1,31 @@
-/**
- * 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.common.xmlschema;
-
-/**
- * Very simple exception class used to detect internal errors.
- */
-public class XmlSchemaInvalidOperation extends RuntimeException {
-
-    public XmlSchemaInvalidOperation(String message) {
-        super(message);
-    }
-
-}
+/**
+ * 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.common.xmlschema;
+
+/**
+ * Very simple exception class used to detect internal errors.
+ */
+public class XmlSchemaInvalidOperation extends RuntimeException {
+
+    public XmlSchemaInvalidOperation(String message) {
+        super(message);
+    }
+
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaInvalidOperation.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java Fri Feb 22 18:46:14 2008
@@ -1,151 +1,151 @@
-/**
- * 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.common.xmlschema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
-import org.apache.ws.commons.schema.XmlSchemaFacet;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-
-/**
- * Some functions that avoid problems with Commons XML Schema.  
- */
-public final class XmlSchemaTools {
-    private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaTools.class);
-    
-    private XmlSchemaTools() {
-    }
-    
-    private static void setNameFromQName(XmlSchemaElement element, QName name) {
-        if (name == null) {
-            element.setName(null);
-        } else {
-            element.setName(name.getLocalPart());
-        }
-    }
-    
-    /**
-     * Wrapper around XmlSchemaElement.setQName that checks for inconsistency with 
-     * refName.
-     * @param element
-     * @param name
-     */
-    public static void setElementQName(XmlSchemaElement element, QName name) {
-        if (name != null && element.getRefName() != null && !element.getRefName().equals(name)) {
-            LOG.severe("Attempt to set the QName of an element with a reference name");
-            throw new 
-                XmlSchemaInvalidOperation("Attempt to set the QName of an element "
-                                          + "with a reference name.");
-        }
-        element.setQName(name);
-        // in CXF, we want them to be consistent.
-        setNameFromQName(element, name);
-    }
-
-    /**
-     * Wrapper around XmlSchemaElement.setName that checks for inconsistency with 
-     * refName.
-     * @param element
-     * @param name
-     */
-    public static void setElementName(XmlSchemaElement element, String name) {
-        if (name != null 
-            && element.getRefName() != null 
-            && !element.getRefName().getLocalPart().equals(name)
-            && (element.getQName() == null || element.getQName().getLocalPart().equals(name))) {
-            LOG.severe("Attempt to set the name of an element with a reference name.");
-            throw new 
-                XmlSchemaInvalidOperation("Attempt to set the name of an element "
-                                          + "with a reference name.");
-        }
-        element.setName(name);
-    }
-
-    /**
-     * Wrapper around XmlSchemaElement.setRefName that checks for inconsistency with 
-     * name and QName.
-     * @param element
-     * @param name
-     */
-    public static void setElementRefName(XmlSchemaElement element, QName name) {
-        if (name != null
-            && ((element.getQName() != null && !element.getQName().equals(name)) 
-            || (element.getName() != null && !element.getName().equals(name.getLocalPart())))) {
-            LOG.severe("Attempt to set the refName of an element with a name or QName");
-            throw new 
-                XmlSchemaInvalidOperation("Attempt to set the refName of an element "
-                                          + "with a name or QName.");
-        }
-        element.setRefName(name);
-        // cxf conventionally keeps something in the name slot.
-        setNameFromQName(element, name);
-    }
-    
-    /**
-     * Return true if a simple type is a straightforward XML Schema representation of an enumeration.
-     * If we discover schemas that are 'enum-like' with more complex structures, we might
-     * make this deal with them.
-     * @param type Simple type, possible an enumeration.
-     * @return true for an enumeration.
-     */
-    public static boolean isEumeration(XmlSchemaSimpleType type) {
-        XmlSchemaSimpleTypeContent content = type.getContent();
-        if (!(content instanceof XmlSchemaSimpleTypeRestriction)) {
-            return false;
-        }
-        XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
-        XmlSchemaObjectCollection facets = restriction.getFacets();
-        for (int x = 0; x < facets.getCount(); x++) {
-            XmlSchemaFacet facet = (XmlSchemaFacet) facets.getItem(x);
-            if (!(facet instanceof XmlSchemaEnumerationFacet)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    /**
-     * Retrieve the string values for an enumeration.
-     * @param type
-     * @return
-     */
-    public static List<String> enumeratorValues(XmlSchemaSimpleType type) {
-        XmlSchemaSimpleTypeContent content = type.getContent();
-        XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
-        XmlSchemaObjectCollection facets = restriction.getFacets();
-        List<String> values = new ArrayList<String>(); 
-        for (int x = 0; x < facets.getCount(); x++) {
-            XmlSchemaFacet facet = (XmlSchemaFacet) facets.getItem(x);
-            XmlSchemaEnumerationFacet enumFacet = (XmlSchemaEnumerationFacet) facet;
-            values.add(enumFacet.getValue().toString());
-        }
-        return values;
-    }
-}
+/**
+ * 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.common.xmlschema;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
+import org.apache.ws.commons.schema.XmlSchemaFacet;
+import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaSimpleType;
+import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
+import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+
+/**
+ * Some functions that avoid problems with Commons XML Schema.  
+ */
+public final class XmlSchemaTools {
+    private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaTools.class);
+    
+    private XmlSchemaTools() {
+    }
+    
+    private static void setNameFromQName(XmlSchemaElement element, QName name) {
+        if (name == null) {
+            element.setName(null);
+        } else {
+            element.setName(name.getLocalPart());
+        }
+    }
+    
+    /**
+     * Wrapper around XmlSchemaElement.setQName that checks for inconsistency with 
+     * refName.
+     * @param element
+     * @param name
+     */
+    public static void setElementQName(XmlSchemaElement element, QName name) {
+        if (name != null && element.getRefName() != null && !element.getRefName().equals(name)) {
+            LOG.severe("Attempt to set the QName of an element with a reference name");
+            throw new 
+                XmlSchemaInvalidOperation("Attempt to set the QName of an element "
+                                          + "with a reference name.");
+        }
+        element.setQName(name);
+        // in CXF, we want them to be consistent.
+        setNameFromQName(element, name);
+    }
+
+    /**
+     * Wrapper around XmlSchemaElement.setName that checks for inconsistency with 
+     * refName.
+     * @param element
+     * @param name
+     */
+    public static void setElementName(XmlSchemaElement element, String name) {
+        if (name != null 
+            && element.getRefName() != null 
+            && !element.getRefName().getLocalPart().equals(name)
+            && (element.getQName() == null || element.getQName().getLocalPart().equals(name))) {
+            LOG.severe("Attempt to set the name of an element with a reference name.");
+            throw new 
+                XmlSchemaInvalidOperation("Attempt to set the name of an element "
+                                          + "with a reference name.");
+        }
+        element.setName(name);
+    }
+
+    /**
+     * Wrapper around XmlSchemaElement.setRefName that checks for inconsistency with 
+     * name and QName.
+     * @param element
+     * @param name
+     */
+    public static void setElementRefName(XmlSchemaElement element, QName name) {
+        if (name != null
+            && ((element.getQName() != null && !element.getQName().equals(name)) 
+            || (element.getName() != null && !element.getName().equals(name.getLocalPart())))) {
+            LOG.severe("Attempt to set the refName of an element with a name or QName");
+            throw new 
+                XmlSchemaInvalidOperation("Attempt to set the refName of an element "
+                                          + "with a name or QName.");
+        }
+        element.setRefName(name);
+        // cxf conventionally keeps something in the name slot.
+        setNameFromQName(element, name);
+    }
+    
+    /**
+     * Return true if a simple type is a straightforward XML Schema representation of an enumeration.
+     * If we discover schemas that are 'enum-like' with more complex structures, we might
+     * make this deal with them.
+     * @param type Simple type, possible an enumeration.
+     * @return true for an enumeration.
+     */
+    public static boolean isEumeration(XmlSchemaSimpleType type) {
+        XmlSchemaSimpleTypeContent content = type.getContent();
+        if (!(content instanceof XmlSchemaSimpleTypeRestriction)) {
+            return false;
+        }
+        XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
+        XmlSchemaObjectCollection facets = restriction.getFacets();
+        for (int x = 0; x < facets.getCount(); x++) {
+            XmlSchemaFacet facet = (XmlSchemaFacet) facets.getItem(x);
+            if (!(facet instanceof XmlSchemaEnumerationFacet)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * Retrieve the string values for an enumeration.
+     * @param type
+     * @return
+     */
+    public static List<String> enumeratorValues(XmlSchemaSimpleType type) {
+        XmlSchemaSimpleTypeContent content = type.getContent();
+        XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
+        XmlSchemaObjectCollection facets = restriction.getFacets();
+        List<String> values = new ArrayList<String>(); 
+        for (int x = 0; x < facets.getCount(); x++) {
+            XmlSchemaFacet facet = (XmlSchemaFacet) facets.getItem(x);
+            XmlSchemaEnumerationFacet enumFacet = (XmlSchemaEnumerationFacet) facet;
+            values.add(enumFacet.getValue().toString());
+        }
+        return values;
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java Fri Feb 22 18:46:14 2008
@@ -1,43 +1,43 @@
-/**
- * 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.helpers;
-
-import java.nio.charset.Charset;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-/**
- * 
- */
-public class HttpHeaderHelperTest {
-    
-    @Test 
-    public void testMapCharset() {
-        String cs = HttpHeaderHelper.mapCharset("utf-8");
-        assertEquals(Charset.forName("utf-8").name(), cs);
-        cs = HttpHeaderHelper.mapCharset(null);
-        assertEquals("UTF-8", cs);
-        cs = HttpHeaderHelper.mapCharset("\"utf-8\"");
-        assertEquals(Charset.forName("utf-8").name(), cs);
-        cs = HttpHeaderHelper.mapCharset("'utf-8'");
-        assertEquals(Charset.forName("utf-8").name(), cs);
-    }
-
-}
+/**
+ * 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.helpers;
+
+import java.nio.charset.Charset;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * 
+ */
+public class HttpHeaderHelperTest {
+    
+    @Test 
+    public void testMapCharset() {
+        String cs = HttpHeaderHelper.mapCharset("utf-8");
+        assertEquals(Charset.forName("utf-8").name(), cs);
+        cs = HttpHeaderHelper.mapCharset(null);
+        assertEquals("UTF-8", cs);
+        cs = HttpHeaderHelper.mapCharset("\"utf-8\"");
+        assertEquals(Charset.forName("utf-8").name(), cs);
+        cs = HttpHeaderHelper.mapCharset("'utf-8'");
+        assertEquals(Charset.forName("utf-8").name(), cs);
+    }
+
+}

Propchange: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat Fri Feb 22 18:46:14 2008
@@ -1,57 +1,57 @@
-@echo off
-rem
-rem
-rem    Licensed to the Apache Software Foundation (ASF) under one
-rem    or more contributor license agreements. See the NOTICE file
-rem    distributed with this work for additional information
-rem    regarding copyright ownership. The ASF licenses this file
-rem    to you under the Apache License, Version 2.0 (the
-rem    "License"); you may not use this file except in compliance
-rem    with the License. You may obtain a copy of the License at
-rem
-rem    http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem    Unless required by applicable law or agreed to in writing,
-rem    software distributed under the License is distributed on an
-rem    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem    KIND, either express or implied. See the License for the
-rem    specific language governing permissions and limitations
-rem    under the License.
-rem
-rem
-
-rem 
-rem  invoke the CXF java2js tool
-rem 
-@setlocal
-
-if not defined CXF_HOME goto set_cxf_home
-                                                                                                                                                             
-:cont
-if not defined JAVA_HOME goto no_java_home
-
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-
-if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-
-set CXF_JAR=%CXF_HOME%\lib\cxf-manifest-incubator.jar
-
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2js.JavaToJS %*
-
-@endlocal
-
-goto end
-
-:no_cxf_jar
-echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
-goto end
-
-:no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
-goto end 
-
-:set_cxf_home
-set CXF_HOME=%~dp0..
-goto cont
-
+@echo off
+rem
+rem
+rem    Licensed to the Apache Software Foundation (ASF) under one
+rem    or more contributor license agreements. See the NOTICE file
+rem    distributed with this work for additional information
+rem    regarding copyright ownership. The ASF licenses this file
+rem    to you under the Apache License, Version 2.0 (the
+rem    "License"); you may not use this file except in compliance
+rem    with the License. You may obtain a copy of the License at
+rem
+rem    http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem    Unless required by applicable law or agreed to in writing,
+rem    software distributed under the License is distributed on an
+rem    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem    KIND, either express or implied. See the License for the
+rem    specific language governing permissions and limitations
+rem    under the License.
+rem
+rem
+
+rem 
+rem  invoke the CXF java2js tool
+rem 
+@setlocal
+
+if not defined CXF_HOME goto set_cxf_home
+                                                                                                                                                             
+:cont
+if not defined JAVA_HOME goto no_java_home
+
+set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
+
+set CXF_JAR=%CXF_HOME%\lib\cxf-manifest-incubator.jar
+
+"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2js.JavaToJS %*
+
+@endlocal
+
+goto end
+
+:no_cxf_jar
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
+goto end
+
+:no_java_home
+echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
+
 :end

Propchange: incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/bin/java2js.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat Fri Feb 22 18:46:14 2008
@@ -1,60 +1,60 @@
-@echo off
-rem
-rem
-rem    Licensed to the Apache Software Foundation (ASF) under one
-rem    or more contributor license agreements. See the NOTICE file
-rem    distributed with this work for additional information
-rem    regarding copyright ownership. The ASF licenses this file
-rem    to you under the Apache License, Version 2.0 (the
-rem    "License"); you may not use this file except in compliance
-rem    with the License. You may obtain a copy of the License at
-rem
-rem    http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem    Unless required by applicable law or agreed to in writing,
-rem    software distributed under the License is distributed on an
-rem    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem    KIND, either express or implied. See the License for the
-rem    specific language governing permissions and limitations
-rem    under the License.
-rem
-rem
-
-rem 
-rem  invoke the CXF java2js tool
-rem 
-@setlocal
-
-if not defined CXF_HOME goto set_cxf_home
-                                                                                                                                                             
-:cont
-if not defined JAVA_HOME goto no_java_home
-
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-
-if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-
-set CXF_JAR=%CXF_HOME%\lib\cxf-manifest-incubator.jar
-
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2ws.JavaToWS %*
-
-@endlocal
-
-goto end
-
-:no_cxf_jar
-echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
-goto end
-
-:no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
-goto end 
-
-:set_cxf_home
-set CXF_HOME=%~dp0..
-goto cont
-
-:end
-
-
-
+@echo off
+rem
+rem
+rem    Licensed to the Apache Software Foundation (ASF) under one
+rem    or more contributor license agreements. See the NOTICE file
+rem    distributed with this work for additional information
+rem    regarding copyright ownership. The ASF licenses this file
+rem    to you under the Apache License, Version 2.0 (the
+rem    "License"); you may not use this file except in compliance
+rem    with the License. You may obtain a copy of the License at
+rem
+rem    http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem    Unless required by applicable law or agreed to in writing,
+rem    software distributed under the License is distributed on an
+rem    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem    KIND, either express or implied. See the License for the
+rem    specific language governing permissions and limitations
+rem    under the License.
+rem
+rem
+
+rem 
+rem  invoke the CXF java2js tool
+rem 
+@setlocal
+
+if not defined CXF_HOME goto set_cxf_home
+                                                                                                                                                             
+:cont
+if not defined JAVA_HOME goto no_java_home
+
+set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
+
+set CXF_JAR=%CXF_HOME%\lib\cxf-manifest-incubator.jar
+
+"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2ws.JavaToWS %*
+
+@endlocal
+
+goto end
+
+:no_cxf_jar
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
+goto end
+
+:no_java_home
+echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
+
+:end
+
+
+

Propchange: incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/bin/java2ws.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2js.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/HelloWorld.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/HelloWorld.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/client-beans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/client-beans.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/client-beans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt?rev=630380&r1=630379&r2=630380&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt Fri Feb 22 18:46:14 2008
@@ -1,79 +1,79 @@
-Java First demo using jax-ws APIs and jsr-181
-=============================================
-
-This demo illustrates how to develop a service use the "code first"
-approach using the JAX-WS APIs.
-
-
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest-incubator.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README.  If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-Building and running the demo using ant
----------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server and client targets automatically build the demo.
-
-Using either UNIX or Windows:
-
-  ant server  (from one command line window)
-  ant client  (from a second command line window)
-
-
-Building the demo using javac
------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), first create the target directory build/classes and then compile 
-the provided client and server code.
-
-For UNIX:  
-  
-  mkdir -p build/classes
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-manifest-incubator.jar:./build/classes
-  javac -d build/classes src/demo/hw/client/*.java
-  javac -d build/classes src/demo/hw/server/*.java
-
-For Windows:
-  mkdir build\classes
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-manifest-incubator.jar;.\build\classes
-  javac -d build\classes src\demo\hw\client\*.java
-  javac -d build\classes src\demo\hw\server\*.java
-
-
-Running the demo using java
----------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located) run the commands, entered on a single command line:
-
-For UNIX (must use forward slashes):
-    java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
-         demo.hw.server.Server &
-
-    java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
-         demo.hw.client.Client
-
-The server process starts in the background.  After running the client,
-use the kill command to terminate the server process.
-
-For Windows (may use either forward or back slashes):
-  start 
-    java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
-         demo.hw.server.Server
-
-    java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
-       demo.hw.client.Client
-
-A new command windows opens for the server process.  After running the
-client, terminate the server process by issuing Ctrl-C in its command window.
+Java First demo using jax-ws APIs and jsr-181
+=============================================
+
+This demo illustrates how to develop a service use the "code first"
+approach using the JAX-WS APIs.
+
+
+Prerequisite
+------------
+
+If your environment already includes cxf-manifest-incubator.jar on the
+CLASSPATH, and the JDK and ant bin directories on the PATH
+it is not necessary to set the environment as described in
+the samples directory README.  If your environment is not
+properly configured, or if you are planning on using wsdl2java,
+javac, and java to build and run the demos, you must set the
+environment.
+
+
+Building and running the demo using ant
+---------------------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located), the Ant build.xml file can be used to build and run the demo.
+The server and client targets automatically build the demo.
+
+Using either UNIX or Windows:
+
+  ant server  (from one command line window)
+  ant client  (from a second command line window)
+
+
+Building the demo using javac
+-----------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located), first create the target directory build/classes and then compile 
+the provided client and server code.
+
+For UNIX:  
+  
+  mkdir -p build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-manifest-incubator.jar:./build/classes
+  javac -d build/classes src/demo/hw/client/*.java
+  javac -d build/classes src/demo/hw/server/*.java
+
+For Windows:
+  mkdir build\classes
+  set classpath=%classpath%;%CXF_HOME%\lib\cxf-manifest-incubator.jar;.\build\classes
+  javac -d build\classes src\demo\hw\client\*.java
+  javac -d build\classes src\demo\hw\server\*.java
+
+
+Running the demo using java
+---------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located) run the commands, entered on a single command line:
+
+For UNIX (must use forward slashes):
+    java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
+         demo.hw.server.Server &
+
+    java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
+         demo.hw.client.Client
+
+The server process starts in the background.  After running the client,
+use the kill command to terminate the server process.
+
+For Windows (may use either forward or back slashes):
+  start 
+    java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
+         demo.hw.server.Server
+
+    java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
+       demo.hw.client.Client
+
+A new command windows opens for the server process.  After running the
+client, terminate the server process by issuing Ctrl-C in its command window.

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message