xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ce...@apache.org
Subject cvs commit: xml-xmlbeans/v1/test/cases/xpath much_ado.xml
Date Tue, 30 Mar 2004 03:35:48 GMT
cezar       2004/03/29 19:35:48

  Modified:    v1       build.xml
               v1/src/typeimpl/org/apache/xmlbeans/impl/values
                        JavaStringEnumerationHolderEx.java
               v1/src/xmlschema/schema XML.xsd
               v1/src/xsdschema/schema XMLSchema.xsd
               v1/test/cases/xpath much_ado.xml
  Removed:     v1/src/jaxb/org/apache/xmlbeans/impl/jaxb/compiler
                        ComponentInfo.java ElementInfo.java
                        JaxbCodeGenerator.java JaxbCodePrinter.java
                        JaxbJavaizer.java PackageInfo.java TypeInfo.java
               v1/src/jaxb/org/apache/xmlbeans/impl/jaxb/runtime
                        ContextImpl.java DatatypeConverterImpl.java
                        MarshallerImpl.java NamespaceContextWrapper.java
                        UnmarshallerImpl.java
                        ValidationLocatorEventImpl.java ValidatorImpl.java
               v1/src/jaxb/schema jaxbconfig.xsd jaxbconfig.xsdconfig
               v1/test/cases/store people.xml
  Log:
  More release releated changes.  the way we make the distribution and copyright  notices,
plus fixing some compiling warnings.
  
  CR: Radu
  DRT: passes
  
  Revision  Changes    Path
  1.19      +12 -7     xml-xmlbeans/v1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v1/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	1 Mar 2004 22:06:50 -0000	1.18
  +++ build.xml	30 Mar 2004 03:35:47 -0000	1.19
  @@ -462,6 +462,7 @@
   
        <mkdir dir="build/private/xmlbeans-${product.version}/lib"/>
        <copy todir="build/private/xmlbeans-${product.version}/lib" file="build/ar/xbean.jar"/>
  +     <copy todir="build/private/xmlbeans-${product.version}/lib" file="external/lib/jaxen-1.1-beta-2.jar"/>
   
        <mkdir dir="build/private/xmlbeans-${product.version}/src/schema"/>
        <copy todir="build/private/xmlbeans-${product.version}/src/schema">
  @@ -475,13 +476,15 @@
   
        <zip destfile="build/private/incubating-xmlbeans-${product.version}.zip"
             basedir="build/private"
  -          includes="xmlbeans-${product.version}/**">
  +          includes="xmlbeans-${product.version}/**"
  +          excludes="xmlbeans-${product.version}/schemas/cyclone/**, xmlbeans-${product.version}/schemas/j2ee/**">
            <zipfileset dir="." includes="src/license/license.txt" fullpath="xmlbeans-${product.version}/license.txt"/>
            <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${product.version}/NOTICE.txt"/>
        </zip>
        <tar destfile="build/private/incubating-xmlbeans-${product.version}.tgz"
             basedir="build/private"
             includes="xmlbeans-${product.version}/**"
  +          excludes="xmlbeans-${product.version}/schemas/cyclone/**, xmlbeans-${product.version}/schemas/j2ee/**"
             compression="gzip">
            <tarfileset dir="." includes="src/license/license.txt" fullpath="xmlbeans-${product.version}/license.txt"/>
            <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${product.version}/NOTICE.txt"/>
  @@ -490,25 +493,27 @@
   
     <target name="dist-src" depends="clean, dirs">
        <delete file="build/private/incubating-xmlbeans-${product.version}-src.zip"/>
  -	 <delete file="build/private/incubating-xmlbeans-${product.version}-src.tgz"/>
  +     <delete file="build/private/incubating-xmlbeans-${product.version}-src.tgz"/>
   
  -	 <zip destfile="build/private/incubating-xmlbeans-${product.version}-src.zip">
  +     <zip destfile="build/private/incubating-xmlbeans-${product.version}-src.zip">
        	<zipfileset
        		dir="."
          		includes="**"
  -            excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
  -                test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar"
  +                excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
  +                test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar,
  +                xkit/schemas/cyclone/**, xkit/schemas/j2ee/**"
          		prefix="xmlbeans-${product.version}" />
            <zipfileset dir="." includes="src/license/license.txt" fullpath="xmlbeans-${product.version}/license.txt"/>
            <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${product.version}/NOTICE.txt"/>
        </zip>
  -	 <tar destfile="build/private/incubating-xmlbeans-${product.version}-src.tgz"
  +     <tar destfile="build/private/incubating-xmlbeans-${product.version}-src.tgz"
   	 	  compression="gzip">
        	<tarfileset
        		dir="."
          		includes="**"
          		excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
  -                test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar"
  +                test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar,
  +                xkit/schemas/cyclone/**, xkit/schemas/j2ee/**"
          		prefix="xmlbeans-${product.version}"/>
            <tarfileset dir="." includes="src/license/license.txt" fullpath="xmlbeans-${product.version}/license.txt"/>
            <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${product.version}/NOTICE.txt"/>
  
  
  
  1.4       +9 -9      xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java
  
  Index: JavaStringEnumerationHolderEx.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaStringEnumerationHolderEx.java	12 Feb 2004 20:05:56 -0000	1.3
  +++ JavaStringEnumerationHolderEx.java	30 Mar 2004 03:35:47 -0000	1.4
  @@ -33,12 +33,12 @@
       // update the intval when setting via text, nil.
       protected void set_text(String s)
       {
  -        StringEnumAbstractBase enum = schemaType().enumForString(s);
  -        if (enum == null)
  +        StringEnumAbstractBase enumValue = schemaType().enumForString(s);
  +        if (enumValue == null)
               throw new XmlValueOutOfRangeException("String '" + s + "' is not a valid enumerated
value for " + schemaType());
   
           super.set_text(s);
  -        _val = enum;
  +        _val = enumValue;
       }
   
       public static void validateLexical(String v, SchemaType sType, ValidationContext context)
  @@ -56,27 +56,27 @@
               }
           }
       }
  -    
  +
       protected void set_nil()
       {
           _val = null;
           super.set_nil();
       }
   
  -    // set/get the enum
  +    // set/get the enumValue
       public StringEnumAbstractBase enumValue()
       {
           check_dated();
           return _val;
       }
   
  -    protected void set_enum(StringEnumAbstractBase enum)
  +    protected void set_enum(StringEnumAbstractBase enumValue)
       {
           Class ejc = schemaType().getEnumJavaClass();
  -        if (ejc != null && !enum.getClass().equals(ejc))
  +        if (ejc != null && !enumValue.getClass().equals(ejc))
               throw new XmlValueOutOfRangeException();
   
  -        super.set_text(enum.toString());
  -        _val = enum;
  +        super.set_text(enumValue.toString());
  +        _val = enumValue;
       }
   }
  
  
  
  1.3       +0 -13     xml-xmlbeans/v1/src/xmlschema/schema/XML.xsd
  
  Index: XML.xsd
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v1/src/xmlschema/schema/XML.xsd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XML.xsd	26 Feb 2004 00:59:55 -0000	1.2
  +++ XML.xsd	30 Mar 2004 03:35:47 -0000	1.3
  @@ -1,17 +1,4 @@
   <?xml version='1.0'?>
  -<!-- Copyright 2004 The Apache Software Foundation
  -
  -     Licensed 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. -->
   <!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
   <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xml:lang="en">
   
  
  
  
  1.4       +0 -13     xml-xmlbeans/v1/src/xsdschema/schema/XMLSchema.xsd
  
  Index: XMLSchema.xsd
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v1/src/xsdschema/schema/XMLSchema.xsd,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLSchema.xsd	26 Feb 2004 00:59:55 -0000	1.3
  +++ XMLSchema.xsd	30 Mar 2004 03:35:47 -0000	1.4
  @@ -1,17 +1,4 @@
   <?xml version='1.0' encoding='UTF-8'?>
  -<!-- Copyright 2004 The Apache Software Foundation
  -
  -     Licensed 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. -->
   <!-- XML Schema schema for XML Schemas: Part 1: Structures -->
   <!-- Note this schema is NOT the normative structures schema. -->
   
  
  
  
  1.3       +0 -13     xml-xmlbeans/v1/test/cases/xpath/much_ado.xml
  
  Index: much_ado.xml
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v1/test/cases/xpath/much_ado.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- much_ado.xml	26 Feb 2004 00:59:57 -0000	1.2
  +++ much_ado.xml	30 Mar 2004 03:35:47 -0000	1.3
  @@ -1,17 +1,4 @@
   <?xml version="1.0"?>
  -<!-- Copyright 2004 The Apache Software Foundation
  -
  -     Licensed 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. -->
   <PLAY>
   <TITLE>Much Ado about Nothing</TITLE>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org


Mime
View raw message