incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1172462 - in /incubator/odf/trunk/validator: nbproject/ src/org/odftoolkit/odfvalidator/
Date Mon, 19 Sep 2011 05:40:00 GMT
Author: devinhan
Date: Mon Sep 19 05:40:00 2011
New Revision: 1172462

URL: http://svn.apache.org/viewvc?rev=1172462&view=rev
Log:
changeset:   31:36b17713d99e
user:        michael.brauer
date:        Fri Feb 25 10:27:00 2011 +0100
Access control,

Modified:
    incubator/odf/trunk/validator/nbproject/build-impl.xml
    incubator/odf/trunk/validator/nbproject/genfiles.properties
    incubator/odf/trunk/validator/nbproject/project.properties
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFFileValidator.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFRootPackageValidator.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFStreamValidator.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFSubPackageValidator.java

Modified: incubator/odf/trunk/validator/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/build-impl.xml?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/build-impl.xml (original)
+++ incubator/odf/trunk/validator/nbproject/build-impl.xml Mon Sep 19 05:40:00 2011
@@ -291,15 +291,18 @@ is divided into following sections:
             <attribute default="${build.classes.dir}" name="destdir"/>
             <sequential>
                 <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
                     <path>
                         <filelist dir="@{destdir}" files="${javac.includes}"/>
                     </path>
                     <globmapper from="*.java" to="*.class"/>
                 </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
                 <delete>
-                    <files includes="${javac.includes.binary}"/>
+                    <files includesfile="${javac.includesfile.binary}"/>
                 </delete>
+                <delete file="${javac.includesfile.binary}"/>
             </sequential>
         </macrodef>
     </target>

Modified: incubator/odf/trunk/validator/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/genfiles.properties?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/genfiles.properties (original)
+++ incubator/odf/trunk/validator/nbproject/genfiles.properties Mon Sep 19 05:40:00 2011
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=be360661
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files
for you.
 nbproject/build-impl.xml.data.CRC32=6a1772d4
-nbproject/build-impl.xml.script.CRC32=1a7369ca
-nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
+nbproject/build-impl.xml.script.CRC32=59408c72
+nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45

Modified: incubator/odf/trunk/validator/nbproject/project.properties
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/nbproject/project.properties?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/nbproject/project.properties (original)
+++ incubator/odf/trunk/validator/nbproject/project.properties Mon Sep 19 05:40:00 2011
@@ -25,18 +25,11 @@ dist.jar=${dist.dir}/odfvalidator.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.isorelax-jaxp-bridge-1.0.jar=lib/isorelax-jaxp-bridge-1.0.jar
-file.reference.isorelax.jar=lib/isorelax.jar
-file.reference.msv.jar=lib/msv.jar
-file.reference.odfdom.jar=../odfdom~developer/target/odfdom.jar
 file.reference.odfvalidator-test-resources=test-resources
-file.reference.relaxngDatatype.jar=lib/relaxngDatatype.jar
-file.reference.xercesImpl.jar=lib/xercesImpl.jar
-file.reference.xsdlib.jar=lib/xsdlib.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.odfdom.jar}
+    ${libs.ODFDOM0.8.7.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchchecked
 javac.deprecation=false
@@ -65,14 +58,11 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform
 run.classpath=\
-    ${file.reference.xercesImpl.jar}:\
-    ${file.reference.isorelax-jaxp-bridge-1.0.jar}:\
-    ${file.reference.isorelax.jar}:\
-    ${file.reference.msv.jar}:\
-    ${file.reference.relaxngDatatype.jar}:\
-    ${file.reference.xsdlib.jar}:\
+    ${build.classes.dir}:\
     ${javac.classpath}:\
-    ${build.classes.dir}
+    ${libs.Xerces2.9.1.classpath}:\
+    ${libs.MSV.classpath}:\
+    ${libs.ISO-Relax-JAXP-Bridge.classpath}
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFFileValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFFileValidator.java?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFFileValidator.java (original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFFileValidator.java Mon
Sep 19 05:40:00 2011
@@ -50,7 +50,7 @@ public class ODFFileValidator extends OD
     }
 
     @Override
-    String getDocumentPath()
+    protected String getDocumentPath()
     {
         return ""; // this is the root document
     }

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
Mon Sep 19 05:40:00 2011
@@ -45,7 +45,7 @@ import org.xml.sax.helpers.DefaultHandle
 /**
  * Validator for Files
  */
-public abstract class ODFPackageValidator {
+abstract class ODFPackageValidator {
 
     static final String DOCUMENT_SETTINGS = "document-settings";
     static final String DOCUMENT_STYLES = "document-styles";
@@ -62,7 +62,7 @@ public abstract class ODFPackageValidato
     private SAXParserFactory m_aSAXParserFactory = null;
 
 
-    ODFPackageValidator( Logger.LogLevel nLogLevel, OdfValidatorMode eMode, OdfVersion aVersion,
+    protected ODFPackageValidator( Logger.LogLevel nLogLevel, OdfValidatorMode eMode, OdfVersion
aVersion,
                              SAXParseExceptionFilter aFilter,ODFValidatorProvider aValidatorProvider)
{
         m_nLogLevel = nLogLevel;
         m_eMode = eMode;
@@ -73,23 +73,23 @@ public abstract class ODFPackageValidato
     }
 
 
-    abstract String getLoggerName();
+    protected abstract String getLoggerName();
 
-    abstract String getDocumentPath();
+    protected abstract String getDocumentPath();
 
-    abstract OdfPackage getPackage( Logger aLogger );
+    protected abstract OdfPackage getPackage( Logger aLogger );
 
-    abstract String getStreamName( String aEntry );
+    protected abstract String getStreamName( String aEntry );
 
 
-    public boolean validate(PrintStream aOut) throws ODFValidatorException
+    protected boolean validate(PrintStream aOut) throws ODFValidatorException
     {
         Logger aLogger =
             new Logger( getLoggerName(), getDocumentPath(), aOut, m_nLogLevel);
         return _validate( aLogger );
     }
 
-    public boolean validate(Logger aParentLogger) throws ODFValidatorException
+    protected boolean validate(Logger aParentLogger) throws ODFValidatorException
     {
         Logger aLogger =
             new Logger( getDocumentPath(), aParentLogger);

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFRootPackageValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFRootPackageValidator.java?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFRootPackageValidator.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFRootPackageValidator.java
Mon Sep 19 05:40:00 2011
@@ -23,27 +23,27 @@
 package org.odftoolkit.odfvalidator;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Vector;
 import java.util.zip.ZipException;
 import javax.xml.validation.Validator;
 import org.odftoolkit.odfdom.pkg.OdfPackage;
 import org.odftoolkit.odfdom.doc.OdfDocument;
 import org.xml.sax.ErrorHandler;
 
-public abstract class ODFRootPackageValidator extends ODFPackageValidator implements ManifestEntryListener
{
+abstract class ODFRootPackageValidator extends ODFPackageValidator implements ManifestEntryListener
{
 
     private OdfPackage m_aPkg = null;
-    private Vector<ManifestEntry> m_aSubDocs = null;
+    private ArrayList<ManifestEntry> m_aSubDocs = null;
     private ODFPackageErrorHandler m_ErrorHandler = null;
 
-    ODFRootPackageValidator(Logger.LogLevel nLogLevel, OdfValidatorMode eMode, OdfVersion
aVersion, SAXParseExceptionFilter aFilter, ODFValidatorProvider aValidatorProvider) {
+    protected ODFRootPackageValidator(Logger.LogLevel nLogLevel, OdfValidatorMode eMode,
OdfVersion aVersion, SAXParseExceptionFilter aFilter, ODFValidatorProvider aValidatorProvider)
{
         super(nLogLevel, eMode, aVersion, aFilter, aValidatorProvider);
     }
 
-    abstract OdfPackage getPackage(ErrorHandler handler) throws Exception;
+    protected abstract OdfPackage getPackage(ErrorHandler handler) throws Exception;
 
-    OdfPackage getPackage(Logger aLogger) {
+    protected OdfPackage getPackage(Logger aLogger) {
         if (m_aPkg == null) {
             try {
                 m_ErrorHandler = new ODFPackageErrorHandler();
@@ -68,7 +68,7 @@ public abstract class ODFRootPackageVali
         return m_aPkg;
     }
 
-    String getStreamName( String aEntry )
+    protected String getStreamName( String aEntry )
     {
         return aEntry;
     }
@@ -134,7 +134,7 @@ public abstract class ODFRootPackageVali
         if( aManifestEntry.isOpenDocumentMediaType() )
         {
             if( m_aSubDocs == null )
-                m_aSubDocs = new Vector<ManifestEntry>();
+                m_aSubDocs = new ArrayList<ManifestEntry>();
             m_aSubDocs.add( aManifestEntry );
         }
     }

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFStreamValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFStreamValidator.java?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFStreamValidator.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFStreamValidator.java
Mon Sep 19 05:40:00 2011
@@ -50,16 +50,16 @@ public class ODFStreamValidator extends 
         m_aBaseURI=aBaseURI;
     }
 
-    OdfPackage getPackage(ErrorHandler handler) throws Exception
+    protected OdfPackage getPackage(ErrorHandler handler) throws Exception
     {
         return OdfPackage.loadPackage(m_aInputStream, m_aBaseURI, handler);
     }
     
-    String getLoggerName() {
+    protected String getLoggerName() {
         return m_aBaseURI;
     }
 
-    @Override
+    protected @Override
     String getDocumentPath()
     {
         return ""; // this is the root document

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFSubPackageValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFSubPackageValidator.java?rev=1172462&r1=1172461&r2=1172462&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFSubPackageValidator.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFSubPackageValidator.java
Mon Sep 19 05:40:00 2011
@@ -25,7 +25,7 @@ package org.odftoolkit.odfvalidator;
 import org.odftoolkit.odfdom.pkg.OdfPackage;
 
 
-public class ODFSubPackageValidator extends ODFPackageValidator {
+class ODFSubPackageValidator extends ODFPackageValidator {
 
     private OdfPackage m_aPkg = null;
     // this is the URI of the root package, not this subpackage!
@@ -47,21 +47,21 @@ public class ODFSubPackageValidator exte
     }
 
     @Override
-    String getLoggerName() {
+    protected String getLoggerName() {
         return m_aBaseURI;
     }
 
     @Override
-    String getDocumentPath() {
+    protected String getDocumentPath() {
         return m_aSubEntryName;
     }
 
-    OdfPackage getPackage( Logger aLogger ) 
+    protected OdfPackage getPackage( Logger aLogger ) 
     {
         return m_aPkg;
     }
 
-    String getStreamName( String aEntry )
+    protected String getStreamName( String aEntry )
     {
         return m_aSubEntryName + aEntry;
     }



Mime
View raw message