[Jpackage-commits] dist/qdox161/devel .cvsignore, 1.1, 1.2 qdox-1.6.1-byaccj.patch, NONE, 1.1 qdox-1.6.1-jflex.patch, NONE, 1.1 qdox-1.6.1-test.patch, NONE, 1.1 qdox-1.6.1.pom, NONE, 1.1 qdox-LocatedDef.java, NONE, 1.1 qdox-build.xml, NONE, 1.1 qdox161.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Fri Dec 3 19:25:12 CET 2010


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

Modified Files:
	.cvsignore sources 
Added Files:
	qdox-1.6.1-byaccj.patch qdox-1.6.1-jflex.patch 
	qdox-1.6.1-test.patch qdox-1.6.1.pom qdox-LocatedDef.java 
	qdox-build.xml qdox161.spec 
Log Message:
Import qdox161 into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/qdox161/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	3 Dec 2010 18:22:29 -0000	1.1
--- .cvsignore	3 Dec 2010 18:25:10 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ qdox-1.6.1-src.tar.gz

--- NEW FILE: qdox-1.6.1-jflex.patch ---
--- qdox/src/grammar/lexer.flex.orig	2008-07-29 10:40:50.044757855 -0400
+++ qdox/src/grammar/lexer.flex	2008-07-29 10:41:41.629793288 -0400
@@ -48,7 +48,7 @@
     }
 
     private void pushState(int newState) {
-        stateStack[stateDepth++] = yy_lexical_state;
+        stateStack[stateDepth++] = zzLexicalState;
         yybegin(newState);
     }
 

--- NEW FILE: qdox-LocatedDef.java ---
package com.thoughtworks.qdox.parser.structs;

public class LocatedDef {
	
	public int lineNumber;

}

--- NEW FILE: qdox161.spec ---
# Copyright (c) 2000-2010, 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 section free
%define oname qdox

Name:           qdox161
Version:        1.6.1
Release:        6%{?dist}
Epoch:          0
Summary:        Extract class/interface/method definitions from sources
License:        ASL 2.0
URL:            http://qdox.codehaus.org/
Group:          Development/Libraries/Java
# svn co https://svn.codehaus.org/qdox/tags/QDOX_1_6_1/qdox
# tar czvf qdox-1.6.1-src.tar.gz qdox
Source0:        qdox-1.6.1-src.tar.gz
Source1:        qdox-1.6.1.pom
Source2:        qdox-LocatedDef.java
Source3:        qdox-build.xml
Patch0:         qdox-1.6.1-byaccj.patch
Patch1:         qdox-1.6.1-jflex.patch
Patch2:         qdox-1.6.1-test.patch
BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  ant >= 0:1.7.1
BuildRequires:  ant-junit
BuildRequires:  junit
BuildRequires:  byaccj
BuildRequires:  java-cup
BuildRequires:  jflex
BuildRequires:  jmock
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Requires:  java >= 0:1.6.0

%description
QDox is a high speed, small footprint parser 
for extracting class/interface/method definitions 
from source files complete with JavaDoc @tags. 
It is designed to be used by active code 
generators or documentation tools. 

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q -n %{oname}
chmod -Rf a+rX,u+w,g-w,o-w bootstrap
rm -r bootstrap
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp -p %{SOURCE2} src/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java 
sed -e "s/@VERSION@/%{version}/g" %{SOURCE3} > build.xml

%build
export OPT_JAR_LIST="junit ant/ant-junit"
mkdir -p target/src/java/com/thoughtworks/qdox/parser/impl
export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes:$(build-classpath java-cup jflex jmock junit)
%{java} JFlex.Main \
    -d src/java/com/thoughtworks/qdox/parser/impl \
    src/grammar/lexer.flex
pushd target
%{_bindir}/byaccj \
    -Jnorun \
    -Jnoconstruct \
    -Jclass=Parser \
    -Jsemantic=Value \
    -Jpackage=com.thoughtworks.qdox.parser.impl \
    ../src/grammar/parser.y
popd
mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl
ant -Dbuild.sysclasspath=only jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/%{oname}-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-qdox161.pom
%add_to_maven_depmap %{oname} %{oname} %{version} JPP %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Fri Dec 03 2010 Ralph Apel <r.apel at r-apel.de> 0:1.6.1-6
- Refloat as qdox161
- Depmapped as qdox:qdox:1.6.1:jar

* Tue Jul 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5
- remove bootstrap binaries
- patch build for newer jflex
- patch build to disable failing tests on JDK6
- BuildRequires: jmock
- fix version in ant build.xml
- fix location of byaccj and jflex output files
- fix apidoc location
- correctly set CLASSPATH and OPT_JAR_LIST

* Mon Jul 28 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-4
- fix jflex part of build
- GCJ fixes
- fix javadoc Requires

* Sat Jul 26 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-3
- build without maven
- fix repolib permissions

* Thu May 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-2.jpp5
- remove spurious gnu-crypto dependency
- fix empty scriptlets
- fix License
- use %%{_bindir}

* Fri Apr 18 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-1jpp.ep1.5
- patch for byaccj
- place junit on CLASSPATH
- remove javadoc scriptlets

* Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.4
- Rebuild with fixed component-info.xml

* Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.3
- Add repository.jboss.com as a prefix for repodir

* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.2
- Add repolib subpackage

* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.1
- Merge with upstream for upgrade

* Fri Mar 16 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp
- Upgrade to 1.6.1

* Fri Feb 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5-3jpp
- Add option to build without maven
- Omit tests when building without maven
- Add gcj_support option

* Tue Feb 21 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.5-2jpp_1rh
- First Red Hat build

* Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.5-2jpp
- Rebuild for JPP-1.7, adapting to maven-1.1

* Wed Nov 16 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.5-1jpp
- Upgrade to 1.5
- Build is now done with maven and requires jflex and byaccj

* Wed Aug 25 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.4-3jpp
- Rebuild with Ant 1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-2jpp
- Upgrade to ant-1.6.X

* Mon Jun 07 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
- Upgrade to 1.4
- Drop Requires: mockobjects (Build/Test only)

* Tue Feb 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.3-1jpp
- First JPackage release

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/qdox161/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	3 Dec 2010 18:22:29 -0000	1.1
--- sources	3 Dec 2010 18:25:10 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 21aec355b29e6ba2743ed90db643dbfc  qdox-1.6.1-src.tar.gz

--- NEW FILE: qdox-1.6.1.pom ---
<project>
 <modelVersion>4.0.0</modelVersion>
 <groupId>qdox</groupId>
 <artifactId>qdox</artifactId>
 <version>1.6.1</version>
</project>

--- NEW FILE: qdox-build.xml ---
<project name="qdox" default="jar" basedir=".">
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="qdox- at VERSION@"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/java"/>
      </src>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="javadoc" description="o Generate javadoc" >
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &copy;  . All Rights Reserved."></property>
    <property name="title" value="QDox @VERSION@ API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="com.thoughtworks.qdox.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>

--- NEW FILE: qdox-1.6.1-byaccj.patch ---
--- qdox/maven.xml~	2008-04-18 19:38:46.000000000 -0400
+++ qdox/maven.xml	2008-04-18 19:39:03.000000000 -0400
@@ -57,7 +57,7 @@
         <arg value="../src/grammar/parser.y"/>
       </exec>
       <move todir="target/src/java/com/thoughtworks/qdox/parser/impl" file="target/Parser.java"/>
-      <move tofile="target/yacc-states.txt" file="target/y"/> <!-- rename states file to something obvious -->
+      <!-- <move tofile="target/yacc-states.txt" file="target/y"/> --> <!-- rename states file to something obvious -->
     </j:if>
   
     <!-- Add lexer and parser to compilation path -->

--- NEW FILE: qdox-1.6.1-test.patch ---
--- qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java.orig	2007-03-22 07:41:55.000000000 -0400
+++ qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java	2008-07-29 11:24:01.506877441 -0400
@@ -387,11 +387,11 @@
 
     public void testPropertyClass() {
         JavaClass propertyClass = builder.getClassByName("com.thoughtworks.qdox.testdata.PropertyClass");
-        assertEquals(1, propertyClass.getBeanProperties().length);
+        //assertEquals(1, propertyClass.getBeanProperties().length);
 
         // test ctor, methods and fields
         JavaMethod[] methods = propertyClass.getMethods();
-        assertEquals(5, methods.length);
+        //assertEquals(5, methods.length);
 
         JavaMethod ctor = propertyClass.getMethodBySignature("PropertyClass", null);
         JavaMethod getFoo = propertyClass.getMethodBySignature("getFoo", null);




More information about the JPackage-commits mailing list