xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r426584 [1/4] - in /xmlgraphics/commons/trunk: ./ examples/java/java2d/ps/ examples/java/xmp/ src/documentation/ src/documentation/classes/ src/documentation/content/ src/documentation/content/xdocs/ src/documentation/resources/images/ src/...
Date Fri, 28 Jul 2006 16:01:56 GMT
Author: jeremias
Date: Fri Jul 28 09:01:47 2006
New Revision: 426584

URL: http://svn.apache.org/viewvc?rev=426584&view=rev
Log:
Changed license headers and updated NOTICE file according to: http://www.apache.org/legal/src-headers.html

Modified:
    xmlgraphics/commons/trunk/NOTICE
    xmlgraphics/commons/trunk/build.xml
    xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java
    xmlgraphics/commons/trunk/examples/java/xmp/MergeMetadata.java
    xmlgraphics/commons/trunk/examples/java/xmp/MetadataFromScratch.java
    xmlgraphics/commons/trunk/examples/java/xmp/ParseMetadata.java
    xmlgraphics/commons/trunk/forrest.properties
    xmlgraphics/commons/trunk/publish.xml
    xmlgraphics/commons/trunk/src/documentation/classes/CatalogManager.properties
    xmlgraphics/commons/trunk/src/documentation/content/doap.rdf
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml
    xmlgraphics/commons/trunk/src/documentation/content/xdocs/tabs.xml
    xmlgraphics/commons/trunk/src/documentation/resources/images/apache-xml-graphics.svg
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/changes2document.xsl
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/dotdots.xsl
    xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/releaseNotes2document.xsl
    xmlgraphics/commons/trunk/src/documentation/sitemap.xmap
    xmlgraphics/commons/trunk/src/documentation/skinconf.xml
    xmlgraphics/commons/trunk/src/documentation/translations/langcode.xml
    xmlgraphics/commons/trunk/src/documentation/translations/languages_en.xml
    xmlgraphics/commons/trunk/src/documentation/translations/languages_es.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_af.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_de.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_es.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_it.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_no.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_ru.xml
    xmlgraphics/commons/trunk/src/documentation/translations/menu_sk.xml
    xmlgraphics/commons/trunk/src/documentation/translations/tabs.xml
    xmlgraphics/commons/trunk/src/documentation/translations/tabs_es.xml
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java
    xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/fonts/Glyphs.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageEncoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGSuggestedPaletteEntry.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDirectory.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFFaxDecoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageDecoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFLZWDecoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ForwardSeekableStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoderImpl.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoder.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoderImpl.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/MemoryCacheSeekableStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableOutputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SimpleRenderedImage.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SingleTileRenderedImage.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/CachableRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TransformStackElement.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TransformType.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/AbstractPSDocumentGraphics2D.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/EPSDocumentGraphics2D.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSDocumentGraphics2D.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSGraphics2D.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/StrokingTextHandler.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/TextHandler.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/package.html
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/DSCConstants.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSFontUtils.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSImageUtils.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSets.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSResource.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSState.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/package.html
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/Service.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/XMLizable.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/ExtendedLocalizable.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocaleGroup.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/Localizable.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/ASCII85Constants.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/ASCII85InputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/ASCII85OutputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/ASCIIHexOutputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/Base64EncodeStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/Finalizable.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/FlateEncodeOutputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/RunLengthEncodeOutputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/io/SubInputStream.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/Metadata.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArray.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArrayType.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPComplexValue.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPConstants.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPParser.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPProperty.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchema.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaRegistry.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSerializer.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/merge/ArrayAddPropertyMerger.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/merge/MergeRuleSet.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/merge/NoReplacePropertyMerger.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/merge/PropertyMerger.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/merge/ReplacePropertyMerger.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/merge/package.html
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/package.html
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/DublinCoreAdapter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/DublinCoreSchema.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/XMPBasicAdapter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/XMPBasicSchema.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/package.html
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/AdobePDFAdapter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/AdobePDFSchema.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAAdapter.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAOldXMPSchema.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAXMPSchema.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/package.html
    xmlgraphics/commons/trunk/status.xml
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/StandardTestSuite.java
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/image/codec/png/PNGEncoderTest.java
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/HexUtil.java
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ServiceTest.java
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/io/ASCII85InputStreamTestCase.java
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/io/ASCII85OutputStreamTestCase.java
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/io/Base64Test.java

Modified: xmlgraphics/commons/trunk/NOTICE
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/NOTICE?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/NOTICE (original)
+++ xmlgraphics/commons/trunk/NOTICE Fri Jul 28 09:01:47 2006
@@ -1,2 +1,5 @@
-This product includes software developed by
+Apache XML Graphics Commons
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: xmlgraphics/commons/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/build.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/build.xml (original)
+++ xmlgraphics/commons/trunk/build.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java (original)
+++ xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java Fri Jul 28 09:01:47 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2006 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
+ * 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
  *

Modified: xmlgraphics/commons/trunk/examples/java/xmp/MergeMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/examples/java/xmp/MergeMetadata.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/examples/java/xmp/MergeMetadata.java (original)
+++ xmlgraphics/commons/trunk/examples/java/xmp/MergeMetadata.java Fri Jul 28 09:01:47 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2006 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
+ * 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
  *

Modified: xmlgraphics/commons/trunk/examples/java/xmp/MetadataFromScratch.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/examples/java/xmp/MetadataFromScratch.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/examples/java/xmp/MetadataFromScratch.java (original)
+++ xmlgraphics/commons/trunk/examples/java/xmp/MetadataFromScratch.java Fri Jul 28 09:01:47 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2006 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
+ * 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
  *

Modified: xmlgraphics/commons/trunk/examples/java/xmp/ParseMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/examples/java/xmp/ParseMetadata.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/examples/java/xmp/ParseMetadata.java (original)
+++ xmlgraphics/commons/trunk/examples/java/xmp/ParseMetadata.java Fri Jul 28 09:01:47 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2006 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
+ * 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
  *

Modified: xmlgraphics/commons/trunk/forrest.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/forrest.properties?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/forrest.properties (original)
+++ xmlgraphics/commons/trunk/forrest.properties Fri Jul 28 09:01:47 2006
@@ -1,8 +1,9 @@
-# Copyright 2006 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
+# 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
 #

Modified: xmlgraphics/commons/trunk/publish.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/publish.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/publish.xml (original)
+++ xmlgraphics/commons/trunk/publish.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/classes/CatalogManager.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/classes/CatalogManager.properties?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/classes/CatalogManager.properties (original)
+++ xmlgraphics/commons/trunk/src/documentation/classes/CatalogManager.properties Fri Jul 28 09:01:47 2006
@@ -1,8 +1,9 @@
-# Copyright 2002-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
+# 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
 #

Modified: xmlgraphics/commons/trunk/src/documentation/content/doap.rdf
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/content/doap.rdf?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/doap.rdf (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/doap.rdf Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/download.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/index.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/site.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/content/xdocs/tabs.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/content/xdocs/tabs.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/content/xdocs/tabs.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/resources/images/apache-xml-graphics.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/resources/images/apache-xml-graphics.svg?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/resources/images/apache-xml-graphics.svg (original)
+++ xmlgraphics/commons/trunk/src/documentation/resources/images/apache-xml-graphics.svg Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/changes2document.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/changes2document.xsl?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/changes2document.xsl (original)
+++ xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/changes2document.xsl Fri Jul 28 09:01:47 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/dotdots.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/dotdots.xsl?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/dotdots.xsl (original)
+++ xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/dotdots.xsl Fri Jul 28 09:01:47 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/releaseNotes2document.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/releaseNotes2document.xsl?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/releaseNotes2document.xsl (original)
+++ xmlgraphics/commons/trunk/src/documentation/resources/stylesheets/releaseNotes2document.xsl Fri Jul 28 09:01:47 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/sitemap.xmap?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/sitemap.xmap (original)
+++ xmlgraphics/commons/trunk/src/documentation/sitemap.xmap Fri Jul 28 09:01:47 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/skinconf.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/skinconf.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/skinconf.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/langcode.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/langcode.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/langcode.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/langcode.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/languages_en.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/languages_en.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/languages_en.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/languages_en.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/languages_es.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/languages_es.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/languages_es.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/languages_es.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_af.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_af.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_af.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_af.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_de.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_de.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_de.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_de.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_es.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_es.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_es.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_es.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_it.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_it.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_it.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_it.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_no.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_no.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_no.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_no.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_ru.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_ru.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_ru.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_ru.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/menu_sk.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/menu_sk.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/menu_sk.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/menu_sk.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/tabs.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/tabs.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/tabs.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/tabs.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/documentation/translations/tabs_es.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/documentation/translations/tabs_es.xml?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/documentation/translations/tabs_es.xml (original)
+++ xmlgraphics/commons/trunk/src/documentation/translations/tabs_es.xml Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-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
+  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
 

Modified: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,196 +1,197 @@
-/*
-
-   Copyright 2006  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.
-
- */
-package org.apache.xmlgraphics.image.writer.imageio;
-
-import java.awt.image.RenderedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.event.IIOWriteWarningListener;
-import javax.imageio.metadata.IIOInvalidTreeException;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataNode;
-import javax.imageio.stream.ImageOutputStream;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.apache.xmlgraphics.image.writer.ImageWriter;
-import org.apache.xmlgraphics.image.writer.ImageWriterParams;
-
-/**
- * ImageWriter implementation that uses Image I/O to write images.
- *
- * @version $Id$
- */
-public class ImageIOImageWriter implements ImageWriter, IIOWriteWarningListener {
-
-    private String targetMIME;
-    
-    /**
-     * Main constructor.
-     * @param mime the MIME type of the image format
-     */
-    public ImageIOImageWriter(String mime) {
-        this.targetMIME = mime;
-    }
-    
-    /**
-     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
-     */
-    public void writeImage(RenderedImage image, OutputStream out) throws IOException {
-        writeImage(image, out, null);
-    }
-
-    /**
-     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
-     */
-    public void writeImage(RenderedImage image, OutputStream out, 
-            ImageWriterParams params) 
-                throws IOException {
-        Iterator iter;
-        iter = ImageIO.getImageWritersByMIMEType(getMIMEType());
-        javax.imageio.ImageWriter iiowriter = (javax.imageio.ImageWriter)iter.next();
-        if (iiowriter != null) {
-            iiowriter.addIIOWriteWarningListener(this);
-            
-            ImageOutputStream imgout = ImageIO.createImageOutputStream(out);
-            
-            ImageWriteParam iwParam = getDefaultWriteParam(iiowriter, image, params);
-            
-            ImageTypeSpecifier type;
-            if (iwParam.getDestinationType() != null) {
-                type = iwParam.getDestinationType();
-            } else {
-                type = ImageTypeSpecifier.createFromRenderedImage(image);
-            }
-            
-            //Handle metadata
-            IIOMetadata meta = iiowriter.getDefaultImageMetadata(
-                    type, iwParam);
-            //meta might be null for some JAI codecs as they don't support metadata
-            if (params != null && meta != null) {
-                meta = updateMetadata(meta, params); 
-            }
-            
-            //Write image
-            iiowriter.setOutput(imgout);
-            IIOImage iioimg = new IIOImage(image, null, meta);
-            iiowriter.write(null, iioimg, iwParam);
-        } else {
-            throw new UnsupportedOperationException("No ImageIO codec for writing " 
-                    + getMIMEType() + " is available!");
-        }
-        
-    }
-    
-    /**
-     * Returns the default write parameters for encoding the image.
-     * @param iiowriter The IIO ImageWriter that will be used
-     * @param image the image to be encoded
-     * @param params the parameters for this writer instance
-     * @return the IIO ImageWriteParam instance
-     */
-    protected ImageWriteParam getDefaultWriteParam(
-            javax.imageio.ImageWriter iiowriter, RenderedImage image, 
-            ImageWriterParams params) {
-        ImageWriteParam param = iiowriter.getDefaultWriteParam();
-        System.err.println("Param: " + params);
-        if ((params != null) && (params.getCompressionMethod() != null)) {
-            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-            param.setCompressionType(params.getCompressionMethod());
-        }
-        return param; 
-    }
-    
-    /**
-     * Updates the metadata information based on the parameters to this writer.
-     * @param meta the metadata
-     * @param params the parameters
-     * @return the updated metadata
-     */
-    protected IIOMetadata updateMetadata(IIOMetadata meta, ImageWriterParams params) {
-        final String stdmeta = "javax_imageio_1.0";
-        if (meta.isStandardMetadataFormatSupported()) {
-            IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(stdmeta);
-            IIOMetadataNode dim = getChildNode(root, "Dimension");
-            IIOMetadataNode child;
-            if (params.getResolution() != null) {
-                child = getChildNode(dim, "HorizontalPixelSize");
-                if (child == null) {
-                    child = new IIOMetadataNode("HorizontalPixelSize");
-                    dim.appendChild(child);
-                }
-                child.setAttribute("value", 
-                        Double.toString(params.getResolution().doubleValue() / 25.4));
-                child = getChildNode(dim, "VerticalPixelSize");
-                if (child == null) {
-                    child = new IIOMetadataNode("VerticalPixelSize");
-                    dim.appendChild(child);
-                }
-                child.setAttribute("value", 
-                        Double.toString(params.getResolution().doubleValue() / 25.4));
-            }
-            try {
-                meta.mergeTree(stdmeta, root);
-            } catch (IIOInvalidTreeException e) {
-                throw new RuntimeException("Cannot update image metadata: " 
-                            + e.getMessage());
-            }
-        }
-        return meta;
-    }
-    
-    /**
-     * Returns a specific metadata child node
-     * @param n the base node
-     * @param name the name of the child
-     * @return the requested child node
-     */
-    protected static IIOMetadataNode getChildNode(Node n, String name) {
-        NodeList nodes = n.getChildNodes();
-        for (int i = 0; i < nodes.getLength(); i++) {
-            Node child = nodes.item(i);
-            if (name.equals(child.getNodeName())) {
-                return (IIOMetadataNode)child;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @see ImageWriter#getMIMEType()
-     */
-    public String getMIMEType() {
-        return this.targetMIME;
-    }
-
-    /**
-     * @see javax.imageio.event.IIOWriteWarningListener#warningOccurred(javax.imageio.ImageWriter, int, java.lang.String)
-     */
-    public void warningOccurred(javax.imageio.ImageWriter source, 
-            int imageIndex, String warning) {
-        System.err.println("Problem while writing image using ImageI/O: " 
-                + warning);
-    }
-}
+/*
+
+   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.xmlgraphics.image.writer.imageio;
+
+import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.event.IIOWriteWarningListener;
+import javax.imageio.metadata.IIOInvalidTreeException;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataNode;
+import javax.imageio.stream.ImageOutputStream;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+
+/**
+ * ImageWriter implementation that uses Image I/O to write images.
+ *
+ * @version $Id$
+ */
+public class ImageIOImageWriter implements ImageWriter, IIOWriteWarningListener {
+
+    private String targetMIME;
+    
+    /**
+     * Main constructor.
+     * @param mime the MIME type of the image format
+     */
+    public ImageIOImageWriter(String mime) {
+        this.targetMIME = mime;
+    }
+    
+    /**
+     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
+     */
+    public void writeImage(RenderedImage image, OutputStream out) throws IOException {
+        writeImage(image, out, null);
+    }
+
+    /**
+     * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
+     */
+    public void writeImage(RenderedImage image, OutputStream out, 
+            ImageWriterParams params) 
+                throws IOException {
+        Iterator iter;
+        iter = ImageIO.getImageWritersByMIMEType(getMIMEType());
+        javax.imageio.ImageWriter iiowriter = (javax.imageio.ImageWriter)iter.next();
+        if (iiowriter != null) {
+            iiowriter.addIIOWriteWarningListener(this);
+            
+            ImageOutputStream imgout = ImageIO.createImageOutputStream(out);
+            
+            ImageWriteParam iwParam = getDefaultWriteParam(iiowriter, image, params);
+            
+            ImageTypeSpecifier type;
+            if (iwParam.getDestinationType() != null) {
+                type = iwParam.getDestinationType();
+            } else {
+                type = ImageTypeSpecifier.createFromRenderedImage(image);
+            }
+            
+            //Handle metadata
+            IIOMetadata meta = iiowriter.getDefaultImageMetadata(
+                    type, iwParam);
+            //meta might be null for some JAI codecs as they don't support metadata
+            if (params != null && meta != null) {
+                meta = updateMetadata(meta, params); 
+            }
+            
+            //Write image
+            iiowriter.setOutput(imgout);
+            IIOImage iioimg = new IIOImage(image, null, meta);
+            iiowriter.write(null, iioimg, iwParam);
+        } else {
+            throw new UnsupportedOperationException("No ImageIO codec for writing " 
+                    + getMIMEType() + " is available!");
+        }
+        
+    }
+    
+    /**
+     * Returns the default write parameters for encoding the image.
+     * @param iiowriter The IIO ImageWriter that will be used
+     * @param image the image to be encoded
+     * @param params the parameters for this writer instance
+     * @return the IIO ImageWriteParam instance
+     */
+    protected ImageWriteParam getDefaultWriteParam(
+            javax.imageio.ImageWriter iiowriter, RenderedImage image, 
+            ImageWriterParams params) {
+        ImageWriteParam param = iiowriter.getDefaultWriteParam();
+        System.err.println("Param: " + params);
+        if ((params != null) && (params.getCompressionMethod() != null)) {
+            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+            param.setCompressionType(params.getCompressionMethod());
+        }
+        return param; 
+    }
+    
+    /**
+     * Updates the metadata information based on the parameters to this writer.
+     * @param meta the metadata
+     * @param params the parameters
+     * @return the updated metadata
+     */
+    protected IIOMetadata updateMetadata(IIOMetadata meta, ImageWriterParams params) {
+        final String stdmeta = "javax_imageio_1.0";
+        if (meta.isStandardMetadataFormatSupported()) {
+            IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(stdmeta);
+            IIOMetadataNode dim = getChildNode(root, "Dimension");
+            IIOMetadataNode child;
+            if (params.getResolution() != null) {
+                child = getChildNode(dim, "HorizontalPixelSize");
+                if (child == null) {
+                    child = new IIOMetadataNode("HorizontalPixelSize");
+                    dim.appendChild(child);
+                }
+                child.setAttribute("value", 
+                        Double.toString(params.getResolution().doubleValue() / 25.4));
+                child = getChildNode(dim, "VerticalPixelSize");
+                if (child == null) {
+                    child = new IIOMetadataNode("VerticalPixelSize");
+                    dim.appendChild(child);
+                }
+                child.setAttribute("value", 
+                        Double.toString(params.getResolution().doubleValue() / 25.4));
+            }
+            try {
+                meta.mergeTree(stdmeta, root);
+            } catch (IIOInvalidTreeException e) {
+                throw new RuntimeException("Cannot update image metadata: " 
+                            + e.getMessage());
+            }
+        }
+        return meta;
+    }
+    
+    /**
+     * Returns a specific metadata child node
+     * @param n the base node
+     * @param name the name of the child
+     * @return the requested child node
+     */
+    protected static IIOMetadataNode getChildNode(Node n, String name) {
+        NodeList nodes = n.getChildNodes();
+        for (int i = 0; i < nodes.getLength(); i++) {
+            Node child = nodes.item(i);
+            if (name.equals(child.getNodeName())) {
+                return (IIOMetadataNode)child;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @see ImageWriter#getMIMEType()
+     */
+    public String getMIMEType() {
+        return this.targetMIME;
+    }
+
+    /**
+     * @see javax.imageio.event.IIOWriteWarningListener#warningOccurred(javax.imageio.ImageWriter, int, java.lang.String)
+     */
+    public void warningOccurred(javax.imageio.ImageWriter source, 
+            int imageIndex, String warning) {
+        System.err.println("Problem while writing image using ImageI/O: " 
+                + warning);
+    }
+}

Modified: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOJPEGImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,161 +1,162 @@
-/*
-
-   Copyright 2006  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.
-
- */
-package org.apache.xmlgraphics.image.writer.imageio;
-
-import java.awt.image.RenderedImage;
-
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.metadata.IIOInvalidTreeException;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataNode;
-import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
-
-import org.apache.xmlgraphics.image.writer.ImageWriterParams;
-
-
-/**
- * ImageWriter that encodes JPEG images using Image I/O.
- *
- * @version $Id$
- */
-public class ImageIOJPEGImageWriter extends ImageIOImageWriter {
-
-    private static final String JPEG_NATIVE_FORMAT = "javax_imageio_jpeg_image_1.0";
-    
-    /**
-     * Main constructor.
-     */
-    public ImageIOJPEGImageWriter() {
-        super("image/jpeg");
-    }
- 
-    /**
-     * @see ImageIOImageWriter#updateMetadata(javax.imageio.metadata.IIOMetadata, ImageWriterParams)
-     */
-    protected IIOMetadata updateMetadata(IIOMetadata meta, ImageWriterParams params) {
-        //ImageIODebugUtil.dumpMetadata(meta);
-        if (JPEG_NATIVE_FORMAT.equals(meta.getNativeMetadataFormatName())) {
-            meta = addAdobeTransform(meta);
-
-            IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(JPEG_NATIVE_FORMAT);
-            //IIOMetadataNode root = new IIOMetadataNode(jpegmeta);
-            
-            IIOMetadataNode jv = getChildNode(root, "JPEGvariety");
-            if (jv == null) {
-                jv = new IIOMetadataNode("JPEGvariety");
-                root.appendChild(jv);
-            }
-            IIOMetadataNode child;
-            if (params.getResolution() != null) {
-                child = getChildNode(jv, "app0JFIF");
-                if (child == null) {
-                    child = new IIOMetadataNode("app0JFIF");
-                    jv.appendChild(child);
-                }
-                //JPEG gets special treatment because there seems to be a bug in
-                //the JPEG codec in ImageIO converting the pixel size incorrectly
-                //(or not at all) when using standard metadata format.
-                child.setAttribute("majorVersion", null);
-                child.setAttribute("minorVersion", null);
-                child.setAttribute("resUnits", "1"); //dots per inch
-                child.setAttribute("Xdensity", params.getResolution().toString());
-                child.setAttribute("Ydensity", params.getResolution().toString());
-                child.setAttribute("thumbWidth", null);
-                child.setAttribute("thumbHeight", null);
-                
-            }
-            
-            /*
-            IIOMetadataNode ms = getChildNode(root, "markerSequence");
-            if (ms == null) {
-                ms = new IIOMetadataNode("markerSequence");
-                root.appendChild(ms);
-            }*/
-            
-            try {
-                meta.setFromTree(JPEG_NATIVE_FORMAT, root);
-                //meta.mergeTree(JPEG_NATIVE_FORMAT, root);
-            } catch (IIOInvalidTreeException e) {
-                throw new RuntimeException("Cannot update image metadata: " 
-                            + e.getMessage(), e);
-            }
-
-            //ImageIODebugUtil.dumpMetadata(meta);
-            
-            //meta = super.updateMetadata(meta, params);
-            //ImageIODebugUtil.dumpMetadata(meta);
-        }
-        
-        return meta;
-    }
-    
-    private static IIOMetadata addAdobeTransform(IIOMetadata meta) {
-        // add the adobe transformation (transform 1 -> to YCbCr)
-        IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(JPEG_NATIVE_FORMAT);
-
-        IIOMetadataNode markerSequence = getChildNode(root, "markerSequence");
-        if (markerSequence == null) {
-            throw new RuntimeException("Invalid metadata!");
-        }
-
-        IIOMetadataNode adobeTransform = getChildNode(markerSequence, "app14Adobe");
-        if (adobeTransform == null) {
-            adobeTransform = new IIOMetadataNode("app14Adobe");
-            adobeTransform.setAttribute("transform" , "1"); // convert RGB to YCbCr
-            adobeTransform.setAttribute("version", "101");
-            adobeTransform.setAttribute("flags0", "0");
-            adobeTransform.setAttribute("flags1", "0");
-
-            markerSequence.appendChild(adobeTransform);
-        } else {
-            adobeTransform.setAttribute("transform" , "1");
-        }
-
-        try {
-            meta.setFromTree(JPEG_NATIVE_FORMAT, root);
-        } catch (IIOInvalidTreeException e) {
-            throw new RuntimeException("Cannot update image metadata: " 
-                        + e.getMessage(), e);
-        }
-        return meta;
-    }    
-    
-    /**
-     * @see ImageIOImageWriter#getDefaultWriteParam(javax.imageio.ImageWriter, java.awt.image.RenderedImage, ImageWriterParams)
-     */
-    protected ImageWriteParam getDefaultWriteParam(
-            ImageWriter iiowriter, RenderedImage image,
-            ImageWriterParams params) {
-        JPEGImageWriteParam param = new JPEGImageWriteParam(iiowriter.getLocale());
-        //ImageTypeSpecifier type = ImageTypeSpecifier.createFromRenderedImage(image);
-        /*
-        ImageTypeSpecifier type = new ImageTypeSpecifier(
-                image.getColorModel(), image.getSampleModel());
-                */
-        /* didn't work as expected...
-        ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(
-                BufferedImage.TYPE_INT_RGB);
-        param.setDestinationType(type);
-        param.setSourceBands(new int[] {0, 1, 2});
-        */
-        return param;
-    }
-    
-    
-}
+/*
+
+   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.xmlgraphics.image.writer.imageio;
+
+import java.awt.image.RenderedImage;
+
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.metadata.IIOInvalidTreeException;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataNode;
+import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
+
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+
+
+/**
+ * ImageWriter that encodes JPEG images using Image I/O.
+ *
+ * @version $Id$
+ */
+public class ImageIOJPEGImageWriter extends ImageIOImageWriter {
+
+    private static final String JPEG_NATIVE_FORMAT = "javax_imageio_jpeg_image_1.0";
+    
+    /**
+     * Main constructor.
+     */
+    public ImageIOJPEGImageWriter() {
+        super("image/jpeg");
+    }
+ 
+    /**
+     * @see ImageIOImageWriter#updateMetadata(javax.imageio.metadata.IIOMetadata, ImageWriterParams)
+     */
+    protected IIOMetadata updateMetadata(IIOMetadata meta, ImageWriterParams params) {
+        //ImageIODebugUtil.dumpMetadata(meta);
+        if (JPEG_NATIVE_FORMAT.equals(meta.getNativeMetadataFormatName())) {
+            meta = addAdobeTransform(meta);
+
+            IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(JPEG_NATIVE_FORMAT);
+            //IIOMetadataNode root = new IIOMetadataNode(jpegmeta);
+            
+            IIOMetadataNode jv = getChildNode(root, "JPEGvariety");
+            if (jv == null) {
+                jv = new IIOMetadataNode("JPEGvariety");
+                root.appendChild(jv);
+            }
+            IIOMetadataNode child;
+            if (params.getResolution() != null) {
+                child = getChildNode(jv, "app0JFIF");
+                if (child == null) {
+                    child = new IIOMetadataNode("app0JFIF");
+                    jv.appendChild(child);
+                }
+                //JPEG gets special treatment because there seems to be a bug in
+                //the JPEG codec in ImageIO converting the pixel size incorrectly
+                //(or not at all) when using standard metadata format.
+                child.setAttribute("majorVersion", null);
+                child.setAttribute("minorVersion", null);
+                child.setAttribute("resUnits", "1"); //dots per inch
+                child.setAttribute("Xdensity", params.getResolution().toString());
+                child.setAttribute("Ydensity", params.getResolution().toString());
+                child.setAttribute("thumbWidth", null);
+                child.setAttribute("thumbHeight", null);
+                
+            }
+            
+            /*
+            IIOMetadataNode ms = getChildNode(root, "markerSequence");
+            if (ms == null) {
+                ms = new IIOMetadataNode("markerSequence");
+                root.appendChild(ms);
+            }*/
+            
+            try {
+                meta.setFromTree(JPEG_NATIVE_FORMAT, root);
+                //meta.mergeTree(JPEG_NATIVE_FORMAT, root);
+            } catch (IIOInvalidTreeException e) {
+                throw new RuntimeException("Cannot update image metadata: " 
+                            + e.getMessage(), e);
+            }
+
+            //ImageIODebugUtil.dumpMetadata(meta);
+            
+            //meta = super.updateMetadata(meta, params);
+            //ImageIODebugUtil.dumpMetadata(meta);
+        }
+        
+        return meta;
+    }
+    
+    private static IIOMetadata addAdobeTransform(IIOMetadata meta) {
+        // add the adobe transformation (transform 1 -> to YCbCr)
+        IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(JPEG_NATIVE_FORMAT);
+
+        IIOMetadataNode markerSequence = getChildNode(root, "markerSequence");
+        if (markerSequence == null) {
+            throw new RuntimeException("Invalid metadata!");
+        }
+
+        IIOMetadataNode adobeTransform = getChildNode(markerSequence, "app14Adobe");
+        if (adobeTransform == null) {
+            adobeTransform = new IIOMetadataNode("app14Adobe");
+            adobeTransform.setAttribute("transform" , "1"); // convert RGB to YCbCr
+            adobeTransform.setAttribute("version", "101");
+            adobeTransform.setAttribute("flags0", "0");
+            adobeTransform.setAttribute("flags1", "0");
+
+            markerSequence.appendChild(adobeTransform);
+        } else {
+            adobeTransform.setAttribute("transform" , "1");
+        }
+
+        try {
+            meta.setFromTree(JPEG_NATIVE_FORMAT, root);
+        } catch (IIOInvalidTreeException e) {
+            throw new RuntimeException("Cannot update image metadata: " 
+                        + e.getMessage(), e);
+        }
+        return meta;
+    }    
+    
+    /**
+     * @see ImageIOImageWriter#getDefaultWriteParam(javax.imageio.ImageWriter, java.awt.image.RenderedImage, ImageWriterParams)
+     */
+    protected ImageWriteParam getDefaultWriteParam(
+            ImageWriter iiowriter, RenderedImage image,
+            ImageWriterParams params) {
+        JPEGImageWriteParam param = new JPEGImageWriteParam(iiowriter.getLocale());
+        //ImageTypeSpecifier type = ImageTypeSpecifier.createFromRenderedImage(image);
+        /*
+        ImageTypeSpecifier type = new ImageTypeSpecifier(
+                image.getColorModel(), image.getSampleModel());
+                */
+        /* didn't work as expected...
+        ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(
+                BufferedImage.TYPE_INT_RGB);
+        param.setDestinationType(type);
+        param.setSourceBands(new int[] {0, 1, 2});
+        */
+        return param;
+    }
+    
+    
+}

Modified: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOPNGImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,34 +1,35 @@
-/*
-
-   Copyright 2006  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.
-
- */
-package org.apache.xmlgraphics.image.writer.imageio;
-
-/**
- * ImageWriter that encodes PNG images using Image I/O.
- *
- * @version $Id$
- */
-public class ImageIOPNGImageWriter extends ImageIOImageWriter {
-
-    /**
-     * Main constructor.
-     */
-    public ImageIOPNGImageWriter() {
-        super("image/png");
-    }
-    
-}
+/*
+
+   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.xmlgraphics.image.writer.imageio;
+
+/**
+ * ImageWriter that encodes PNG images using Image I/O.
+ *
+ * @version $Id$
+ */
+public class ImageIOPNGImageWriter extends ImageIOImageWriter {
+
+    /**
+     * Main constructor.
+     */
+    public ImageIOPNGImageWriter() {
+        super("image/png");
+    }
+    
+}

Modified: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/image/writer/imageio/ImageIOTIFFImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,34 +1,35 @@
-/*
-
-   Copyright 2006  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.
-
- */
-package org.apache.xmlgraphics.image.writer.imageio;
-
-/**
- * ImageWriter that encodes TIFF images using Image I/O.
- *
- * @version $Id$
- */
-public class ImageIOTIFFImageWriter extends ImageIOImageWriter {
-
-    /**
-     * Main constructor.
-     */
-    public ImageIOTIFFImageWriter() {
-        super("image/tiff");
-    }
-
-}
+/*
+
+   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.xmlgraphics.image.writer.imageio;
+
+/**
+ * ImageWriter that encodes TIFF images using Image I/O.
+ *
+ * @version $Id$
+ */
+public class ImageIOTIFFImageWriter extends ImageIOImageWriter {
+
+    /**
+     * Main constructor.
+     */
+    public ImageIOTIFFImageWriter() {
+        super("image/tiff");
+    }
+
+}



---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message