This prepares the release branch for 0.97.1.  This release
will fix three bugs:

* JSR166 documentation
* STAX API compatibility
* Tool property files not bundled in the tarball

ChangeLog:

2008-03-11  Andrew John Hughes  <[EMAIL PROTECTED]>

        * configure.ac: Set version to 0.97.1
        * NEWS: Add 0.97.1.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.9526
diff -u -3 -p -u -r1.9526 ChangeLog
--- ChangeLog	22 Feb 2008 03:23:19 -0000	1.9526
+++ ChangeLog	11 Mar 2008 20:23:58 -0000
@@ -1,3 +1,27 @@
+2008-03-10  Andrew John Hughes  <[EMAIL PROTECTED]>
+
+        PR classpath/35422
+	* doc/api/Makefile.am: Include external/jsr166.
+
+2008-03-04  Robert Schuster  <[EMAIL PROTECTED]>
+
+	* gnu/xml/stream/AttributeImpl.java: Changed type field to String.
+	(getDTDType): Changed return type to String.
+	* gnu/xml/stream/XMLEventAllocatorImpl.java:
+	(allocate): Removed wrapping of string in QName object.
+	* gnu/xml/stream/XMLEventFactoryImpl.java:
+	(createAttribute(String, String)): Removed wrapping of string in
+	QName object.
+	(createAttribute(QName, String)): Ditto.
+	(createAttribute(String, String, String, String)): Ditto.
+	* javax/xml/stream/events/Attribute.java:
+	(getDTDType): Changed return type to String.
+
+2008-03-03  Andrew John Hughes  <[EMAIL PROTECTED]>
+
+	* tools/Makefile.am:
+	Distribute property files.
+
 2008-02-22  Andrew John Hughes  <[EMAIL PROTECTED]>
 
 	* NEWS: Set date for 0.97.
Index: NEWS
===================================================================
RCS file: /sources/classpath/classpath/NEWS,v
retrieving revision 1.191
diff -u -3 -p -u -r1.191 NEWS
--- NEWS	22 Feb 2008 03:23:21 -0000	1.191
+++ NEWS	11 Mar 2008 20:24:01 -0000
@@ -1,3 +1,9 @@
+Bug fixes in release 0.97.1 (Mar 11, 2007)
+
+* Include documentation for JSR166 (java.util.concurrent)
+* Fix STaX API compatability.
+* Include the tools properties file in the release tarball.
+
 New in release 0.97 (Feb 22, 2007)
 
 Build changes:
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.225
diff -u -3 -p -u -r1.225 configure.ac
--- configure.ac	22 Feb 2008 03:23:21 -0000	1.225
+++ configure.ac	11 Mar 2008 20:24:02 -0000
@@ -6,7 +6,7 @@ dnl ------------------------------------
 dnl define([AC_CACHE_LOAD], )dnl
 dnl define([AC_CACHE_SAVE], )dnl
 
-AC_INIT([GNU Classpath],[0.97],[EMAIL PROTECTED],[classpath])
+AC_INIT([GNU Classpath],[0.97.1],[EMAIL PROTECTED],[classpath])
 AC_CONFIG_SRCDIR(java/lang/System.java)
 
 AC_CANONICAL_TARGET
Index: doc/api/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/doc/api/Makefile.am,v
retrieving revision 1.20
diff -u -3 -p -u -r1.20 Makefile.am
--- doc/api/Makefile.am	25 Nov 2006 14:55:43 -0000	1.20
+++ doc/api/Makefile.am	11 Mar 2008 20:24:02 -0000
@@ -2,7 +2,7 @@ if CREATE_API_DOCS
 noinst_DATA = html
 endif
 
-sourcepath = $(top_builddir):$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax
+sourcepath = $(top_builddir):$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/jsr166
 
 classpathbox = "<span class='logo'><a href='http://www.gnu.org/software/classpath' target='_top'>GNU Classpath</a> ($(VERSION))"
 
Index: gnu/xml/stream/AttributeImpl.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/xml/stream/AttributeImpl.java,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 AttributeImpl.java
--- gnu/xml/stream/AttributeImpl.java	4 Sep 2005 09:52:10 -0000	1.1
+++ gnu/xml/stream/AttributeImpl.java	11 Mar 2008 20:24:03 -0000
@@ -56,11 +56,11 @@ public class AttributeImpl
 
   protected final QName name;
   protected final String value;
-  protected final QName type;
+  protected final String type;
   protected final boolean specified;
 
   protected AttributeImpl(Location location,
-                          QName name, String value, QName type,
+                          QName name, String value, String type,
                           boolean specified)
   {
     super(location);
@@ -85,7 +85,7 @@ public class AttributeImpl
     return value;
   }
 
-  public QName getDTDType()
+  public String getDTDType()
   {
     return type;
   }
Index: gnu/xml/stream/XMLEventAllocatorImpl.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 XMLEventAllocatorImpl.java
--- gnu/xml/stream/XMLEventAllocatorImpl.java	3 Mar 2006 12:30:59 -0000	1.3
+++ gnu/xml/stream/XMLEventAllocatorImpl.java	11 Mar 2008 20:24:03 -0000
@@ -165,7 +165,7 @@ public class XMLEventAllocatorImpl
           attributes.add(new AttributeImpl(location,
                                            reader.getAttributeName(i),
                                            reader.getAttributeValue(i),
-                                           QName.valueOf(reader.getAttributeType(i)),
+                                           reader.getAttributeType(i),
                                            reader.isAttributeSpecified(i)));
         return new StartElementImpl(location,
                                     reader.getName(),
Index: gnu/xml/stream/XMLEventFactoryImpl.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventFactoryImpl.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 XMLEventFactoryImpl.java
--- gnu/xml/stream/XMLEventFactoryImpl.java	3 Mar 2006 12:30:59 -0000	1.2
+++ gnu/xml/stream/XMLEventFactoryImpl.java	11 Mar 2008 20:24:03 -0000
@@ -79,20 +79,20 @@ public class XMLEventFactoryImpl
   {
     return new AttributeImpl(location,
                              new QName(namespaceURI, localName, prefix),
-                             value, QName.valueOf("CDATA"), true);
+                             value, "CDATA", true);
   }
   
   public Attribute createAttribute(String localName, String value)
   {
     return new AttributeImpl(location,
                              new QName(localName),
-                             value, QName.valueOf("CDATA"), true);
+                             value, "CDATA", true);
   }
 
   public Attribute createAttribute(QName name, String value)
   {
     return new AttributeImpl(location, name, value,
-                             QName.valueOf("CDATA"), true);
+                             "CDATA", true);
   }
 
   public Namespace createNamespace(String namespaceURI)
Index: javax/xml/stream/events/Attribute.java
===================================================================
RCS file: /sources/classpath/classpath/javax/xml/stream/events/Attribute.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 Attribute.java
--- javax/xml/stream/events/Attribute.java	4 Sep 2005 09:44:30 -0000	1.2
+++ javax/xml/stream/events/Attribute.java	11 Mar 2008 20:24:06 -0000
@@ -59,7 +59,7 @@ public interface Attribute
   /**
    * Returns the type of this attribute.
    */
-  QName getDTDType();
+  String getDTDType();
 
   /**
    * Indicates whether this attribute was specified in the input source, or
Index: tools/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.44
diff -u -3 -p -u -r1.44 Makefile.am
--- tools/Makefile.am	21 Feb 2008 10:39:25 -0000	1.44
+++ tools/Makefile.am	11 Mar 2008 20:24:09 -0000
@@ -108,17 +108,35 @@ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpa
 	$(srcdir)/external/asm/org/objectweb/asm/util/attrs/*.java \
 	$(srcdir)/external/asm/org/objectweb/asm/xml/*.java
 
+# Properties files that must be included in the generated zip file.
+PROPERTY_FILES = $(srcdir)/external/asm/org/objectweb/asm/optimizer/shrink.properties \
+	$(srcdir)/resource/com/sun/tools/javac/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/jar/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/orbd/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/rmic/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/rmid/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/serialver/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/keytool/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/native2ascii/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/appletviewer/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/common/Messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/getopt/Messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/tnameserv/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/jarsigner/messages.properties \
+	$(srcdir)/resource/gnu/classpath/tools/rmiregistry/messages.properties \
+	$(srcdir)/resource/sun/rmi/rmic/messages.properties
+
+# RMIC templates that must be included in the generated zip file.
+RMIC_TEMPLATES = $(srcdir)/resource/gnu/classpath/tools/rmic/templates/*.jav
+
 # The zip files with classes we want to produce.
 TOOLS_ZIP = tools.zip
 
 # Extra objects that will not exist until configure-time
 BUILT_SOURCES = $(TOOLS_ZIP)
 
-# RMIC templates that must be included in the generated zip file.
-RMIC_TEMPLATES = $(srcdir)/resource/gnu/classpath/tools/rmic/templates/*.jav
-
 # All the files we find "interesting"
-ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES)
+ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES) $(PROPERTY_FILES)
 
 # Some architecture independent data to be installed.
 TOOLS_DATA = $(TOOLS_ZIP)
@@ -144,7 +162,7 @@ dist-hook:
 # the class files. Always regenerate all .class files and remove them
 # immediately.  And copy the template files we use to the classes dir
 # so they get also included.
-$(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
+$(TOOLS_ZIP): $(ALL_TOOLS_FILES)
 	@rm -rf classes asm
 	mkdir classes asm
 ## Compile ASM separately as it is latin-1 encoded.

Attachment: signature.asc
Description: Digital signature

Reply via email to