[Jpackage-commits] dist/maven-doxia/devel .cvsignore, 1.2, 1.3 maven-doxia-1.4compile.patch, NONE, 1.1 maven-doxia-core-build.xml, NONE, 1.1 maven-doxia-decoration-model-build.xml, NONE, 1.1 maven-doxia-jpp-depmap.xml, 1.1, NONE maven-doxia-pom.patch, 1.1, NONE maven-doxia-settings.xml, 1.1, NONE maven-doxia-sink-api-build.xml, NONE, 1.1 maven-doxia-site-renderer-build.xml, NONE, 1.1 maven-doxia-siterenderer-DefaultSiteRenderer.patch, 1.1, NONE maven-doxia-siterenderer-Renderer.patch, 1.1, NONE maven-doxia-sitetools-doc-renderer-pom.patch, 1.1, NONE maven-doxia.spec, 1.1, 1.2 sources, 1.2, 1.3

jpackage-guest jpackage-guest at ryu.zarb.org
Tue Jan 6 08:41:44 CET 2009


Update of /home/projects/jpackage/cvs/dist/maven-doxia/devel
In directory ryu.zarb.org:/tmp/cvs-serv30418/devel

Modified Files:
	.cvsignore maven-doxia.spec sources 
Added Files:
	maven-doxia-1.4compile.patch maven-doxia-core-build.xml 
	maven-doxia-decoration-model-build.xml 
	maven-doxia-sink-api-build.xml 
	maven-doxia-site-renderer-build.xml 
Removed Files:
	maven-doxia-jpp-depmap.xml maven-doxia-pom.patch 
	maven-doxia-settings.xml 
	maven-doxia-siterenderer-DefaultSiteRenderer.patch 
	maven-doxia-siterenderer-Renderer.patch 
	maven-doxia-sitetools-doc-renderer-pom.patch 
Log Message:
import from dbhole's maven 2.0.8 packages

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-doxia.spec	28 May 2008 19:08:43 -0000	1.1
--- maven-doxia.spec	6 Jan 2009 07:41:42 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
***************
*** 29,33 ****
  #
  
! %define section   free
  
  # If you don't want to build with maven, and use straight ant instead,
--- 29,35 ----
  #
  
! %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}}}
! %define gcj_support 0
  
  # If you don't want to build with maven, and use straight ant instead,
***************
*** 37,128 ****
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
- %define bname doxia
  %define namedversion 1.0-alpha-10
  
- %define maven_settings_file %{_builddir}/%{name}/settings.xml
- 
  Name:           maven-doxia
  Version:        1.0
! Release:        0.a10.2jpp
  Epoch:          0
! Summary:        Doxia is a content generation framework
  License:        Apache Software License
  Group:          Development/Java
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://maven.apache.org/doxia/
- Source0:        %{bname}-%{namedversion}.tar.gz
- # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-10/
- Source1:        %{bname}-sitetools-%{namedversion}.tar.gz
- # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-10/
  
  
! Source2:        %{name}-jpp-depmap.xml
! Source3:        %{name}-settings.xml
! 
! Source4:        %{name}-autogenerated-files.tar.gz
  
! Patch0:         maven-doxia-pom.patch
! Patch1:         maven-doxia-sitetools-doc-renderer-pom.patch
! Patch2:         maven-doxia-siterenderer-Renderer.patch
! Patch3:         maven-doxia-siterenderer-DefaultSiteRenderer.patch
  
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
! BuildRequires:  ant-nodeps
! BuildRequires:  ant-junit
! BuildRequires:  junit >= 0:3.8.2
! BuildRequires:  modello >= 0:1.0-0.a15
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.4
! BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
- BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-plugin-surefire
! BuildRequires:  plexus-maven-plugin >= 0:1.3.5
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a15
  %endif
! BuildRequires:  excalibur-avalon-framework
! BuildRequires:  geronimo-jta-1.0.1B-api
! BuildRequires:  htmlunit
! BuildRequires:  itext >= 0:1.4
! BuildRequires:  jakarta-commons-cli
! BuildRequires:  jakarta-commons-collections >= 0:3.2
! BuildRequires:  jakarta-commons-lang
  BuildRequires:  jakarta-commons-logging
! BuildRequires:  plexus-cli
! BuildRequires:  plexus-containers-container-default
  BuildRequires:  plexus-i18n
! BuildRequires:  plexus-utils >= 0:1.4.8
! BuildRequires:  plexus-velocity >= 0:1.1.7
! BuildRequires:  velocity >= 0:1.5
! BuildRequires:  xalan-j2 >= 0:2.7.0
  
! Requires:       excalibur-avalon-framework
! Requires:       itext >= 0:1.4
! Requires:       jakarta-commons-cli
  Requires:       jakarta-commons-collections
- Requires:       jakarta-commons-lang
  Requires:       jakarta-commons-logging
! Requires:       plexus-cli
! Requires:       plexus-containers-container-default
  Requires:       plexus-i18n
! Requires:       plexus-utils >= 0:1.4.8
! Requires:       plexus-velocity >= 0:1.1.7
! Requires:       velocity >= 0:1.5
! Requires:       xalan-j2 >= 0:2.7.0
  
! Requires(post):   jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
  
  %description
--- 39,124 ----
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define namedversion 1.0-alpha-10
  
  Name:           maven-doxia
  Version:        1.0
! Release:        0.3.a10.1jpp.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/doxia/tags/doxia-1.0-alpha-10
+ #       maven-doxia/
+ # tar czf maven-doxia-1.0.a10-src.tar.gz maven-doxia/
+ Source0:        %{name}-%{version}a10.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
  
! # These files are taken from the doxia build itself, done with maven2
! # To regenerate, build above tarball with upstream maven
! 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
! %else
! ExcludeArch:   ppc64
! %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
***************
*** 133,347 ****
  wikis and content management systems.
  
  %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
! %{summary}.
  
  %prep
! %setup -q -c -n %{name}
! gzip -dc %{SOURCE1} | tar xf -
! gzip -dc %{SOURCE4} | tar xf -
! cp %{SOURCE3} settings.xml
! sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! %patch3 -b .sav3
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
  
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/poms/
! cp doxia-%{namedversion}/doxia-core/pom.xml .m2/repository/JPP/maven2/poms/JPP.maven-doxia-core.pom
! cp doxia-%{namedversion}/doxia-modules/pom.xml .m2/repository/JPP/maven2/default_poms/JPP.maven-doxia-modules.pom
! mkdir external_repo
! ln -s %{_javadir} external_repo/JPP
  
- export M2_SETTINGS=$(pwd)/settings.xml
  %if %{with_maven}
! pushd doxia-%{namedversion}
!     mvn-jpp \
!         -e \
!         -s $M2_SETTINGS \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:javadoc
! popd
! pushd doxia-sitetools-%{namedversion}
      mvn-jpp \
!         -e \
!         -s $M2_SETTINGS \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
!         install
! # won't build the javadocs when mixing old and new doxia
! export CLASSPATH=$(build-classpath \
! itext \
! plexus/container-default \
! plexus/i18n \
! plexus/utils \
! plexus/velocity \
! velocity \
! )
! CLASSPATH=$CLASSPATH:$(pwd)/doxia-decoration-model/target/doxia-decoration-model-%{namedversion}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/doxia-doc-renderer/target/doxia-doc-renderer-%{namedversion}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/doxia-site-renderer/target/doxia-site-renderer-%{namedversion}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/../doxia-%{namedversion}/doxia-modules/doxia-module-itext/target/doxia-module-itext-%{namedversion}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/../doxia-%{namedversion}/doxia-modules/doxia-module-xhtml/target/doxia-module-xhtml-%{namedversion}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/../doxia-%{namedversion}/doxia-core/target/doxia-core-%{namedversion}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/../doxia-%{namedversion}/doxia-sink-api/target/doxia-sink-api-%{namedversion}.jar
!     for project in \
!         doxia-decoration-model \
!         doxia-doc-renderer \
!         doxia-site-renderer \
!         ; do
!              pushd $project
!                     ant -Dbuild.sysclasspath=only javadoc
!              popd
!     done
! popd
  %else
  mkdir lib
! export MDLIB=$(pwd)/lib
  
! export CLASSPATH=$(build-classpath \
! modello/core \
! modello/plugin-xml \
! modello/plugin-xpp3 \
! modello/plugin-xdoc \
! modello/plugin-xsd \
! plexus/classworlds \
! plexus/container-default \
! plexus/utils \
! )
  
! pushd doxia-%{namedversion}
! pushd doxia-modules/doxia-module-fml
! java org.codehaus.modello.ModelloCli src/main/mdo/fml.mdo java src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/fml.mdo xsd src/main/java 1.0.0 false
! popd
! pushd doxia-book
! java org.codehaus.modello.ModelloCli src/main/modello/book.mdo xdoc src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/modello/book.mdo xsd src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/modello/book.mdo java src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/modello/book.mdo xpp3-reader src/main/java 1.0.0 false
! popd
! popd
! pushd doxia-sitetools-%{namedversion}
! pushd doxia-decoration-model
! java org.codehaus.modello.ModelloCli src/main/mdo/decoration.mdo xpp3-writer src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/decoration.mdo java src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/decoration.mdo xpp3-reader src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/decoration.mdo xsd src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/decoration.mdo xdoc src/main/java 1.0.0 false
! popd
! pushd doxia-doc-renderer
! java org.codehaus.modello.ModelloCli src/main/mdo/document.mdo xpp3-writer src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/document.mdo java src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/document.mdo xpp3-reader src/main/java 1.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/document.mdo xsd src/main/java 1.0.0 false
! popd
! popd
! unset CLASSPATH
  
! build-jar-repository -s -p $MDLIB \
!       commons-httpclient \
!       commons-io \
!       commons-lang \
!       htmlunit \
!       itext \
!       js \
!       nekohtml \
!       plexus/cli \
!       plexus/i18n \
!       plexus/utils \
!       plexus/classworlds \
!       plexus/containers-component-api \
!       plexus/containers-container-default \
!       plexus/velocity \
!       velocity \
!       xalan-j2 \
!       xalan-j2-serializer \
  
! export CLASSPATH=
! CLASSPATH=$CLASSPATH:$MDLIB/../doxia-%{namedversion}/doxia-core/target/test-classes
! CLASSPATH=$CLASSPATH:$MDLIB/commons-httpclient.jar
! CLASSPATH=$CLASSPATH:$MDLIB/commons-io.jar
! CLASSPATH=$CLASSPATH:$MDLIB/commons-lang.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-docbook-simple.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-latex.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-itext.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-xhtml.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-xdoc.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-apt.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-core.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-sink-api.jar
! CLASSPATH=$CLASSPATH:$MDLIB/doxia-decoration-model.jar
! CLASSPATH=$CLASSPATH:$MDLIB/htmlunit.jar
! CLASSPATH=$CLASSPATH:$MDLIB/itext.jar
! CLASSPATH=$CLASSPATH:$MDLIB/js.jar
! CLASSPATH=$CLASSPATH:$MDLIB/nekohtml.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_cli.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_i18n.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_utils.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_classworlds.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_containers-component-api.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_containers-container-default.jar
! CLASSPATH=$CLASSPATH:$MDLIB/plexus_velocity.jar
! CLASSPATH=$CLASSPATH:$MDLIB/velocity.jar
! CLASSPATH=$CLASSPATH:$MDLIB/xalan-j2.jar
! CLASSPATH=$CLASSPATH:$MDLIB/xalan-j2-serializer.jar
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  
! pushd doxia-%{namedversion}
! for project in \
!          doxia-sink-api \
!          doxia-core \
!          doxia-modules/doxia-module-apt \
!          doxia-modules/doxia-module-confluence \
!          doxia-modules/doxia-module-docbook-simple \
!          doxia-modules/doxia-module-fml \
!          doxia-modules/doxia-module-itext \
!          doxia-modules/doxia-module-latex \
!          doxia-modules/doxia-module-rtf \
!          doxia-modules/doxia-module-twiki \
!          doxia-modules/doxia-module-xdoc \
!          doxia-modules/doxia-module-xhtml \
!          doxia-book \
!          ; do
!          pushd $project
!                 ant -Dbuild.sysclasspath=only jar javadoc
!                 # Copy over the jar
!                 for j in target/*.jar; do
!                     cp $j $MDLIB/$(basename $project.jar)
!                 done
!          popd
! done
! popd
! pushd doxia-sitetools-%{namedversion}
! for project in \
!     doxia-decoration-model \
!     doxia-doc-renderer \
!     doxia-site-renderer \
!     ; do
!          pushd $project
!                 ant -Dbuild.sysclasspath=only jar javadoc
!                 # Copy over the jar
!                 for j in target/*.jar; do
!                     cp $j $MDLIB/$(basename $project.jar)
!                 done
!          popd
  done
- popd
  
  %endif
--- 129,197 ----
  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}
  
! %if %{without_maven}
! 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
! %endif
! 
! #%patch0 -b .sav
  
  %build
  
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
  
  %if %{with_maven}
! 
      mvn-jpp \
!         -q \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
!         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
***************
*** 349,462 ****
  %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
  
! pushd doxia-sitetools-%{namedversion}
! for project in \
!     doxia-decoration-model \
!     doxia-doc-renderer \
!     doxia-site-renderer \
!     ; do
!        jarname=$(basename $project)
!        destname=$(echo $jarname | sed -e 's/doxia-//')
!        install -pm 644 $project/target/$jarname-%{namedversion}.jar \
!              $RPM_BUILD_ROOT%{_javadir}/%{name}/$destname-%{version}.jar
!        %add_to_maven_depmap org.apache.maven.doxia $jarname %{namedversion} JPP/maven-doxia $destname
!        # Install pom to groupid-artifactid
!        install -pm 644 $project/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-$destname.pom
! done
! install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-sitetools.pom
! %add_to_maven_depmap org.apache.maven.doxia doxia-sitetools %{namedversion} JPP/maven-doxia sitetools
! popd
! pushd doxia-1.0-alpha-10
! for project in \
!     doxia-sink-api \
!     doxia-core \
!     doxia-modules/doxia-module-apt \
!     doxia-modules/doxia-module-confluence \
!     doxia-modules/doxia-module-docbook-simple \
!     doxia-modules/doxia-module-fml \
!     doxia-modules/doxia-module-itext \
!     doxia-modules/doxia-module-latex \
!     doxia-modules/doxia-module-rtf \
!     doxia-modules/doxia-module-twiki \
!     doxia-modules/doxia-module-xdoc \
!     doxia-modules/doxia-module-xhtml \
!     doxia-book \
! %if %{with_maven}
!     doxia-maven-plugin \
! %endif
!     ; do
!        jarname=$(basename $project)
!        destname=$(echo $jarname | sed -e 's/doxia-//')
!        install -pm 644 $project/target/$jarname-%{namedversion}.jar \
!              $RPM_BUILD_ROOT%{_javadir}/%{name}/$destname-%{version}.jar
!        %add_to_maven_depmap org.apache.maven.doxia $jarname %{namedversion} JPP/maven-doxia $destname
!        # Install pom to groupid-artifactid
!        install -pm 644 $project/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-$destname.pom
  done
  
! install -pm 644 doxia-modules/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-modules.pom
! %add_to_maven_depmap org.apache.maven.doxia doxia-modules %{namedversion} JPP/maven-doxia modules
  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
- popd
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
! # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  
! pushd doxia-%{namedversion}
! for p in \
!         doxia-sink-api \
!         doxia-core \
!         doxia-modules/doxia-module-apt \
!         doxia-modules/doxia-module-confluence \
!         doxia-modules/doxia-module-docbook-simple \
!         doxia-modules/doxia-module-fml \
!         doxia-modules/doxia-module-itext \
!         doxia-modules/doxia-module-latex \
!         doxia-modules/doxia-module-rtf \
!         doxia-modules/doxia-module-twiki \
!         doxia-modules/doxia-module-xdoc \
!         doxia-modules/doxia-module-xhtml \
!         doxia-book \
! %if %{with_maven}
!         doxia-maven-plugin \
  %endif
-         ; do
-             project=$(basename $p)
-             install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
-             cp -pr $p/target/site/apidocs/* \
-                     $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
- done
- ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
- popd
- pushd doxia-sitetools-%{namedversion}
- for p in \
-     doxia-decoration-model \
-     doxia-doc-renderer \
-     doxia-site-renderer \
-     ; do
-             project=$(basename $p)
-             install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
-             cp -pr $p/target/site/apidocs/* \
-                     $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
- done
- popd
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
! %if %{with_maven}
! %post javadoc
! rm -f %{_javadocdir}/%{name}
! ln -s %{name}-%{namedversion} %{_javadocdir}/%{name}
  
! %postun javadoc
! if [ "$1" = "0" ]; then
!   rm -f %{_javadocdir}/%{name}
  fi
  %endif
--- 199,268 ----
  %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 targetdir in `find -type d -name target`; do
! 
!     targetdir=`echo $targetdir | sed -e s:^\./::g`
! 
!     modulename=`echo $targetdir | awk -F / '{print $(NF-1)}'`
!     strippedmodulename=`echo $modulename | sed -e s:^doxia-::g`
! 
!     # Does the module have a jar?
!     if [ -f $targetdir/$modulename-%{namedversion}.jar ]; then
!         cp -p $targetdir/$modulename-%{namedversion}.jar \
!                 $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{namedversion}.jar
!     fi
! 
! 
!     # Skip parent pom
!     if [ ! -z $strippedmodulename ]; then
!         cp -p $targetdir/../pom.xml \
!                 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-$strippedmodulename.pom
! 
!         %add_to_maven_depmap org.apache.maven.doxia $modulename %{namedversion} JPP/maven-doxia $strippedmodulename
!     fi
!     
  done
  
! # Install parent pom
  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
  
! # Install parent javadocs
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
!   do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
! # javadoc (all javadocs are contained in the main module docs dir used below)
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}
! cp -pr target/site/apidocs/* \
!          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}/
! ln -s %{name}-%{namedversion} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! 
! %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
  %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
! %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
***************
*** 468,491 ****
  %{_mavendepmapfragdir}
  
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
! * Fri Dec 21 2007 Ralph Apel <r.apel at r-apel.de> 1.0-0.a10.2jpp
! - Backward compatibility patching
  
! * Fri Dec 21 2007 Ralph Apel <r.apel at r-apel.de> 1.0-0.a10.1jpp
! - Update to 1.0-alpha-10
  
! * Wed Nov 28 2007 Ralph Apel <r.apel at r-apel.de> 1.0-0.a7+9.1jpp
! - Include SinkFactory.java from alpha-9
  
! * Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> 1.0-0.a7.4jpp
! - Build with java5
! - Extend with module-twiki
! - Use mvn with settings.xml and jpp.depmap
! - Build javadocs when without maven
  
  * Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a7.3jpp
--- 274,311 ----
  %{_mavendepmapfragdir}
  
+ %if %{gcj_support}
+ %attr(-,root,root) %{_libdir}/gcj/%{name}
+ %endif
+ 
+ %if %{with_maven}
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
! %endif
  
  %changelog
! * Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7.3jpp.5
! - Build with maven
! - ExcludeArch ppc64
  
! * Sat Sep 01 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.4
! - Rebuild without maven (fpr initial ppc build)
  
! * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.3
! - Added switch to ignore failures for the time being
  
! * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.2
! - Build with maven
! 
! * Tue Feb 27 2007 Tania Bento <tbento at redhat.com> 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 <dbhole at redhat.com> 1.0-0.a7.3jpp

--- maven-doxia-settings.xml DELETED ---

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:08:43 -0000	1.2
--- .cvsignore	6 Jan 2009 07:41:42 -0000	1.3
***************
*** 1,3 ****
! doxia-1.0-alpha-10.tar.gz
! doxia-sitetools-1.0-alpha-10.tar.gz
  maven-doxia-autogenerated-files.tar.gz
--- 1,2 ----
! maven-doxia-1.0a10.tar.gz
  maven-doxia-autogenerated-files.tar.gz

--- NEW FILE: maven-doxia-core-build.xml ---
<project name="doxia-core" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="doxia-core-1.0-alpha-7"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <path id="build.classpath">
    <fileset dir="../lib">
      <include name="classworlds.jar"/>
      <include name="plexus_utils.jar"/>
      <include name="plexus_container-default.jar"/>
      <include name="oro.jar"/>
      <include name="doxia-sink-api.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" 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/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
    <copy todir="${maven.build.output}">
      <fileset dir="src/main/resources"/>
    </copy>
  </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/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </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="false" haltonfailure="false" 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/java">
          <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="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/codehaus/plexus/plexus-utils/1.0.4"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/oro/oro/2.0.7"/>
    <get src="http://repo1.maven.org/maven2/oro/oro/2.0.7/oro-2.0.7.jar" dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
</project>

--- maven-doxia-sitetools-doc-renderer-pom.patch DELETED ---

--- maven-doxia-pom.patch DELETED ---

--- maven-doxia-siterenderer-Renderer.patch DELETED ---

--- maven-doxia-siterenderer-DefaultSiteRenderer.patch DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:08:43 -0000	1.2
--- sources	6 Jan 2009 07:41:42 -0000	1.3
***************
*** 1,3 ****
! 00f302962a0b5c1006775bf836133eab  doxia-1.0-alpha-10.tar.gz
! ceef2bfe4c22a89c60a1ab72d04a25f9  doxia-sitetools-1.0-alpha-10.tar.gz
! 887c8899817ce285043186b0f3fba58b  maven-doxia-autogenerated-files.tar.gz
--- 1,2 ----
! 50ab7d300005b658a2d3ca5b24fb3317  maven-doxia-1.0a10.tar.gz
! f7d26f91c7a093e94dfb051248aab6c6  maven-doxia-autogenerated-files.tar.gz

--- NEW FILE: maven-doxia-sink-api-build.xml ---
<project name="doxia-sink-api" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="doxia-sink-api-1.0-alpha-7"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <path id="build.classpath">
    <fileset dir="../lib"/>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" 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/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </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}"/>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"/>
  <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="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
  </target>
</project>

--- NEW FILE: maven-doxia-1.4compile.patch ---
--- ./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 );
     }

--- NEW FILE: maven-doxia-decoration-model-build.xml ---
<project name="doxia-decoration-model" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="doxia-decoration-model-1.0-alpha-7"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <path id="build.classpath">
    <fileset dir="../lib">
      <include name="plexus_utils.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" 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/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </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/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </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/java">
          <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="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/codehaus/plexus/plexus-utils/1.0.4"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
</project>

--- NEW FILE: maven-doxia-site-renderer-build.xml ---
<project name="doxia-site-renderer" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="doxia-site-renderer-1.0-alpha-7"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <path id="build.classpath">
    <fileset dir="../lib">
      <include name="plexus_utils.jar"/>
      <include name="junit.jar"/>
      <include name="velocity.jar"/>
      <include name="plexus_container-default.jar"/>
      <include name="oro.jar"/>
      <include name="classworlds.jar"/>
      <include name="doxia-core.jar"/>
      <include name="plexus_i18n.jar"/>
      <include name="doxia-decoration-model.jar"/>
      <include name="plexus_velocity.jar"/>
      <include name="commons-logging-api.jar"/>
      <include name="commons-collections.jar"/>
      <include name="doxia-sink-api.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" 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/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </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/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </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="false" haltonfailure="false" 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/java">
          <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="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/codehaus/plexus/plexus-utils/1.0.4"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/junit/junit/3.8.1"/>
    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/velocity/velocity-dep/1.4"/>
    <get src="http://repo1.maven.org/maven2/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" dest="${maven.repo.local}/velocity/velocity-dep/1.4/velocity-dep-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/codehaus/plexus/plexus-container-default/1.0-alpha-8"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/oro/oro/2.0.7"/>
    <get src="http://repo1.maven.org/maven2/oro/oro/2.0.7/oro-2.0.7.jar" dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/classworlds/classworlds/1.1-alpha-2"/>
    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/plexus/plexus-utils/1.0.2"/>
    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/apache/maven/doxia/doxia-core/1.0-alpha-7"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/velocity/velocity/1.4"/>
    <get src="http://repo1.maven.org/maven2/velocity/velocity/1.4/velocity-1.4.jar" dest="${maven.repo.local}/velocity/velocity/1.4/velocity-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/codehaus/plexus/plexus-i18n/1.0-beta-6"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/codehaus/plexus/plexus-velocity/1.1.2"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/commons-logging/commons-logging-api/1.0.4"/>
    <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/commons-collections/commons-collections/2.0"/>
    <get src="http://repo1.maven.org/maven2/commons-collections/commons-collections/2.0/commons-collections-2.0.jar" dest="${maven.repo.local}/commons-collections/commons-collections/2.0/commons-collections-2.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/deepak/DIST/maven-doxia/maven-doxia/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7"/>
    <get src="http://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" dest="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
</project>

--- maven-doxia-jpp-depmap.xml DELETED ---




More information about the JPackage-commits mailing list