[maven-release-plugin] copy for tag odftoolkit-0.6.2-incubating
git-svn-id: https://svn.apache.org/repos/asf/incubator/odf/tags/odftoolkit-0.6.2-incubating@1789206 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index d47358a..1a9a243 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,8 @@
-------------
* ODFTOOLKIT-200 Enable password encryption and encryption manifest handling to ODFDOM
* ODFTOOLKIT-294 Adding the XSL stylesheet for extracting default values to XSLT_RUNNER XSL sample folder
+* ODFTOOLKIT-304 Update ODF 1.2 schema to OpenDocument-v1.2 final version
+* ODFTOOLKIT-375 odftoolkit-0.6 does not work in my environment
* ODFTOOLKIT-374 Set the field "Last Modified By" in the metadata file
* ODFTOOLKIT-410 Set table:error-message for content-validation to activate actual validation
* ODFTOOLKIT-417 Missing methods for set and get background-color, subscripted and superscripted for a paragraph
@@ -65,6 +67,7 @@
Nick Burch (mentor)
Rob Weir (mentor)
Sam Ruby (mentor)
+Tom Barber (mentor)
Yegor Kozlov (mentor)
Damjan Jovanovic (committer)
Dave Fisher (committer)
@@ -84,6 +87,7 @@
Jerry Sie Hsiung
Josef Petrák
Jörg Büsse
+Kakha Kheladze
Marc Schreiber
Mathias Silbermann
Michael Stahl
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
index a2a9f75..d1aee7d 100644
--- a/DISCLAIMER.txt
+++ b/DISCLAIMER.txt
@@ -1 +1,7 @@
-Apache ODF Toolkit is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+Apache ODF Toolkit is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
+all newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized in a
+manner consistent with other successful ASF projects. While incubation status is
+not necessarily a reflection of the completeness or stability of the code, it
+does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/NOTICE b/NOTICE
index 7f161f6..0a66513 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
Apache ODF Toolkit
-Copyright 2011-2014 The Apache Software Foundation
+Copyright 2011-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/assemble/bin.xml b/assemble/bin.xml
index 467e3a9..342cab7 100644
--- a/assemble/bin.xml
+++ b/assemble/bin.xml
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>bin</id>
<formats>
<format>zip</format>
@@ -26,6 +26,9 @@
<fileSet>
<directory>${project.basedir}/target/${project.version}-bin/</directory>
<outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/DEPENDENCIES</exclude>
+ </excludes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
diff --git a/assemble/doc.xml b/assemble/doc.xml
index 0d7570f..ad765be 100644
--- a/assemble/doc.xml
+++ b/assemble/doc.xml
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>doc</id>
<formats>
<format>zip</format>
diff --git a/assemble/src.xml b/assemble/src.xml
index ce7e012..c76f25a 100644
--- a/assemble/src.xml
+++ b/assemble/src.xml
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>src</id>
<formats>
<format>zip</format>
diff --git a/generator/README.txt b/generator/README.txt
index bb47da1..30ad74e 100644
--- a/generator/README.txt
+++ b/generator/README.txt
@@ -43,15 +43,5 @@
Just put the file odfdom.jar in your classpath. You will
need Apache Velocity Engine and Sun's Multi Schema Validator (MSV) as well. Get it from
http://velocity.apache.org/
- http://java.net/downloads/msv/releases/
+ https://msv.java.net/
-
-Documentation
---------------
-
-Javadoc can be downloaded from the project's download area:
- http://
-
-For online documentation please start by reading the project's
-Wiki page
- http://
diff --git a/generator/schema2template-maven-plugin/README.txt b/generator/schema2template-maven-plugin/README.txt
index c78d7c4..f9e4cf4 100644
--- a/generator/schema2template-maven-plugin/README.txt
+++ b/generator/schema2template-maven-plugin/README.txt
@@ -1 +1 @@
-This is the Maven plugin used by ODFDOM
+This is the Maven plugin used by ODFDOM to generate Java sources from the XML schema
diff --git a/generator/schema2template/README.txt b/generator/schema2template/README.txt
index a132e55..8e0b17a 100644
--- a/generator/schema2template/README.txt
+++ b/generator/schema2template/README.txt
@@ -1 +1 @@
-This project is used by ODFDOM to generated dom layer elements and attributes .
+This project is used by ODFDOM to generate dom layer elements and attributes.
diff --git a/legal/NOTICE b/legal/NOTICE
index b602d3f..4661514 100644
--- a/legal/NOTICE
+++ b/legal/NOTICE
@@ -1,6 +1,6 @@
Apache ODF Toolkit
-Copyright 2011 The Apache Software Foundation
+Copyright 2011-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/odfdom/README.txt b/odfdom/README.txt
index 67db683..29b9c22 100644
--- a/odfdom/README.txt
+++ b/odfdom/README.txt
@@ -31,18 +31,3 @@
API documentation (Javadoc), sources and binaries can be downloaded
from the project's download area:
http://incubator.apache.org/odftoolkit/downloads.html
-
-
-License
---------
-
-Apache License, Version 2.0. See file LICENSE.txt or
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Installation
--------------
-
-Just put the file odfdom.jar in your classpath. You will
-need Apache Xerces-J as well. Get it from
- http://xml.apache.org/dist/xerces-j/
diff --git a/pom.xml b/pom.xml
index 128ee0b..50e903a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,9 +155,9 @@
<id>svanteschubert</id>
<name>Svante</name>
<email>svanteschubert AT apache.org</email>
- <organization>Individual</organization>
+ <organization>Freelancer</organization>
<roles>
- <role>ODFDOM working group chair</role>
+ <role>OASIS ODF Collaboration subcommittee chair</role>
<role>architect</role>
<role>developer</role>
</roles>
@@ -208,7 +208,7 @@
<developer>
<id>lars_behrmann</id>
<name>Lars</name>
- <organization>Oracle Inc.</organization>
+ <organization>Freelancer</organization>
<organizationUrl>http://www.oracle.com/</organizationUrl>
<roles>
<role>developer</role>
@@ -430,14 +430,14 @@
<include name="*.tar.bz2" />
</fileset>
</checksum>
- <checksum algorithm="SHA1" fileext=".sha">
+ <checksum algorithm="SHA512" fileext=".sha">
<fileset dir="${basedir}/target">
<include name="*.zip" />
<include name="*.tar.gz" />
<include name="*.tar.bz2" />
</fileset>
</checksum>
- <checksum file="target/odftoolkit-${project.version}-src.zip" algorithm="SHA1" property="checksum" />
+ <checksum file="target/odftoolkit-${project.version}-src.zip" algorithm="SHA512" property="checksum" />
<copy todir="${basedir}/target/release/${project.version}/">
<fileset dir="${basedir}/target">
<include name="*-source-release.*" />
@@ -466,7 +466,7 @@
https://svn.apache.org/repos/asf/incubator/odf/tags/${project.version}/
- The SHA1 checksum of the archive is ${checksum}.
+ The SHA512 checksum of the archive is ${checksum}.
Please vote on releasing this package as Apache ODF Toolkit ${project.version}.
The vote is open for the next 72 hours and passes if a majority
diff --git a/simple/README.txt b/simple/README.txt
index 0e919af..98f2043 100644
--- a/simple/README.txt
+++ b/simple/README.txt
@@ -2,11 +2,6 @@
* Simple Java API for ODF *
* *
*************************************************************
-* *
-* Version: @VERSION@ *
-* Release Date: @DATE@ *
-* *
-*************************************************************
About Simple
@@ -22,36 +17,20 @@
Documentation
--------------
-The latest release notes are available online at the project's
-Wiki page:
- http://odftoolkit.org/projects/simple/pages/Home
-
-In general, the Wiki page is a great place to start when looking
-for online information about the simple project:
- http://odftoolkit.org/projects/simple/pages/Home
-
-The website is another place that you can get online documentations,
-such as cookbook, javadoc and demo codes:
- http://simple.odftoolkit.org/
-
-API documentation (Javadoc) can be downloaded from the project's
-download area:
- http://odftoolkit.org/projects/simple/downloads
-
-The Javadoc can also be viewed online:
- http://simple.odftoolkit.org/javadoc/index.html
-
-
-License
---------
-
-Apache License, Version 2.0. Please see file LICENSE.txt.
-
-
-Installation
--------------
-
-Just put the file simple.jar in your classpath. You will
-need ODFDOM0.9-SNAPSHOT and Apache Xerces-J 2.9.1 as well. Get them from
- http://odftoolkit.org/projects/simple/downloads/directory/tools
- http://xerces.apache.org/mirrors.cgi
+The Home Page for the ODF Toolkit:
+ http://incubator.apache.org/odftoolkit/index.html
+
+ODFDOM Getting Start Guide:
+ http://incubator.apache.org/odftoolkit/odfdom/index.html
+
+Simple API Getting Start Guide:
+ http://incubator.apache.org/odftoolkit/simple/gettingstartguide.html
+
+Simple API Cookbook:
+ http://incubator.apache.org/odftoolkit/simple/document/cookbook/index.html
+
+Simple API Demos:
+ http://incubator.apache.org/odftoolkit/simple/demo/index.html
+
+Simple API Online JavaDoc:
+ http://incubator.apache.org/odftoolkit/simple/document/javadoc/index.html
diff --git a/taglets/README.txt b/taglets/README.txt
index 4a52119..e5c9232 100644
--- a/taglets/README.txt
+++ b/taglets/README.txt
@@ -7,11 +7,12 @@
About Taglets
-------------
-This sub project defines some javadoc tags for ODFDOM. Most of users no need to care it.
+This sub project defines some javadoc tags for ODFDOM.
+There are three kind of taglets for ODF elements, attributes and types.
+
+The purpose is that the JavaDoc of generated Java classes for ODF XML elements,
+attributes and types are being linked to their correct anchor in the ODF
+specification (as well in HTML).
-License
---------
-
-Apache License, Version 2.0. Please see file LICENSE.txt.
diff --git a/validator/README.txt b/validator/README.txt
index eb74ee0..0d1c134 100644
--- a/validator/README.txt
+++ b/validator/README.txt
@@ -1,49 +1,14 @@
*************************************************************
-* ODFDOM Java Library *
+* ODF VALIDATOR *
* *
*************************************************************
-About ODFDOM
--------------
+About ODF VALIDATOR
+-------------------
-ODFDOM is an OpenDocument Format (ODF) framework. Its purpose
-is to provide an easy common way to create, access and
-manipulate ODF files, without requiring detailed knowledge of
-the ODF specification. It is designed to provide the ODF
-developer community with an easy lightwork programming API
-portable to any object-oriented language.
+ODF Validator is a tool that validates OpenDocument files and checks them for certain conformance criteria.
+ODF Validator is available as Java library for command line or embedded use, as well as a web application archive (WAR) file.
-The current reference implementation is written in Java.
-
-
-Documentation
---------------
-
-The latest release notes and a summary of API changes (if any) are available
-online at the project's Wiki page:
- http://odftoolkit.org/projects/odfdom/pages/ReleaseNotes
-
-In general, the Wiki page is a great place to start when looking for online
-documentation and other information about the odfdom project.
- http://odftoolkit.org/projects/odfdom/pages/Home
-
-API documentation (Javadoc) can be downloaded from the project's download area:
- http://odftoolkit.org/projects/odfdom/downloads
-
-The Javadoc can also be viewed online and is available for each version, e.g.
- http://odfdom.odftoolkit.org/0.8.6/docs/api/
-
-
-License
---------
-
-Apache License, Version 2.0. Please see file LICENSE.txt.
-
-
-Installation
--------------
-
-Just put the file odfdom.jar in your classpath. You will
-need Apache Xerces-J as well. Get it from
- http://xml.apache.org/dist/xerces-j/
+Further information can be found under:
+http://incubator.apache.org/odftoolkit/conformance/ODFValidator.html
\ No newline at end of file
diff --git a/xslt-runner/README.txt b/xslt-runner/README.txt
index 6922b18..3e6dfdd 100644
--- a/xslt-runner/README.txt
+++ b/xslt-runner/README.txt
@@ -18,21 +18,3 @@
In general, the Wiki page is a great place to start when looking for online
documentation and other information about ODFXSLTRunner.
https://incubator.apache.org/odftoolkit/xsltrunner/ODFXSLTRunner.html
-
-
-License
---------
-
-Apache License, Version 2.0. Please see file LICENSE.txt.
-
-
-Installation
--------------
-
-Just put the file odfxsltrunner.jar in your classpath.
-
-You will need ODFDOM. Get it from
- https://incubator.apache.org/odftoolkit/odfdom/index.html
-
-You will further need Apache Xerces-J. Get it from
- http://xml.apache.org/dist/xerces-j/