[Jpackage-commits] dist/jing/devel .cvsignore, 1.1, 1.2 jing-20030619.pom, NONE, 1.1 jing-ValidatorImpl.patch, NONE, 1.1 jing-VerifierHandlerImpl.patch, NONE, 1.1 jing-xerces2.patch, NONE, 1.1 jing.spec, NONE, 1.1 jing_build.xml, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:57:45 CEST 2008


Update of /home/projects/jpackage/cvs/dist/jing/devel
In directory ryu.zarb.org:/tmp/cvs-serv22225/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jing-20030619.pom jing-ValidatorImpl.patch 
	jing-VerifierHandlerImpl.patch jing-xerces2.patch jing.spec 
	jing_build.xml 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jing/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:57:22 -0000	1.1
--- .cvsignore	28 May 2008 18:57:42 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jing-20030619.zip

--- NEW FILE: jing-20030619.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>thaiopensource</groupId>
  <artifactId>jing</artifactId>
  <version>20030619</version>
</project>
--- NEW FILE: jing-VerifierHandlerImpl.patch ---
--- src/com/thaiopensource/relaxng/jarv/VerifierHandlerImpl.java.sav99	2003-05-25 17:51:14.000000000 +0200
+++ src/com/thaiopensource/relaxng/jarv/VerifierHandlerImpl.java	2008-03-10 17:25:39.000000000 +0100
@@ -33,6 +33,6 @@
 
   public void reset() {
     super.reset();
-    ceh.reset();
+    if(ceh != null) ceh.reset();
   }
 }

--- NEW FILE: jing-xerces2.patch ---
*** src/com/thaiopensource/datatype/xsd/regex/xerces/RegexEngineImpl.java.orig	Thu May 13 14:44:49 2004
--- src/com/thaiopensource/datatype/xsd/regex/xerces/RegexEngineImpl.java	Thu May 13 14:45:21 2004
***************
*** 4,14 ****
  import com.thaiopensource.datatype.xsd.regex.Regex;
  import com.thaiopensource.datatype.xsd.regex.RegexSyntaxException;
  
! import org.apache.xerces.utils.regex.RegularExpression;
! import org.apache.xerces.utils.regex.ParseException;
  
  /**
!  * An implementation of <code>RegexEngine</code> using the Xerces 1 regular expression
   * implementation.
   */
  public class RegexEngineImpl implements RegexEngine {
--- 4,14 ----
  import com.thaiopensource.datatype.xsd.regex.Regex;
  import com.thaiopensource.datatype.xsd.regex.RegexSyntaxException;
  
! import org.apache.xerces.impl.xpath.regex.RegularExpression;
! import org.apache.xerces.impl.xpath.regex.ParseException;
  
  /**
!  * An implementation of <code>RegexEngine</code> using the Xerces 2 regular expression
   * implementation.
   */
  public class RegexEngineImpl implements RegexEngine {

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jing/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:57:22 -0000	1.1
--- sources	28 May 2008 18:57:43 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ f9b0775d8740f16ab3df82ad3707a093  jing-20030619.zip

--- NEW FILE: jing.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section   free
%define cvsversion 20030619

Name:           jing
Version:        0.1
Release:        0.20030619.9jpp
Epoch:          0
Summary:        Jing, a validator for RELAX NG implemented in Java

Group:          Development/Libraries/Java
License:        Open Source
URL:            http://www.thaiopensource.com/relaxng/jing.html
Source0:        http://www.thaiopensource.com/download/jing-20030619.zip
Source1:        jing_build.xml
Source2:        jing-20030619.pom
Patch0:         jing-xerces2.patch
Patch1:         jing-ValidatorImpl.patch
Patch2:         jing-VerifierHandlerImpl.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}

%if ! %{gcj_support}
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  xalan-j2 >= 0:2.7.0
BuildRequires:  xerces-j2 >= 0:2.9.0
BuildRequires:  isorelax
BuildRequires:  saxon
Requires:  java >= 0:1.5.0
Requires:  xalan-j2 >= 0:2.7.0
Requires:  xerces-j2 >= 0:2.9.0
Requires:  isorelax
Requires:  saxon

%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif

Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

%description
This version of Jing implements: RELAX NG 1.0 Specification,
RELAX NG Compact Syntax, and parts of RELAX NG DTD Compatibility, 
specifically checking of ID/IDREF/IDREFS.
Jing also has experimental support for schema languages other 
than RELAX NG; specifically W3C XML Schema (based on Xerces-J);
Schematron; Namespace Routing Language.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description    javadoc
%{summary}.

%prep
%setup -T -c -n %{name}-%{cvsversion}
(cd ..
unzip -q %{SOURCE0} )
cp %{SOURCE1} build.xml
mkdir src
( cd src
unzip -q ../src.zip )
find . -name "*.jar" -exec rm {} \;

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=$(build-classpath \
xalan-j2 \
xerces-j2 \
saxon \
isorelax)
CLASSPATH=$CLASSPATH:src/test-input:target/classes:target/test-classes
ant dist javadoc 

%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 644 dist/lib/%{name}-%{cvsversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap thaiopensource %{name} %{version} JPP %{name}

install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%{_datadir}/maven2
%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}


%changelog
* Mon Mar 10 2008 Ralph Apel <r.apel at r-apel.de> - 0:0.1-0.20030619.9jpp
- Build with java5 for java5
- Patch VerifierHandlerImpl to avoid NPE
- Add pom and depmap frag

* Thu Feb 22 2007 Ralph Apel <r.apel at r-apel.de> - 0:0.1-0.20030619.8jpp
- Add saxon (B)R
- Add gcj_support option
- Fix versioned jar file name from cvsversion to version

* Thu May 18 2006 Ralph Apel <r.apel at r-apel.de> - 0:20030619-7jpp
- First JPP-1.7 release

* Mon Oct 10 2005 Ralph Apel <r.apel at r-apel.de> - 0:20030619-6jpp
- Patch to JAXP-1.3

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:0.1-0.20030619.5jpp
- Change EVR to avoid very larve version number

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:20030619-4jpp
- Rebuild with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:20030619-3jpp
- Change dependencies from non-free msv to free isorelax
- Add runtime Requires

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:20030619-2jpp
- Upgrade to Ant 1.6.X

* Wed May 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:20030619-1jpp
- First JPackage release.

--- NEW FILE: jing_build.xml ---
<project name="Jing" default="dist" basedir=".">
    <description>
Jing, a validator for RELAX NG implemented in Java. 
This is written on top of SAX2.
    </description>
  <!-- set global properties for this build -->
  <property name="version" value="20030619"/>
  <property name="src" location="src"/>
  <property name="exasrc" location="example"/>
  <property name="build" location="build"/>
  <property name="exabuild" location="example"/>
  <property name="dist"  location="dist"/>
  <property name="javadoc" location="javadoc"/>
  <property name="javac.debug" value="true"/>
  <path id="project.cp">
    <pathelement location="${build}"/>
  </path>
  <target name="init">
    <!-- Create the build directory structure used by compile -->
    <mkdir dir="${build}"/>
  </target>

  <target name="compile" depends="init"
        description="compile the source " >
    <!-- Compile the java code from ${src} into ${build} -->
    <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}" source="1.4">
    </javac>
    <copy todir="${build}">
      <fileset dir="${src}">
        <include name="**/resources/*"></include>
        <include name="META-INF/services/*"></include>
      </fileset>
    </copy>
  </target>
  <target name="dist" depends="compile"
        description="generate the distribution" >
    <!-- Create the distribution directory -->
    <mkdir dir="${dist}/lib"/>

    <jar jarfile="${dist}/lib/jing-${version}.jar" basedir="${build}"/>
  </target>

  <target name="examples"
  	description="compiles the examples"
	depends="compile">
	
    <path id="compile.classpath">
      <pathelement location="${build}" /> 
    </path>

    <javac srcdir="${exasrc}" destdir="${exabuild}">
          <classpath refid="compile.classpath"/>
    </javac>
    
  </target>
	
  <target name="clean"
        description="clean up" >
    <!-- Delete the ${build} and ${dist} directory trees -->
    <delete dir="${build}"/>
    <delete dir="${dist}"/>
    <delete dir="${javadoc}"/>
  </target>

  <target name="javadoc">
  	<javadoc sourcepath="${src}"
		destdir="${javadoc}"
		source="1.4"
	>
		<packageset dir="${src}"/>
	</javadoc>
  </target>
</project>

--- NEW FILE: jing-ValidatorImpl.patch ---
--- src/com/thaiopensource/validate/xerces/ValidatorImpl.java.sav	2005-10-10 18:41:23.000000000 +0200
+++ src/com/thaiopensource/validate/xerces/ValidatorImpl.java	2005-10-10 18:42:26.000000000 +0200
@@ -287,6 +287,10 @@
     return locator.getPublicId();
   }
 
+  public String getXMLVersion() {
+    return null;
+  }
+
   public String getEncoding() {
     return null;
   }
@@ -311,6 +315,10 @@
     return locator.getColumnNumber();
   }
 
+  public int getCharacterOffset() {
+    return -1;
+  }
+
   static SAXException toSAXException(XNIException e) {
     if (e instanceof XMLParseException) {
       XMLParseException pe = (XMLParseException)e;




More information about the JPackage-commits mailing list