axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: ws-axis/java/test/encoding TestAutoTypes.java
Date Wed, 15 Dec 2004 22:44:39 GMT
tomj        2004/12/15 14:44:38

  Modified:    java/src/org/apache/axis/wsdl/fromJava Namespaces.java
               java/test/encoding TestAutoTypes.java
  Log:
  Back out my change from Nov 18: do NOT add a trailing slash to generated
  namespaces as users (like mine) may depend on the Axis 1.1 namespaces
  and get unhappy when they change for no good reason.
  
  Motivation for the original change was WS-I validation,
  but this was a false alarm.
  
  Fix namespaces in the TestAutoTypes test to match defaults.
  
  Revision  Changes    Path
  1.14      +3 -3      ws-axis/java/src/org/apache/axis/wsdl/fromJava/Namespaces.java
  
  Index: Namespaces.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/fromJava/Namespaces.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Namespaces.java	15 Dec 2004 12:15:52 -0000	1.13
  +++ Namespaces.java	15 Dec 2004 22:44:38 -0000	1.14
  @@ -193,7 +193,7 @@
           }
   
           if (clsName.lastIndexOf('.') == -1) {
  -            return protocol + "://" + "DefaultNamespace/";
  +            return protocol + "://" + "DefaultNamespace";
           }
   
           String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
  @@ -254,7 +254,7 @@
                                                          String protocol) {
   
           if ((packageName == null) || packageName.equals("")) {
  -            return protocol + "://" + "DefaultNamespace/";
  +            return protocol + "://" + "DefaultNamespace";
           }
   
           StringTokenizer st = new StringTokenizer(packageName, ".");
  @@ -277,7 +277,7 @@
               sb.append(word);
           }
   
  -        return protocol + "://" + sb.toString() + "/";
  +        return protocol + "://" + sb.toString();
       }
   
       /**
  
  
  
  1.5       +2 -2      ws-axis/java/test/encoding/TestAutoTypes.java
  
  Index: TestAutoTypes.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/encoding/TestAutoTypes.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestAutoTypes.java	18 Nov 2004 17:00:41 -0000	1.4
  +++ TestAutoTypes.java	15 Dec 2004 22:44:38 -0000	1.5
  @@ -28,7 +28,7 @@
           tm.setDoAutoTypes(true);
           
           QName qname = tm.getTypeQName( AttributeBean.class );
  -        assertEquals( "http://encoding.test/",
  +        assertEquals( "http://encoding.test",
                         qname.getNamespaceURI() );
           assertEquals( "AttributeBean", qname.getLocalPart() );
           
  @@ -36,7 +36,7 @@
           assertTrue( tm.getSerializer(AttributeBean.class) != null );
   
           assertEquals(
  -            "http://encoding.test/",
  +            "http://encoding.test",
               Namespaces.makeNamespace(AttributeBean[].class.getName()));
           assertEquals(
               "AttributeBean[]",
  
  
  

Mime
View raw message