cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r886968 [2/2] - in /cxf/branches/2.2.x-fixes: api/src/test/java/org/apache/cxf/databinding/ distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/ distribution/src/main/release/samples/wsdl_first/...
Date Thu, 03 Dec 2009 22:42:13 GMT
Modified: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java?rev=886968&r1=886967&r2=886968&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
(original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
Thu Dec  3 22:42:11 2009
@@ -1,65 +1,65 @@
-/**
- * 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.maven_plugin;
-
-/**
- * Represents a wsdl file that is stored in a maven repository
- */
-public class WsdlArtifact {
-    private String groupId;
-    private String artifactId;
-    private String version;
-    private String type;
-    
-    public WsdlArtifact() {
-        type = "wsdl";
-    }
-    
-    public String getGroupId() {
-        return groupId;
-    }
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-    public String getArtifactId() {
-        return artifactId;
-    }
-    public void setArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-    }
-    public String getVersion() {
-        return version;
-    }
-    public void setVersion(String version) {
-        this.version = version;
-    }
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-    
-    public boolean doesMatch(WsdlArtifact artifact) {
-        return type.equals(artifact.getType()) && groupId.equals(artifact.getGroupId())
-              && artifactId.equals(artifact.getArtifactId()) 
-              && (version == null || version.equals(artifact.getVersion()));
-    }
-}
+/**
+ * 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.maven_plugin;
+
+/**
+ * Represents a wsdl file that is stored in a maven repository
+ */
+public class WsdlArtifact {
+    private String groupId;
+    private String artifactId;
+    private String version;
+    private String type;
+    
+    public WsdlArtifact() {
+        type = "wsdl";
+    }
+    
+    public String getGroupId() {
+        return groupId;
+    }
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+    public String getArtifactId() {
+        return artifactId;
+    }
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+    public String getVersion() {
+        return version;
+    }
+    public void setVersion(String version) {
+        this.version = version;
+    }
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+    
+    public boolean doesMatch(WsdlArtifact artifact) {
+        return type.equals(artifact.getType()) && groupId.equals(artifact.getGroupId())
+              && artifactId.equals(artifact.getArtifactId()) 
+              && (version == null || version.equals(artifact.getVersion()));
+    }
+}

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/BindingFileHelperTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/BindingFileHelperTest.java?rev=886968&r1=886967&r2=886968&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/BindingFileHelperTest.java
(original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/BindingFileHelperTest.java
Thu Dec  3 22:42:11 2009
@@ -1,81 +1,81 @@
-/**
- * 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.maven_plugin;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URI;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.maven.plugin.MojoExecutionException;
-
-public class BindingFileHelperTest extends TestCase {
-    private static final File OUTFILE = new File("target/test-data/testbinding.xml");
-    private static final String TEST_WSDL_URL = "http://testwsdl";
-
-    public void testBindingWithWsdlLocation() throws Exception {
-        try {
-            OUTFILE.delete();
-        } catch (Exception e) {
-            // Do not fail if delete fails
-        }
-        InputStream is = this.getClass().getResourceAsStream("/bindingWithWsdlLocation.xml");
-        boolean wasSet = BindingFileHelper.setWsdlLocationAndWrite(is, new URI(TEST_WSDL_URL),
OUTFILE);
-        Assert.assertFalse("This binding file should not be changed", wasSet);
-        Assert.assertFalse(OUTFILE.exists());
-    }
-
-    public void testBindingWithoutWsdlLocation() throws Exception {
-        try {
-            OUTFILE.delete();
-        } catch (Exception e) {
-            // Do not fail if delete fails
-        }
-        InputStream is = this.getClass().getResourceAsStream("/bindingWithoutWsdlLocation.xml");
-        BindingFileHelper.setWsdlLocationAndWrite(is, new URI(TEST_WSDL_URL), OUTFILE);
-
-        Document doc = BindingFileHelper.readDocument(new FileInputStream(OUTFILE));
-        Element bindings = doc.getDocumentElement();
-        String location = bindings.getAttribute(BindingFileHelper.LOCATION_ATTR_NAME);
-        Assert.assertEquals(TEST_WSDL_URL, location);
-    }
-
-    public void testSetBindingForWsdlOption() throws MojoExecutionException {
-        WsdlOption o = new WsdlOption();
-        o.setWsdl("test.wsdl");
-        File baseDir = new File(".");
-        File tempDir = new File(baseDir, "target" + File.separator + "tempbindings");
-        File bindingFile = new File(baseDir, "src/test/resources/bindingWithoutWsdlLocation.xml");
-        o.setBindingFiles(new String[] {
-            bindingFile.getAbsolutePath()
-        });
-
-        BindingFileHelper.setWsdlLocationInBindingsIfNotSet(baseDir, tempDir, o, null);
-        String bindingFilePath = o.getBindingFiles()[0];
-        File expectedBindingFile = new File(tempDir, "0-bindingWithoutWsdlLocation.xml");
-        Assert.assertEquals("Binding file should be the temp file", expectedBindingFile.getAbsolutePath(),
-                            bindingFilePath);
-    }
-}
+/**
+ * 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.maven_plugin;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URI;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+public class BindingFileHelperTest extends TestCase {
+    private static final File OUTFILE = new File("target/test-data/testbinding.xml");
+    private static final String TEST_WSDL_URL = "http://testwsdl";
+
+    public void testBindingWithWsdlLocation() throws Exception {
+        try {
+            OUTFILE.delete();
+        } catch (Exception e) {
+            // Do not fail if delete fails
+        }
+        InputStream is = this.getClass().getResourceAsStream("/bindingWithWsdlLocation.xml");
+        boolean wasSet = BindingFileHelper.setWsdlLocationAndWrite(is, new URI(TEST_WSDL_URL),
OUTFILE);
+        Assert.assertFalse("This binding file should not be changed", wasSet);
+        Assert.assertFalse(OUTFILE.exists());
+    }
+
+    public void testBindingWithoutWsdlLocation() throws Exception {
+        try {
+            OUTFILE.delete();
+        } catch (Exception e) {
+            // Do not fail if delete fails
+        }
+        InputStream is = this.getClass().getResourceAsStream("/bindingWithoutWsdlLocation.xml");
+        BindingFileHelper.setWsdlLocationAndWrite(is, new URI(TEST_WSDL_URL), OUTFILE);
+
+        Document doc = BindingFileHelper.readDocument(new FileInputStream(OUTFILE));
+        Element bindings = doc.getDocumentElement();
+        String location = bindings.getAttribute(BindingFileHelper.LOCATION_ATTR_NAME);
+        Assert.assertEquals(TEST_WSDL_URL, location);
+    }
+
+    public void testSetBindingForWsdlOption() throws MojoExecutionException {
+        WsdlOption o = new WsdlOption();
+        o.setWsdl("test.wsdl");
+        File baseDir = new File(".");
+        File tempDir = new File(baseDir, "target" + File.separator + "tempbindings");
+        File bindingFile = new File(baseDir, "src/test/resources/bindingWithoutWsdlLocation.xml");
+        o.setBindingFiles(new String[] {
+            bindingFile.getAbsolutePath()
+        });
+
+        BindingFileHelper.setWsdlLocationInBindingsIfNotSet(baseDir, tempDir, o, null);
+        String bindingFilePath = o.getBindingFiles()[0];
+        File expectedBindingFile = new File(tempDir, "0-bindingWithoutWsdlLocation.xml");
+        Assert.assertEquals("Binding file should be the temp file", expectedBindingFile.getAbsolutePath(),
+                            bindingFilePath);
+    }
+}

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/BindingFileHelperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/BindingFileHelperTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/resources/bindingWithWsdlLocation.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/resources/bindingWithWsdlLocation.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/resources/bindingWithoutWsdlLocation.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/resources/bindingWithoutWsdlLocation.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/src/main/resources/defaultBinding.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  3 22:42:11 2009
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message