You are viewing a plain text version of this content. The canonical link for it is here.
Posted to odf-commits@incubator.apache.org by sv...@apache.org on 2017/03/13 12:55:18 UTC
svn commit: r1786677 - in /incubator/odf/trunk: CHANGES.txt
validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java
Author: svanteschubert
Date: Mon Mar 13 12:55:18 2017
New Revision: 1786677
URL: http://svn.apache.org/viewvc?rev=1786677&view=rev
Log:
ODFTOOLKIT-447 Encrypted documents invalid due to misordered manifest XML elements
Modified:
incubator/odf/trunk/CHANGES.txt
incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java
Modified: incubator/odf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/CHANGES.txt?rev=1786677&r1=1786676&r2=1786677&view=diff
==============================================================================
--- incubator/odf/trunk/CHANGES.txt (original)
+++ incubator/odf/trunk/CHANGES.txt Mon Mar 13 12:55:18 2017
@@ -15,7 +15,7 @@ Versions of major components
* Apache Jena 2.11.2 (http://jena.apache.org/download/index.html)
* Apache Commons Validator 1.5.0 (http://commons.apache.org/proper/commons-validator//download_validator.cgi)
-For a full dependecy list run mvn dependency:tree from the top level in the source module or see the release wiki page.
+For a full dependency list run mvn dependency:tree from the top level in the source module or see the release wiki page.
Optimizations
-------------
@@ -57,6 +57,8 @@ Bug Fixes
* ODFTOOLKIT-425 Please delete old releases from mirroring system
* ODFTOOLKIT-433 Document.updateXMLIds(...) does not update referenced id's
* ODFTOOLKIT-442 Table.getRowIterator() out of sync without calling hasNext()
+* ODFTOOLKIT-446 Receiving encrypted file without password should be not NULL
+* ODFTOOLKIT-447 Encrypted documents invalid due to misordered manifest XML elements
The following people have contributed to ODF Toolkit 0.6.2 incubating by reporting or submitting on the issues resolved in this release:
@@ -107,7 +109,7 @@ Versions of major components
* Apache Jena 2.9.4 (http://jena.apache.org/download/index.html)
* Apache Commons Validator 1.4.0 (http://commons.apache.org/proper/commons-validator//download_validator.cgi)
-For a full dependecy list run mvn dependency:tree from the top level in the source module or see the release wiki page.
+For a full dependency list run mvn dependency:tree from the top level in the source module or see the release wiki page.
Upgrading from 0.6-incubating
-----------------------------
@@ -204,7 +206,7 @@ Versions of major components
* Apache Clerezza 0.1-incubating (http://incubator.apache.org/clerezza/downloads/)
* Apache Commons Validator 1.4.0 (http://commons.apache.org/proper/commons-validator//download_validator.cgi)
-For a full dependecy list run mvn dependency:tree from the top level in the source module or see the release wiki page.
+For a full dependency list run mvn dependency:tree from the top level in the source module or see the release wiki page.
Upgrading from 0.5-incubating
-----------------------------
Modified: incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java?rev=1786677&r1=1786676&r2=1786677&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java (original)
+++ incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java Mon Mar 13 12:55:18 2017
@@ -1,20 +1,20 @@
/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
- *
+ *
* Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Use is subject to license terms.
- *
+ *
* 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. You can also
* obtain a copy of the License at http://odftoolkit.org/docs/license.txt
- *
+ *
* 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.
*
@@ -38,7 +38,6 @@ import org.odftoolkit.odfdom.pkg.manifes
import org.xml.sax.InputSource;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
-
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -88,11 +87,11 @@ abstract class ODFPackageValidator {
return _validate(aLogger);
}
-
+
OdfVersion getOdfPackageVersion(){
return mOdfPackageVersion;
}
-
+
private boolean _validate(Logger aLogger) throws ODFValidatorException {
boolean bHasErrors = false;
@@ -362,7 +361,7 @@ abstract class ODFPackageValidator {
if (aFileEntry != null) {
EncryptionDataElement aEncData = aFileEntry.getEncryptionData();
if (aEncData != null) {
- aLogger.logFatalError("stream content is encrypted. Validataion of encrypted content is not supported.");
+ aLogger.logFatalError("stream content is encrypted. Validation of encrypted content is not supported.");
return true;
}
}