From 2fc399160a9d83c6e2b942ebb7459ab883cdb501 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Mar 13 2007 23:31:24 +0000 Subject: auto-import maven-doxia-1.0-0.1.a7.3jpp.1 on branch devel from maven-doxia-1.0-0.1.a7.3jpp.1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..15d0782 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +maven-doxia-1.0a7.tar.gz +maven-doxia-autogenerated-files.tar.gz diff --git a/maven-doxia-1.4compile.patch b/maven-doxia-1.4compile.patch new file mode 100644 index 0000000..4b62053 --- /dev/null +++ b/maven-doxia-1.4compile.patch @@ -0,0 +1,13 @@ +--- ./doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java.sav 2006-03-16 18:47:30.000000000 -0500 ++++ ./doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java 2006-03-16 18:48:00.000000000 -0500 +@@ -95,7 +95,9 @@ + } + while ( ( l = source.getNextLine() ) != null && accept( l, source ) ); + +- assert rows.size() >= 1; ++ if (rows.size() < 1) { ++ throw new AssertionError(); ++ } + + return new TableBlock( rows ); + } diff --git a/maven-doxia-core-build.xml b/maven-doxia-core-build.xml new file mode 100644 index 0000000..119f7fc --- /dev/null +++ b/maven-doxia-core-build.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + + + diff --git a/maven-doxia-decoration-model-build.xml b/maven-doxia-decoration-model-build.xml new file mode 100644 index 0000000..8627d39 --- /dev/null +++ b/maven-doxia-decoration-model-build.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + diff --git a/maven-doxia-sink-api-build.xml b/maven-doxia-sink-api-build.xml new file mode 100644 index 0000000..bd0c15c --- /dev/null +++ b/maven-doxia-sink-api-build.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + diff --git a/maven-doxia-site-renderer-build.xml b/maven-doxia-site-renderer-build.xml new file mode 100644 index 0000000..1000a13 --- /dev/null +++ b/maven-doxia-site-renderer-build.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven-doxia.spec b/maven-doxia.spec new file mode 100644 index 0000000..ead4889 --- /dev/null +++ b/maven-doxia.spec @@ -0,0 +1,294 @@ +# Copyright (c) 2000-2005, 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 _with_gcj_support 1 +%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} + +# If you don't want to build with maven, and use straight ant instead, +# give rpmbuild option '--without maven' +%define _without_maven 1 +%define with_maven %{!?_without_maven:1}%{?_without_maven:0} +%define without_maven %{?_without_maven:1}%{!?_without_maven:0} + +%define namedversion 1.0-alpha-7 + +Name: maven-doxia +Version: 1.0 +Release: 0.1.a7.3jpp.1%{?dist} +Epoch: 0 +Summary: Content generation framework +License: Apache Software License +Group: Development/Java +URL: http://maven.apache.org/doxia/ + +# svn export http://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-7/ +# maven-doxia/ +# tar czf maven-doxia-1.0.a7-src.tar.gz maven-doxia/ +Source0: %{name}-%{version}a7.tar.gz + +Source1: %{name}-decoration-model-build.xml +Source2: %{name}-core-build.xml +Source3: %{name}-sink-api-build.xml +Source4: %{name}-site-renderer-build.xml +Source5: %{name}-autogenerated-files.tar.gz + +Patch0: %{name}-1.4compile.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%if ! %{gcj_support} +BuildArch: noarch +%endif + +BuildRequires: jpackage-utils >= 0:1.7.2 +BuildRequires: ant, ant-nodeps +%if %{with_maven} +BuildRequires: maven2 >= 0:2.0.4-9 +BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-install +BuildRequires: maven2-plugin-jar +BuildRequires: maven2-plugin-javadoc +BuildRequires: maven2-plugin-resources +BuildRequires: maven2-plugin-site +BuildRequires: maven2-plugin-surefire +BuildRequires: plexus-maven-plugin >= 0:1.2-2 +BuildRequires: modello-maven-plugin >= 0:1.0-0.a8.3 +BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3 +%endif +BuildRequires: classworlds +BuildRequires: jakarta-commons-collections +BuildRequires: jakarta-commons-logging +BuildRequires: jakarta-commons-validator +BuildRequires: junit +BuildRequires: oro +BuildRequires: plexus-container-default +BuildRequires: plexus-i18n +BuildRequires: plexus-utils +BuildRequires: plexus-velocity +BuildRequires: velocity + +Requires: classworlds +Requires: jakarta-commons-collections +Requires: jakarta-commons-logging +Requires: jakarta-commons-validator +Requires: junit +Requires: oro +Requires: plexus-container-default +Requires: plexus-i18n +Requires: plexus-utils +Requires: plexus-velocity +Requires: velocity + +Requires(post): jpackage-utils >= 0:1.7.2 +Requires(postun): jpackage-utils >= 0:1.7.2 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + +%description +Doxia is a content generation framework which aims to provide its +users with powerful techniques for generating static and dynamic +content. Doxia can be used to generate static sites in addition to +being incorporated into dynamic content generation systems like blogs, +wikis and content management systems. + +%if %{with_maven} +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Documentation + +%description javadoc +Javadoc for %{name}. +%endif + +%prep +%setup -q -n %{name} +cp -p %{SOURCE1} doxia-decoration-model/build.xml +cp -p %{SOURCE2} doxia-core/build.xml +cp -p %{SOURCE3} doxia-sink-api/build.xml +cp -p %{SOURCE4} doxia-site-renderer/build.xml + +%patch0 -b .sav + +%build + +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL + +%if %{with_maven} + + mvn-jpp \ + -e \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + install javadoc:javadoc + +%else + +mkdir lib +build-jar-repository -s -p lib/ \ + commons-collections \ + commons-logging-api \ + classworlds \ + junit \ + oro \ + plexus/container-default \ + plexus/i18n \ + plexus/utils \ + plexus/velocity \ + velocity + +# Extract autogenerated (by maven) files +tar xzf %{SOURCE5} + +for project in doxia-decoration-model \ + doxia-sink-api \ + doxia-core \ + doxia-site-renderer; do + + pushd $project + + ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL + + # Copy over the jar + cp -p target/*jar ../lib/$project.jar + popd +done + +%endif + +%install +rm -rf $RPM_BUILD_ROOT +# jars/poms +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms + +for project in decoration-model \ + sink-api \ + core \ + site-renderer \ + module-twiki; do + + if [ -f doxia-$project/target/doxia-$project-%{namedversion}.jar ]; then install -pm 644 \ + doxia-$project/target/doxia-$project-%{namedversion}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/$project-%{namedversion}.jar + %add_to_maven_depmap org.apache.maven.doxia doxia-$project %{namedversion} JPP/maven-doxia $project + + fi + + # Install pom to groupid-artifactid + install -pm 644 doxia-$project/pom.xml \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-$project.pom +done + +install -pm 644 pom.xml \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom +%add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP/maven-doxia doxia + +(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \ + do ln -sf ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done) + +%if %{with_maven} +# javadoc +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} + +for p in doxia-decoration-model \ + doxia-sink-api \ + doxia-core \ + doxia-site-renderer; do + + project=`basename $p` + install -d -m 755 \ + $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project + cp -pr $project/target/site/apidocs/* \ + $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project + +done +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%endif + +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%if %{gcj_support} +%postun +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%files +%defattr(-,root,root,-) +%{_javadir}/%{name} +%{_datadir}/maven2 +%{_mavendepmapfragdir} + +%if %{gcj_support} +%dir %attr(-,root,root) %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/core-1.0-alpha-7.jar.* +%attr(-,root,root) %{_libdir}/gcj/%{name}/decoration-model-1.0-alpha-7.jar.* +%attr(-,root,root) %{_libdir}/gcj/%{name}/sink-api-1.0-alpha-7.jar.* +%attr(-,root,root) %{_libdir}/gcj/%{name}/site-renderer-1.0-alpha-7.jar.* +%endif + +%if %{with_maven} +%files javadoc +%defattr(-,root,root,-) +%doc %{_javadocdir}/* +%endif + +%changelog +* Tue Feb 27 2007 Tania Bento 0:1.0-0.1.a7.3jpp.1 +- Fixed %%Release. +- Fixed %%BuildRoot. +- Removed %%Vendor. +- Removed %%Distribution. +- Removed %%post and %%postun sections for javadoc. +- Fixed instructios on how to generate source drop. +- Fixed %%Summary. +- Added gcj support option. +- Marked configuration file as %%config(noreplace) in %%files section. + +* Tue Oct 17 2006 Deepak Bhole 1.0-0.a7.3jpp +- Update for maven2 9jpp + +* Fri Jun 23 2006 Deepak Bhole - 0:1.0-0.a7.2jpp +- Fix versions in the depmap + +* Wed Mar 15 2006 Deepak Bhole - 0:1.0-0.a7.1jpp +- Initial build + diff --git a/sources b/sources index e69de29..aaaa2ba 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +1a0133387395089625236b3ae18e200a maven-doxia-1.0a7.tar.gz +f7d26f91c7a093e94dfb051248aab6c6 maven-doxia-autogenerated-files.tar.gz