From 8c1b12a92572e3f754800b3ea1b1d5540f01d662 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jun 14 2013 13:54:18 +0000
Subject: Rewrite spec file


---

diff --git a/.gitignore b/.gitignore
index 3b95841..165d760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-bcel-5.2-src.tar.gz
-bcel-jakarta-site2.tar.gz
+/bcel-5.2-src.tar.gz
diff --git a/bcel-5.2-build.xml b/bcel-5.2-build.xml
deleted file mode 100644
index 1327969..0000000
--- a/bcel-5.2-build.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 5.2
-  on date June 26 2007, time 1708-->
-<project default="jar" name="bcel" basedir=".">
-  <!--Load local and user build preferences-->
-  <property file="build.properties"></property>
-  <!--Build properties-->
-  <property name="defaulttargetdir" value="${basedir}/target"></property>
-  <property name="libdir" value="${basedir}/lib"></property>
-  <property name="classesdir" value="${basedir}/target/classes"></property>
-  <property name="distdir" value="${basedir}/dist"></property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
-  <property name="final.name" value="bcel-5.2"></property>
-  <property name="proxy.host" value=""></property>
-  <property name="proxy.port" value=""></property>
-  <property name="proxy.username" value=""></property>
-  <property name="proxy.password" value=""></property>
-  <property name="source.encoding" value="ISO-8859-1"></property>
-  <path id="build.classpath">
-    <pathelement location="${libdir}/regexp.jar"></pathelement>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}"></mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
-    </condition>
-    <!--Test if JUNIT is present in ANT classpath-->
-    <available property="Junit.present" classname="junit.framework.Test"></available>
-    <!--Test if user defined a proxy-->
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host"></isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
-        </not>
-      </and>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
-    <mkdir dir="${classesdir}"></mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="${source.encoding}">
-      <src>
-        <pathelement location="${basedir}/src/java"></pathelement>
-      </src>
-      <classpath refid="build.classpath"></classpath>
-    </javac>
-    <mkdir dir="${classesdir}/META-INF"></mkdir>
-    <copy todir="${classesdir}/META-INF">
-      <fileset dir="${basedir}/.">
-        <include name="NOTICE.txt"></include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}"></delete>
-    <delete dir="${distdir}"></delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist"></mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures."></fail>
-  </target>
-  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
-  <target name="junit-present" unless="Junit.present" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-    <mkdir dir="${javadocdir}"></mkdir>
-    <tstamp>
-      <format pattern="2002-yyyy" property="year"></format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
-    <property name="title" value="jakarta-bcel 5.2 API"></property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*" encoding="${source.encoding}">
-      <classpath>
-        <path refid="build.classpath"></path>
-      </classpath>
-      <link href="/usr/share/javadoc/java"/>
-    </javadoc>
-  </target>
-  <target name="get-dep-regexp.jar" description="o Download the dependency : regexp.jar" unless="regexp.jar" depends="init,setProxy,noProxy,get-custom-dep-regexp.jar">
-    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
-    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/regexp.jar"></get>
-  </target>
-  <target name="get-custom-dep-regexp.jar" if="regexp.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
-    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="${regexp.jar}"></get>
-  </target>
-  <target name="get-deps" unless="noget" depends="get-dep-regexp.jar"></target>
-  <target name="setProxy" if="useProxy" depends="init">
-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
-    <echo>Proxy used :</echo>
-    <echo>Proxy host [${proxy.host}]</echo>
-    <echo>Proxy port [${proxy.port}]</echo>
-    <echo>Proxy user [${proxy.username}]</echo>
-    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
-  </target>
-  <target name="noProxy" unless="useProxy" depends="init">
-    <echo>Proxy not used.</echo>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
-  </target>
-  <!-- can rename this target when we get the docs sorted out -->
-
-  <!-- ================================================================== -->
-  <!-- D O C S                                                            -->
-  <!-- ================================================================== -->
-  
-  <target 
-    name="check_for_jdom">
-    
-    <available 
-      property="jdom.present"
-      classname="org.jdom.JDOMException">
-      <classpath>
-        <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
-      </classpath>
-    </available>
-  </target>
-    
-  <target 
-    depends="check_for_jdom" 
-    name="docs-prepare-error" 
-    unless="jdom.present">
-    
-    <echo>
-      The Jakarta-Site2 module is not present! Please check
-      to make sure that you have checked it out from CVS.
-
-      &lt;http://jakarta.apache.org/site/jakarta-site2.html&gt;
-    </echo>
-  </target>
-
-  <target 
-    name="xdocs"
-    depends="docs-prepare-error"
-    description="--> generates the HTML documentation"
-    if="jdom.present">
-
-    <taskdef 
-      name="anakia"
-      classname="org.apache.velocity.anakia.AnakiaTask">
-      <classpath>
-        <fileset dir="${jakarta.site2}/lib">
-          <include name="*.jar"/>
-        </fileset>
-      </classpath>
-    </taskdef>
-        
-    <anakia 
-      basedir="${docs.src}" 
-      destdir="${docs.dest}/"
-      extension=".html" 
-      style="./site.vsl"
-      projectFile="stylesheets/project.xml"
-      excludes="**/stylesheets/** empty.xml"
-      includes="**/*.xml"
-      lastModifiedCheck="true"
-      templatePath="${jakarta.site2}/xdocs/stylesheets">
-    </anakia>
-
-    <copy 
-      todir="${docs.dest}/images" 
-      filtering="no">
-      
-      <fileset dir="${docs.src}/images">
-        <include name="**/*.gif"/>
-        <include name="**/*.jpeg"/>
-        <include name="**/*.jpg"/>
-      </fileset>
-    </copy>
-  </target>
-
-</project>
diff --git a/bcel-5.2-jpp-depmap.xml b/bcel-5.2-jpp-depmap.xml
deleted file mode 100644
index f515b68..0000000
--- a/bcel-5.2-jpp-depmap.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<depset>
-   <dependency>
-      <maven>
-         <groupId>regexp</groupId>
-         <artifactId>regexp</artifactId>
-         <version>1.2</version>
-      </maven>
-      <jpp>
-         <groupId>JPP</groupId>
-         <artifactId>regexp</artifactId>
-         <jar>regexp.jar</jar>
-         <version>1.2</version>
-      </jpp>
-   </dependency>
-</depset>
\ No newline at end of file
diff --git a/bcel-5.2-project_properties.patch b/bcel-5.2-project_properties.patch
deleted file mode 100644
index 73734fb..0000000
--- a/bcel-5.2-project_properties.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- project.properties.sav	2007-06-26 15:21:10.000000000 +0200
-+++ project.properties	2007-06-26 15:21:35.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- maven.changes.issue.template = %URL%/bugzilla/show_bug.cgi?id=%ISSUE%
- 
--maven.xdoc.jsl = ../commons-build/commons-site.jsl
-+maven.xdoc.jsl = file:${basedir}/commons-build/commons-site.jsl
- maven.xdoc.date = left
- maven.xdoc.poweredby.image = maven-feather.png
- maven.xdoc.version = ${pom.currentVersion}
diff --git a/bcel-5.2.pom b/bcel-5.2.pom
deleted file mode 100644
index a106230..0000000
--- a/bcel-5.2.pom
+++ /dev/null
@@ -1,13 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>bcel</groupId>
-  <artifactId>bcel</artifactId>
-  <version>5.2</version>
-  <dependencies>
-   <dependency>
-    <groupId>regexp</groupId>
-    <artifactId>regexp</artifactId>
-    <version>1.4</version>
-   </dependency>
-  </dependencies>
-</project>
diff --git a/bcel-MANIFEST.MF b/bcel-MANIFEST.MF
deleted file mode 100644
index 2170afd..0000000
--- a/bcel-MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.7.0_b147-icedtea-mockbuild_2011_11_10_18_56-b00 (Oracle
- Corporation)
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.apache.bcel
-Export-Package: org.apache.bcel;version="5.2.0",org.apache.bcel.classf
- ile;version="5.2.0",org.apache.bcel.generic;version="5.2.0",org.apach
- e.bcel.util;version="5.2.0",org.apache.bcel.verifier;version="5.2.0",
- org.apache.bcel.verifier.exc;version="5.2.0",org.apache.bcel.verifier
- .statics;version="5.2.0",org.apache.bcel.verifier.structurals;version
- ="5.2.0"
-Bundle-Version: 5.2.0.v201005080400
-Bundle-ManifestVersion: 2
diff --git a/bcel-pom.xml b/bcel-pom.xml
new file mode 100644
index 0000000..a2aaad5
--- /dev/null
+++ b/bcel-pom.xml
@@ -0,0 +1,33 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.bcel</groupId>
+  <artifactId>bcel</artifactId>
+  <version>5.2</version>
+  <packaging>bundle</packaging>
+  <properties>
+    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+      <version>1.2</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <_nouses>true</_nouses>
+            <Export-Package>org.apache.bcel.*</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/bcel.spec b/bcel.spec
index 7cc37f4..21499f4 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -1,68 +1,20 @@
-# Copyright (c) 2000-2007, 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.
-#
-
 Name:           bcel
 Version:        5.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        ASL 2.0
-Source0:        %{name}-%{version}-src.tar.gz
-#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_2
-#tar czvf bcel-5.2-src.tar.gz BCEL_5_2
-Source1:        pom-maven2jpp-depcat.xsl
-Source2:        pom-maven2jpp-newdepmap.xsl
-Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        %{name}-%{version}-jpp-depmap.xml
-#Source5:        commons-build.tar.gz
-Source5:        bcel-jakarta-site2.tar.gz
-Source6:        %{name}-%{version}-build.xml
-Source7:        %{name}-%{version}.pom
-Source8:        %{name}-MANIFEST.MF
-
-Patch0:         %{name}-%{version}-project_properties.patch
-URL:            http://jakarta.apache.org/%{name}/
-Group:          Development/Libraries
-Requires:       regexp
-BuildRequires:  zip
-BuildRequires:  ant
-BuildRequires:  jdom
-BuildRequires:  velocity
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  apache-commons-lang
-BuildRequires:  avalon-logkit
-BuildRequires:  werken-xpath
-BuildRequires:  regexp
-BuildRequires:  jpackage-utils >= 0:1.7.2
+URL:            http://commons.apache.org/proper/commons-bcel/
+Source0:        http://archive.apache.org/dist/commons/bcel/source/bcel-5.2-src.tar.gz
+# Upstream uses Maven 1, which is not available in Fedora.
+# The following is upstream project.xml converted to Maven 2/3.
+Source1:        %{name}-pom.xml
 BuildArch:      noarch
 
+BuildRequires:  maven-local
+BuildRequires:  mvn(regexp:regexp)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+
 %description
 The Byte Code Engineering Library (formerly known as JavaClass) is
 intended to give users a convenient possibility to analyze, create, and
@@ -80,91 +32,37 @@ optimizers, obsfuscators and analysis tools, the most popular probably
 being the Xalan XSLT processor at Apache.
 
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
+Obsoletes:      %{name}-manual < %{version}-%{release}
 
 %description javadoc
-%{summary}.
-
-%package manual
-Summary:        Manual for %{name}
-Group:          Documentation
-
-%description manual
-%{summary}.
+This package provides %{summary}.
 
 %prep
-%setup -q -n BCEL_5_2
-gzip -dc %{SOURCE5} | tar xf -
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-mkdir jakarta-site2/lib
-pushd jakarta-site2/lib/
-  build-jar-repository -s -p . jdom
-  build-jar-repository -s -p . velocity
-  build-jar-repository -s -p . commons-collections
-  build-jar-repository -s -p . commons-lang
-  build-jar-repository -s -p . avalon-logkit
-  build-jar-repository -s -p . werken-xpath
-popd
-cp %{SOURCE6} build.xml
-%patch0 -b .sav
-
-# fix wrong-file-end-of-line-encoding
-sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
+%setup -q
+cp -p %{SOURCE1} pom.xml
+%mvn_alias : bcel:
+%mvn_file : %{name}
 
 %build
-#ant -Dregexp.jar="file://$(build-classpath regexp)" jar javadoc
-ant     -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
-        -Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
-        -Dregexp.jar="file://$(build-classpath regexp)" \
-        jar javadoc xdocs
+%mvn_build
 
 %install
-# inject OSGi manifests
-mkdir -p META-INF
-cp -p %{SOURCE8} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF
-
-# jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__install} -m 0644 target/%{name}-%{version}.jar \
-    %{buildroot}%{_javadir}/%{name}.jar
-
-# pom
-%{__mkdir_p} %{buildroot}%{_mavenpomdir}
-%{__install} -m 0644 %{SOURCE7} \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# depmap frags
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.apache.bcel:%{name}
-
-# javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
-%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
-%{__rm} -rf dist/docs/api
-
-# manual
-%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
-%{__cp} -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
-%{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
-%{__cp} NOTICE.txt %{buildroot}%{_docdir}/%{name}-%{version}
-
-%files
-%doc %{_docdir}/%{name}-%{version}
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
-%doc %{_javadocdir}/%{name}
-
-%files manual
-%doc %{_docdir}/%{name}-%{version}
+%mvn_install
+
+%files -f .mfiles
+%doc README.txt
+%doc LICENSE.txt NOTICE.txt
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:5.2-16
+- Complete spec file rewrite
+- Build with Maven instead of Ant
+- Remove manual subpackage
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl
deleted file mode 100644
index 92834cc..0000000
--- a/pom-maven2jpp-depcat.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="*[name() != 'dependencies']|*/text()">
-     <xsl:apply-templates/>
- </xsl:template>
- <xsl:template match="//dependencies">
-  <xsl:for-each select="./dependency">
-   <xsl:element name="dependency">
-    <xsl:element name="maven">
-     <xsl:choose>
-      <xsl:when test="./groupId">
-       <xsl:copy-of select="./groupId"/>
-       <xsl:copy-of select="./artifactId"/>
-      </xsl:when>
-      <xsl:when test="./id">
-       <xsl:choose>
-        <xsl:when test="substring-before(./id/text(),':') != ''">
-         <xsl:element name="groupId">
-          <xsl:value-of select="substring-before(./id/text(),':')"/>
-         </xsl:element>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-         <xsl:element name="groupId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-ERROR
-      </xsl:otherwise>
-     </xsl:choose>
-     <xsl:for-each select="./*">
-      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
-       <xsl:copy-of select="."/>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:element>
-    <xsl:element name="jpp">
-     <xsl:element name="groupId">JPP</xsl:element>
-     <xsl:choose>
-      <xsl:when test="./artifactId">
-       <xsl:copy-of select="./artifactId"/>
-      </xsl:when>
-      <xsl:when test="./id">
-       <xsl:choose>
-        <xsl:when test="substring-after(./id/text(),':') != ''">
-         <xsl:element name="artifactId">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-ERROR
-      </xsl:otherwise>
-     </xsl:choose>
-     <xsl:element name="jar">
-      <xsl:choose>
-       <xsl:when test="./artifactId">
-        <xsl:value-of select="./artifactId/text()"/>
-       </xsl:when>
-       <xsl:when test="./id">
-        <xsl:choose>
-         <xsl:when test="substring-after(./id/text(),':') != ''">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:when>
-         <xsl:otherwise>
-          <xsl:value-of select="./id/text()"/>
-         </xsl:otherwise>
-        </xsl:choose>
-       </xsl:when>
-       <xsl:otherwise>
-ERROR
-       </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-       <xsl:when test="./type">
-        <xsl:choose>
-         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
-         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
-        </xsl:choose>
-       </xsl:when>
-       <xsl:otherwise>.jar</xsl:otherwise>
-      </xsl:choose>
-     </xsl:element>
-     <xsl:for-each select="./*">
-      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
-       <xsl:copy-of select="."/>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:element>
-   </xsl:element>
-  </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl
deleted file mode 100644
index 566a1da..0000000
--- a/pom-maven2jpp-mapdeps.xsl
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="map" /> 
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="/project" >
-  <xsl:element name="project">
-   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
-   <xsl:if test="not(./dependencies)">
-    <xsl:element name="dependencies">
-     <xsl:for-each select="document($map)//add/dependency">
-       <xsl:copy-of select="."/>
-     </xsl:for-each>
-    </xsl:element>
-   </xsl:if>
-   <xsl:apply-templates select="dependencies"/>
-  </xsl:element>
- </xsl:template>
- <xsl:template match="dependencies" >
-  <xsl:element name="dependencies">
-   <xsl:for-each select="dependency">
-    <xsl:if test="./artifactId">
-     <xsl:call-template name="replace">
-      <xsl:with-param name="artifact" select="./artifactId/text()"/>
-     </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="./id">
-     <xsl:choose>
-      <xsl:when test="substring-after(./id/text(),':') != ''">
-       <xsl:call-template name="replace">
-        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
-       </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:call-template name="replace">
-        <xsl:with-param name="artifact" select="./id/text()"/>
-       </xsl:call-template>
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:if>
-   </xsl:for-each>
-   <xsl:for-each select="document($map)//add/dependency">
-    <xsl:copy-of select="."/>
-   </xsl:for-each>
-  </xsl:element>
- </xsl:template>
- <xsl:template name="replace">
-  <xsl:param name="artifact"/>
-  <xsl:variable name="this" select="."/>
-  <xsl:element name="dependency">
-   <xsl:choose>
-    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
-     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-      <xsl:copy-of select="../jpp/*"/>
-      <xsl:copy-of select="$this/properties"/>
-     </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:copy-of select="./*"/>
-    </xsl:otherwise>
-   </xsl:choose>
-  </xsl:element>
-  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
-   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-    <xsl:for-each select="../add/dependency">
-     <xsl:element name="dependency">
-      <xsl:copy-of select="./*"/>
-      <xsl:copy-of select="$this/properties"/>
-     </xsl:element>
-    </xsl:for-each>
-   </xsl:for-each>
-  </xsl:if>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl
deleted file mode 100644
index 3b8dbfa..0000000
--- a/pom-maven2jpp-newdepmap.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:saxon="http://icl.com/saxon"
-	extension-element-prefixes="saxon">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="/" >
-  <xsl:element name="depset">
-   <saxon:group select="//dependency" group-by="./maven/artifactId">
-    <xsl:sort select="./maven/artifactId"/>
-    <xsl:element name="dependency">
-     <xsl:element name="maven">
-      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
-     </xsl:element>
-     <xsl:element name="jpp">
-      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
-     </xsl:element>
-    </xsl:element>
-    <saxon:item/>
-   </saxon:group>
-  </xsl:element>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/sources b/sources
index a66fbdd..2d4bc00 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-15c882886f67f90ee773cb526b84b4fa  bcel-5.2-src.tar.gz
-2c511b30e00109b501c6f3bd757a1ce1  bcel-jakarta-site2.tar.gz
+905b7e718e30e7ca726530ecf106e532  bcel-5.2-src.tar.gz