cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r594532 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/service/ javascript/src/test/java/org/apache/cxf/javascript/fortest/ javascript/src/test/java/org/apache/cxf/javascript/service/ javascript/src/test/java/org/apache/cxf...
Date Tue, 13 Nov 2007 13:32:51 GMT
Author: bimargulies
Date: Tue Nov 13 05:32:49 2007
New Revision: 594532

URL: http://svn.apache.org/viewvc?rev=594532&view=rev
Log:
Add some missing annotations to the Javascript test classes, resulting
in at least getting past CXF-1198 and CXF-1207, which may not be
distinctive.



Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BasicTypeFunctionReturnStringWrapper.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/service/DocLitWrappedTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java?rev=594532&r1=594531&r2=594532&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
Tue Nov 13 05:32:49 2007
@@ -93,7 +93,7 @@
             try {
                 schemaCollection.validateElementName(part.getName(), part.getElementQName());
             } catch (InvalidXmlSchemaReferenceException ixsre) {
-                complaints.append(part.getName() + " element name " + ixsre.getMessage()
+ "\n");
+                complaints.append(part.getName() + " part element name " + ixsre.getMessage()
+ "\n");
             }
         } else {
             if (part.getTypeQName() == null) {
@@ -102,7 +102,7 @@
                 try {
                     schemaCollection.validateTypeName(part.getName(), part.getTypeQName());
                 } catch (InvalidXmlSchemaReferenceException ixsre) {
-                    complaints.append(part.getName() + " type name " + ixsre.getMessage()
+ "\n");
+                    complaints.append(part.getName() + " part type name " + ixsre.getMessage()
+ "\n");
                 }
             }
         }

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BasicTypeFunctionReturnStringWrapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BasicTypeFunctionReturnStringWrapper.java?rev=594532&r1=594531&r2=594532&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BasicTypeFunctionReturnStringWrapper.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/BasicTypeFunctionReturnStringWrapper.java
Tue Nov 13 05:32:49 2007
@@ -20,11 +20,13 @@
 package org.apache.cxf.javascript.fortest;
 
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 /**
  * Wrapper class.
  */
-@XmlRootElement
+@XmlRootElement(namespace = "uri:org.apache.cxf.javascript.testns")
+@XmlType(namespace = "uri:org.apache.cxf.javascript.testns")
 public class BasicTypeFunctionReturnStringWrapper {
     private String s;
     private int i;

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java?rev=594532&r1=594531&r2=594532&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
Tue Nov 13 05:32:49 2007
@@ -26,7 +26,7 @@
 /**
  * Bean with a selection of elements suitable for testing the JavaScript client.
  */
-@XmlRootElement
+@XmlRootElement(namespace = "uri:org.apache.cxf.javascript.testns")
 @XmlType(namespace = "uri:org.apache.cxf.javascript.testns")
 public class TestBean1 {
     

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/service/DocLitWrappedTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/service/DocLitWrappedTest.java?rev=594532&r1=594531&r2=594532&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/service/DocLitWrappedTest.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/service/DocLitWrappedTest.java
Tue Nov 13 05:32:49 2007
@@ -47,6 +47,7 @@
 import org.junit.Test;
 import org.mozilla.javascript.Scriptable;
 
+@org.junit.Ignore
 public class DocLitWrappedTest extends AbstractCXFSpringTest {
     private static final Logger LOG = LogUtils.getL7dLogger(DocLitWrappedTest.class);
     private static final String BASIC_TYPE_FUNCTION_RETURN_STRING_SERIALIZER_NAME 
@@ -71,7 +72,6 @@
         return new String[] {"classpath:serializationTestBeans.xml"};
     }
 
-    @org.junit.Ignore
     @Test 
     public void testMessageSerialization() throws Exception {
         setupClientAndRhino("simple-dlwu-proxy-factory");

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java?rev=594532&r1=594531&r2=594532&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
Tue Nov 13 05:32:49 2007
@@ -48,7 +48,7 @@
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.junit.Test;
 
-@org.junit.Ignore
+//@org.junit.Ignore
 public class SerializationTest extends AbstractCXFSpringTest {
     private JavascriptTestUtilities testUtilities;
     private XMLInputFactory xmlInputFactory;



Mime
View raw message