diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..22a0c2f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/qdox-2.0-M5-project.tar.gz diff --git a/.rh-maven35-qdox.metadata b/.rh-maven35-qdox.metadata new file mode 100644 index 0000000..d423295 --- /dev/null +++ b/.rh-maven35-qdox.metadata @@ -0,0 +1 @@ +f0c0d41d7001102551e500da692acb1fd9ef07eb SOURCES/qdox-2.0-M5-project.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-16-Single-comment-line-not-recognized.patch b/SOURCES/0001-16-Single-comment-line-not-recognized.patch new file mode 100644 index 0000000..1d05659 --- /dev/null +++ b/SOURCES/0001-16-Single-comment-line-not-recognized.patch @@ -0,0 +1,69 @@ +From ca5a50fc69b4b1bb0f640edb8dbaa13c5e90112e Mon Sep 17 00:00:00 2001 +From: rfscholte +Date: Thu, 19 Jan 2017 18:44:38 +0100 +Subject: [PATCH] #16 Single comment line not recognized + +--- + src/grammar/lexer.flex | 2 +- + .../thoughtworks/qdox/JavaProjectBuilderTest.java | 32 ++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 1 deletion(-) + +diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex +index 681f2b8..bd3462c 100644 +--- a/src/grammar/lexer.flex ++++ b/src/grammar/lexer.flex +@@ -608,7 +608,7 @@ JavadocEnd = "*"+ "/" + \' { if (appendingToCodeBody) { codeBody.append('\''); } pushState(CHAR); } + } + +- { ++ { + "//" { if (appendingToCodeBody) { codeBody.append("//"); } pushState(SINGLELINECOMMENT); } + "/*" { if (appendingToCodeBody) { codeBody.append("/*"); } pushState(MULTILINECOMMENT); } + "/**/" { if (appendingToCodeBody) { codeBody.append("/**/"); } } +diff --git a/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java b/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java +index 204a23a..edc6352 100644 +--- a/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java ++++ b/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java +@@ -1582,6 +1582,38 @@ public class JavaProjectBuilderTest extends TestCase + + assertEquals( "com.fg.rtdoc.test.Iface", clz.getInterfaces().get(0).getFullyQualifiedName() ); + } ++ ++ // Github #16 ++ public void testBeanProperties() ++ { ++ String zothParent = "public class ZothParent {\n" + ++ " private String name;\n" + ++ " public String getName() {\n" + ++ " return name;\n" + ++ " }\n" + ++ " public void setName(String name) {\n" + ++ " this.name = name;\n" + ++ " }\n" + ++ "}"; ++ ++ String zothChild = "public class ZothChild // extends ZothParent\n" + ++ "{\n" + ++ " private int age;\n" + ++ " public int getAge() {\n" + ++ " return age;\n" + ++ " }\n" + ++ " public void setAge(int age) {\n" + ++ " this.age = age;\n" + ++ " }\n" + ++ "}"; ++ ++ JavaProjectBuilder builder = new JavaProjectBuilder(); ++ builder.addSource(new StringReader( zothParent )); ++ JavaClass zothClass = builder.addSource(new StringReader( zothChild )).getClassByName( "ZothChild" ); ++ assertEquals( "java.lang.Object", zothClass.getSuperClass().getBinaryName()); ++ assertEquals( 2, zothClass.getBeanProperties( true ).size() ); ++ ++ } + + public void testDeclarationSignatureWithGenerics() { + String source = "import java.util.List;" +-- +2.9.3 + diff --git a/SOURCES/qdox-MANIFEST.MF b/SOURCES/qdox-MANIFEST.MF new file mode 100644 index 0000000..0ef2446 --- /dev/null +++ b/SOURCES/qdox-MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-Name: %pluginName +Bundle-SymbolicName: com.thoughtworks.qdox +Bundle-Version: 1.6.3.v20081201-1400 +Export-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks + .qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi + on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor + ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio + n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor + ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru + cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3" +Bundle-ManifestVersion: 2 +Import-Package: junit.framework;version="[3.8.2,4.0.0)";resolution:=op + tional,org.apache.tools.ant;version="[1.7.0,2.0.0)";resolution:=optio + nal,org.apache.tools.ant.types;version="[1.7.0,2.0.0)";resolution:=op + tional diff --git a/SPECS/qdox.spec b/SPECS/qdox.spec new file mode 100644 index 0000000..dc28bec --- /dev/null +++ b/SPECS/qdox.spec @@ -0,0 +1,243 @@ +%{?scl:%scl_package qdox} +%{!?scl:%global pkg_name %{name}} + +%global vertag M5 + +Summary: Extract class/interface/method definitions from sources +Name: %{?scl_prefix}qdox +Version: 2.0 +Release: 0.8.%{vertag}.2%{?dist} +Epoch: 0 +License: ASL 2.0 +URL: https://github.com/paul-hammant/qdox +BuildArch: noarch + +Source0: http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}-%{vertag}/%{pkg_name}-%{version}-%{vertag}-project.tar.gz +Source1: qdox-MANIFEST.MF + +# https://github.com/paul-hammant/qdox/issues/16 +Patch1: 0001-16-Single-comment-line-not-recognized.patch + +BuildRequires: byaccj +BuildRequires: %{?scl_prefix}jflex +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugins:maven-invoker-plugin) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.mojo:exec-maven-plugin) +BuildRequires: %{?scl_prefix}mvn(org.sonatype.oss:oss-parent:pom:) + +%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 %{pkg_name} + +%description javadoc +API docs for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version}-%{vertag} +find -name *.jar -delete +rm -rf bootstrap + +%patch1 -p1 + +# We don't need these plugins +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin +%pom_remove_plugin :maven-jflex-plugin + +%mvn_file : %{pkg_name} +%mvn_alias : qdox:qdox + +%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl' + +%build +# Generate scanners (upstream does this with maven-jflex-plugin) +jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex +jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex + +# Build artifact +%mvn_build -f -- -Dqdox.byaccj.executable=byaccj + +# Inject OSGi manifests +mkdir -p META-INF +cp -p %{SOURCE1} META-INF/MANIFEST.MF +touch META-INF/MANIFEST.MF +zip -u target/%{pkg_name}-%{version}.jar META-INF/MANIFEST.MF + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE.txt README.md + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt + +%changelog +* Thu Jun 22 2017 Michael Simacek - 0:2.0-0.8.M5.2 +- Mass rebuild 2017-06-22 + +* Wed Jun 21 2017 Java Maintainers - 0:2.0-0.8.M5.1%{?dist} +- Automated package import and SCL-ization + +* Sat Feb 11 2017 Fedora Release Engineering - 0:2.0-0.8.M5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 20 2017 Michael Simacek - 0:2.0-0.7.M5 +- Backport patch for misparsed comments + +* Tue Jan 17 2017 Michael Simacek - 0:2.0-0.6.M5 +- Update to upstream version 2.0-M5 + +* Thu Feb 04 2016 Fedora Release Engineering - 0:2.0-0.5.M3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jun 22 2015 Mikolaj Izdebski - 0:2.0-0.4.M3 +- Update to upstream version 2.0-M3 + +* Thu Jun 18 2015 Fedora Release Engineering - 0:2.0-0.3.M2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Mar 24 2015 Mikolaj Izdebski - 0:2.0-0.2.M2 +- Regenerate build-requires +- Remove obsoletes on qdox-manual + +* Mon Oct 27 2014 Mikolaj Izdebski - 0:2.0-1.M2 +- Update to upstream version 2.0-M2 + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.12.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 0:1.12.1-9 +- Build with %%mvn_build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.12.1-8 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Aug 12 2013 akurtakov 0:1.12.1-7 +- Fix FTBFS bug#993187 . + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Feb 23 2013 Alexander Kurtakov 0:1.12.1-5 +- Remove wagon-webdav extension. + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:1.12.1-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 0:1.12.1-2 +- Run jflex manually before Maven build is started +- Resolves: rhbz#879653 + +* Tue Dec 11 2012 Alexander Kurtakov 0:1.12.1-1 +- Update to latest upstream release. + +* Tue Nov 13 2012 Stanislav Ochotnicky - 0:1.12-7 +- Add license to javadoc subpackage + +* Wed Aug 1 2012 Alexander Kurtakov 0:1.12-6 +- Inject osgi metadata from eclipse orbit. + +* Sat Jul 21 2012 Fedora Release Engineering - 0:1.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jun 10 2011 Alexander Kurtakov 0:1.12-3 +- Build with maven 3.x. +- Adapt to current guidelines. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Oct 5 2010 Alexander Kurtakov 0:1.12-1 +- Update to new version. + +* Mon Jun 7 2010 Alexander Kurtakov 0:1.11-3 +- Make sure to remove all yacc executables. + +* Mon Jun 7 2010 Alexander Kurtakov 0:1.11-2 +- Symlink byaccj to both yacc.linux and yacc.linux.x86_64 to keep it building as noarch. + +* Mon Mar 15 2010 Alexander Kurtakov 0:1.11-1 +- Update to 1.11. + +* Mon Feb 15 2010 Alexander Kurtakov 0:1.10.1-2 +- Rebuild for rhbz#565013. + +* Thu Jan 14 2010 Alexander Kurtakov 0:1.10.1-1 +- Update to upstream 1.10.1. + +* Sat Sep 19 2009 Alexander Kurtakov 0:1.9.2-2 +- Remove not needed sources. + +* Tue Aug 18 2009 Alexander Kurtakov 0:1.9.2-1 +- Update to 1.9.2. + +* Fri Apr 03 2009 Ralph Apel 0:1.8-1.jpp5 +- 1.8 as qdox18 because of qdox frozen at 1.6.1 in JPP-5 + +* Tue Jul 01 2008 Ralph Apel 0:1.6.3-5.jpp5 +- Restore to devel +- Drop mockobjects BR + +* Fri Jun 13 2008 Ralph Apel 0:1.6.3-4.jpp5 +- Add com.thoughtworks.qdox groupId to depmap frag + +* Tue Feb 26 2008 Ralph Apel 0:1.6.3-3jpp +- Add settings file +- Fix pom marking jmock dependency as of scope test +- Fix -jpp-depmap.xml for asm2-parent + +* Mon Nov 26 2007 Ralph Apel 0:1.6.3-2jpp +- Fix maven macro value + +* Thu Nov 22 2007 Ralph Apel 0:1.6.3-1jpp +- Upgrade to 1.6.3 + +* Wed May 30 2007 Ralph Apel 0:1.6.2-1jpp +- Upgrade to 1.6.2 +- Activate tests while building with ant +- Make Vendor, Distribution based on macro +- Install depmap frags, poms + +* Thu Mar 22 2007 Vivek Lakshmanan 0:1.6.1-1jpp.ep1.4 +- Rebuild with fixed component-info.xml + +* Fri Feb 23 2007 Ralph Apel 0:1.5-3jpp +- Add option to build without maven +- Omit tests when building without maven +- Add gcj_support option + +* Mon Feb 20 2006 Ralph Apel - 0:1.5-2jpp +- Rebuild for JPP-1.7, adapting to maven-1.1 + +* Wed Nov 16 2005 Ralph Apel - 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 - 0:1.4-3jpp +- Rebuild with Ant 1.6.2 + +* Fri Aug 06 2004 Ralph Apel - 0:1.4-2jpp +- Upgrade to ant-1.6.X + +* Mon Jun 07 2004 Ralph Apel - 0:1.4-1jpp +- Upgrade to 1.4 +- Drop Requires: mockobjects (Build/Test only) + +* Tue Feb 24 2004 Ralph Apel - 0:1.3-1jpp +- First JPackage release