[RPM (6.0)] [DIST generic] wicket-1.5.8-1.jpp6

Ralph Apel <[email protected]> Thu, 20 Sep 2012 11:16:18 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : wicket                       Relocations: (not relocatable)
Version     : 1.5.8                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Thu 20 Sep 2012 10:45:01 AM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Framework         Source RPM: (none)
Size        : 25949036                         License: ASL 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://wicket.apache.org/
Summary     : Wicket webapp framework
Description :
With proper mark-up/logic separation, a POJO data model, and
a refreshing lack of XML, Apache Wicket makes developing
web-apps simple and enjoyable again. Swap the boilerplate,
complex debugging and brittle code for powerful, reusable
components written with plain Java and HTML.

---------------
Ralph Apel <[email protected]> 0:1.5.8-1
- 1.5.8
---------------
wicket.src: W: source-or-patch-not-bzipped wicket-core-pom.patch
wicket.src: W: non-standard-group Development/Framework
wicket.src: W: no-signature
wicket.src: W: name-repeated-in-summary Wicket
wicket.src: W: invalid-license ASL 2.0
1 packages and 0 specfiles checked; 0 errors, 5 warnings.

---------------
Index: wicket-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/wicket/wicket-jpp-depmap.xml,v
retrieving revision 1.1
diff -u -r1.1 wicket-jpp-depmap.xml
--- wicket-jpp-depmap.xml	16 Aug 2008 09:25:51 -0000	1.1
+++ wicket-jpp-depmap.xml	20 Sep 2012 09:16:15 -0000
@@ -1,4 +1,94 @@
 <dependencies>
+<!--
+     DEBUG: 1) org.eclipse.jetty.orbit:javax.security.auth.message:jar:1.0.0.v201108011116
+     DEBUG:   Try downloading the file manually from the project website.
+     DEBUG:   Then, install it using the command: 
+     DEBUG:       mvn install:install-file -DgroupId=org.eclipse.jetty.orbit -DartifactId=javax.security.auth.message -Dversion=1.0.0.v201108011116 -Dpackaging=jar -Dfile=/path/to/file
+     DEBUG:   Alternatively, if you host your own repository you can deploy the file there: 
+     DEBUG:       mvn deploy:deploy-file -DgroupId=org.eclipse.jetty.orbit -DartifactId=javax.security.auth.message -Dversion=1.0.0.v201108011116 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
+     DEBUG:   Path to dependency: 
+     DEBUG:   	1) org.apache.wicket:wicket-examples:war:1.5.8
+     DEBUG:   	2) org.eclipse.jetty.aggregate:jetty-all-server:jar:7.4.2.v20110526
+     DEBUG:   	3) org.eclipse.jetty.orbit:javax.security.auth.message:jar:1.0.0.v201108011116
+     DEBUG: 2) org.eclipse.jetty.orbit:javax.mail.glassfish:jar:1.4.1.v201005082020
+     DEBUG:   Try downloading the file manually from the project website.
+     DEBUG:   Then, install it using the command: 
+     DEBUG:       mvn install:install-file -DgroupId=org.eclipse.jetty.orbit -DartifactId=javax.mail.glassfish -Dversion=1.4.1.v201005082020 -Dpackaging=jar -Dfile=/path/to/file
+     DEBUG:   Alternatively, if you host your own repository you can deploy the file there: 
+     DEBUG:       mvn deploy:deploy-file -DgroupId=org.eclipse.jetty.orbit -DartifactId=javax.mail.glassfish -Dversion=1.4.1.v201005082020 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
+     DEBUG:   Path to dependency: 
+     DEBUG:   	1) org.apache.wicket:wicket-examples:war:1.5.8
+     DEBUG:   	2) org.eclipse.jetty.aggregate:jetty-all-server:jar:7.4.2.v20110526
+     DEBUG:   	3) org.eclipse.jetty.orbit:javax.mail.glassfish:jar:1.4.1.v201005082020
+     DEBUG: 3) org.eclipse.jetty.orbit:javax.annotation:jar:1.1.0.v201108011116
+
+     -->
+   <dependency>
+      <maven>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.servlet</artifactId>
+         <version>2.5.0.v201103041518</version>
+      </maven>
+      <jpp>
+         <groupId>JPP</groupId>
+         <artifactId>servlet_2_5_api</artifactId>
+         <version>2.5</version>
+      </jpp>
+   </dependency>
+
+   <dependency>
+      <maven>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.security.auth.message</artifactId>
+         <version>1.0.0.v201108011116</version>
+      </maven>
+      <jpp>
+         <groupId>JPP</groupId>
+         <artifactId>jaspic_1_0_api</artifactId>
+         <version>1.0</version>
+      </jpp>
+   </dependency>
+
+   <dependency>
+      <maven>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.mail.glassfish</artifactId>
+         <version>1.4.1.v201005082020</version>
+      </maven>
+      <jpp>
+         <groupId>JPP</groupId>
+         <artifactId>javamail_1_4_1_api</artifactId>
+         <version>1.4.1</version>
+      </jpp>
+   </dependency>
+
+   <dependency>
+      <maven>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.activation</artifactId>
+         <version>1.1.0.v201105071233</version>
+      </maven>
+      <jpp>
+         <groupId>JPP</groupId>
+         <artifactId>jaf_1_1_api</artifactId>
+         <version>1.1</version>
+      </jpp>
+   </dependency>
+
+   <dependency>
+      <maven>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.annotation</artifactId>
+         <version>1.1.0.v201108011116</version>
+      </maven>
+      <jpp>
+         <groupId>JPP</groupId>
+         <artifactId>annotation_1_1_api</artifactId>
+         <version>1.1</version>
+      </jpp>
+   </dependency>
+
+<!--
    <dependency>
       <maven>
          <groupId>xmlpull</groupId>
@@ -37,7 +127,6 @@
      <version>1.5.3</version>
    </jpp>
  </dependency>
-<!--
  <dependency>
    <maven>
      <groupId>org.springframework</groupId>
@@ -50,7 +139,7 @@
      <version>1.2.9</version>
    </jpp>
  </dependency>
--->
+
  <dependency>
    <maven>
      <groupId>cglib</groupId>
@@ -124,9 +213,335 @@
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>httpunit</artifactId>
+     <artifactId>httpunit16</artifactId>
      <version>1.6.2</version>
    </jpp>
  </dependency>
 
+<dependency>
+   <maven>
+     <groupId>org.mortbay.jetty</groupId>
+     <artifactId>servlet-api</artifactId>
+     <version>2.5-20081211</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>servlet_2_5_api</artifactId>
+     <version>2.5</version>
+   </jpp>
+</dependency>
+-->
+<dependency>
+    <maven>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.2</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>junit4</artifactId>
+        <version>4.8.2</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <version>2.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>mojo-clirr-maven-plugin</artifactId>
+        <version>2.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>cglib</groupId>
+        <artifactId>cglib</artifactId>
+        <version>2.2.2</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>cglib</artifactId>
+        <version>2.2.2</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.aop</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-asm</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.asm</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aspects</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.aspects</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.beans</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.context</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context-support</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.context.support</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.core</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.expression</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-instrument</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.instrument</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-instrument-tomcat</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.instrument.tomcat</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-integration-tests</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.integration-tests</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.jdbc</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jms</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.jms</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.orm</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-oxm</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.oxm</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.test</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-transaction</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.transaction</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web-portlet</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.web.portlet</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web-servlet</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.web.servlet</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web-struts</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.web.struts</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>3.0.5</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring3</groupId>
+        <artifactId>org.springframework.web</artifactId>
+        <version>3.0.5</version>
+    </jpp>
+</dependency>
+
+
 </dependencies>
Index: wicket.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/wicket/wicket.spec,v
retrieving revision 1.1
diff -u -r1.1 wicket.spec
--- wicket.spec	16 Aug 2008 09:25:51 -0000	1.1
+++ wicket.spec	20 Sep 2012 09:16:15 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2008, JPackage Project
+# Copyright (c) 2000-2012, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,37 +28,41 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%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 section free
+%define _binary_payload w9.gzdio
+%define _source_payload w9.gzdio
+%define _binary_filedigest_algorithm 1
+%define _source_filedigest_algorithm 1
 
 Summary:        Wicket webapp framework
 Name:           wicket
-Version:        1.3.4
-Release:        1%{dist}
+Version:        1.5.8
+Release:        1%{?dist}
 Epoch:          0
 Group:          Development/Framework
-License:        Apache 2.0 License
+License:        ASL 2.0
 URL:            http://wicket.apache.org/
-Source0:        http://www.apache.org/dist/wicket/1.3.4/apache-wicket-1.3.4.tar.gz
-
-
+Source0:        http://www.apache.org/dist/wicket/1.5.8/apache-wicket-1.5.8.tar.gz
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-settings.xml
-
-Patch0:         wicket-pom.patch
-Patch1:         wicket-jdk1.4-wicket-pom.patch
-Patch2:         wicket-spring-ApplicationContextMock.patch
-Patch3:         wicket-velocity-pom.patch
-Patch4:         wicket-examples-httpunit-ParsedHTML.patch
-Patch5:         wicket-quickstart-archetype-pom.patch
-
-#Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
-#Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+Patch0:         wicket-core-pom.patch
+Requires(post): jpackage-utils >= 0:1.7.5
+Requires(postun): jpackage-utils >= 0:1.7.5
+Requires:       java >= 0:1.6.0
+Requires:       apache-portlet-1.0-api
+Requires:       apache-commons-collections
+Requires:       geronimo-annotation-1.1-api
+Requires:       geronimo-jaspic-1.0-api
+Requires:       glassfish-javamail141
+Requires:       jackson
+Requires:       portals-bridges1-common
+Requires:       log4j >= 0:1.2.14
+Requires:       slf4j
 BuildRequires:  jpackage-utils >= 0:1.7.5
-BuildRequires:  java-devel >= 0:1.5.0
+BuildRequires:  java-devel >= 0:1.6.0
 BuildRequires:  junit
-BuildRequires:  maven2 >= 0:2.0.7
+BuildRequires:  maven2 >= 0:2.0.8
+BuildRequires:  maven-skins
 BuildRequires:  maven2-plugin-antrun
 BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-compiler
@@ -73,54 +77,42 @@
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven2-plugin-war
+BuildRequires:  maven-archetype2
+BuildRequires:  maven-archetype2
+BuildRequires:  maven-script-interpreter
 BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  maven-surefire-report-plugin
-BuildRequires:  felix-maven2
-BuildRequires:  jetty6-maven2-plugins
-
+BuildRequires:  maven-bundle-plugin
+BuildRequires:  jetty7-integration
+BuildRequires:  mojo-clirr-maven-plugin
 BuildRequires:  apache-portlet-1.0-api
 BuildRequires:  asm
 BuildRequires:  excalibur-avalon-framework
 BuildRequires:  excalibur-avalon-logkit
 BuildRequires:  cglib
 BuildRequires:  easymock-java5
+BuildRequires:  geronimo-annotation-1.1-api
+BuildRequires:  geronimo-jaspic-1.0-api
+BuildRequires:  glassfish-javamail141
 BuildRequires:  google-guice
 BuildRequires:  httpunit
-BuildRequires:  jetty6-core
-BuildRequires:  jetty6-management
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-httpclient
-BuildRequires:  jakarta-commons-lang
-BuildRequires:  jakarta-commons-logging
+BuildRequires:  jackson
+BuildRequires:  jetty7
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-httpclient
+BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-logging
 BuildRequires:  jhighlight
 BuildRequires:  joda-time
 BuildRequires:  log4j
-BuildRequires:  portals-bridges-common
+BuildRequires:  portals-bridges1-common
 BuildRequires:  apache-portlet-1.0-api
 BuildRequires:  servlet_2_5_api
 BuildRequires:  slf4j
-BuildRequires:  spring2-all
+BuildRequires:  spring3-web
 BuildRequires:  velocity14
-
-
-Requires:       java >= 0:1.5.0
-Requires:       apache-portlet-1.0-api
-Requires:       jakarta-commons-collections
-Requires:       portals-bridges-common
-Requires:       log4j >= 0:1.2.14
-Requires:       slf4j
-
-Requires(post):   jpackage-utils >= 0:1.7.5
-Requires(postun): jpackage-utils >= 0:1.7.5
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -130,6 +122,14 @@
 complex debugging and brittle code for powerful, reusable 
 components written with plain Java and HTML.
 
+%package auth-roles
+Group:          Development/Framework
+Summary:        Auth roles module for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description auth-roles
+%{summary}.
+
 %package datetime
 Group:          Development/Framework
 Summary:        Datetime module for %{name}
@@ -139,6 +139,14 @@
 %description datetime
 %{summary}.
 
+%package devutils
+Group:          Development/Framework
+Summary:        Devutils module for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description devutils
+%{summary}.
+
 %package ioc
 Group:          Development/Framework
 Summary:        IoC module for %{name}
@@ -153,7 +161,7 @@
 Summary:        Spring module for %{name}
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       %{name}-ioc = %{epoch}:%{version}-%{release}
-Requires:       spring
+Requires:       spring3-web
 
 %description spring
 %{summary}.
@@ -162,7 +170,7 @@
 Group:          Development/Framework
 Summary:        Velocity module for %{name}
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-collections
+Requires:       apache-commons-collections
 Requires:       velocity14
 
 %description velocity
@@ -182,8 +190,8 @@
 Group:          Development/Framework
 Summary:        Threadtest module for %{name}
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-httpclient
-Requires:       jetty6-core
+Requires:       apache-commons-httpclient
+Requires:       jetty7
 Requires:       slf4j
 
 %description threadtest
@@ -197,9 +205,8 @@
 Requires:       %{name}-guice = %{epoch}:%{version}-%{release}
 Requires:       %{name}-velocity = %{epoch}:%{version}-%{release}
 Requires:       httpunit
-Requires:       jakarta-commons-lang
-Requires:       jetty6-core
-Requires:       jetty6-management
+Requires:       apache-commons-lang
+Requires:       jetty7
 Requires:       jhighlight
 Requires:       apache-portlet-1.0-api
 Requires:       slf4j
@@ -211,27 +218,15 @@
 %package javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
-#Requires(post):   /bin/rm,/bin/ln
-#Requires(postun): /bin/rm
 
 %description javadoc
 %{summary}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n apache-%{name}-%{version}
-for j in $(find . -name "*.jar"); do
-    mv $j $j.no
-done
+find . -name "*.jar" | xargs -t rm
 %patch0 -b .sav0
-%patch1 -b .sav1
-%patch2 -b .sav2
-%patch3 -b .sav3
-%patch4 -b .sav4
-%patch5 -b .sav5
-
 
-%build
 cp %{SOURCE2} maven2-settings.xml
 
 sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
@@ -243,26 +238,18 @@
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
 
-#export JAVA_HOME=%{_jvmdir}/java-1.5.0
-
-
+%build
 export M2SETTINGS=$(pwd)/maven2-settings.xml
 export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
 
 cd src
-
-mvn-jpp -e \
-        -s ${M2SETTINGS} \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-        install
-
 mvn-jpp -e \
         -s ${M2SETTINGS} \
-        -Daggregate=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-        javadoc:javadoc
+        -Dmaven.test.failure.ignore=true \
+        install javadoc:aggregate
+#       -Dmaven.test.skip=true \
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -276,142 +263,216 @@
 
 install -m 644 src/archetypes/quickstart/target/wicket-archetype-quickstart-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/archetype-quickstart-%{version}.jar
+install -m 644 src/archetypes/quickstart/target/wicket-archetype-quickstart-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/archetype-quickstart-sources-%{version}.jar
 install -m 644 src/archetypes/quickstart/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-archetype-quickstart.pom
 %add_to_maven_depmap org.apache.wicket wicket-archetype-quickstart %{version} JPP/%{name} archetype-quickstart
 
-install -m 644 src/jdk-1.4/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jdk14.pom
-%add_to_maven_depmap org.apache.wicket wicket-jdk14 %{version} JPP/%{name} jdk14
+install -m 644 src/wicket-auth-roles/target/wicket-auth-roles-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/auth-roles-%{version}.jar
+install -m 644 src/wicket-auth-roles/target/wicket-auth-roles-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/auth-roles-javadoc-%{version}.jar
+install -m 644 src/wicket-auth-roles/target/wicket-auth-roles-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/auth-roles-sources-%{version}.jar
+install -m 644 src/wicket-auth-roles/target/wicket-auth-roles-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/auth-roles-test-sources-%{version}.jar
+install -m 644 src/wicket-auth-roles/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-auth-roles.pom
+%add_to_maven_depmap org.apache.wicket wicket-auth-roles %{version} JPP/%{name} auth-roles
+
+install -m 644 src/wicket-core/target/wicket-core-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
+install -m 644 src/wicket-core/target/wicket-core-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/core-javadoc-%{version}.jar
+install -m 644 src/wicket-core/target/wicket-core-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/core-sources-%{version}.jar
+install -m 644 src/wicket-core/target/wicket-core-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/core-test-sources-%{version}.jar
+install -m 644 src/wicket-core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
+%add_to_maven_depmap org.apache.wicket wicket-core %{version} JPP/%{name} core
 
-install -m 644 src/jdk-1.4/wicket-datetime/target/wicket-datetime-%{version}.jar \
+install -m 644 src/wicket-datetime/target/wicket-datetime-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/datetime-%{version}.jar
-install -m 644 src/jdk-1.4/wicket-datetime/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-datetime.pom
+install -m 644 src/wicket-datetime/target/wicket-datetime-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/datetime-javadoc-%{version}.jar
+install -m 644 src/wicket-datetime/target/wicket-datetime-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/datetime-sources-%{version}.jar
+install -m 644 src/wicket-datetime/target/wicket-datetime-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/datetime-test-sources-%{version}.jar
+install -m 644 src/wicket-datetime/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-datetime.pom
 %add_to_maven_depmap org.apache.wicket wicket-datetime %{version} JPP/%{name} datetime
 
-install -m 644 src/jdk-1.4/wicket-extensions/target/wicket-extensions-%{version}.jar \
+install -m 644 src/wicket-devutils/target/wicket-devutils-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/devutils-%{version}.jar
+install -m 644 src/wicket-devutils/target/wicket-devutils-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/devutils-javadoc-%{version}.jar
+install -m 644 src/wicket-devutils/target/wicket-devutils-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/devutils-sources-%{version}.jar
+install -m 644 src/wicket-devutils/target/wicket-devutils-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/devutils-test-sources-%{version}.jar
+install -m 644 src/wicket-devutils/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-devutils.pom
+%add_to_maven_depmap org.apache.wicket wicket-devutils %{version} JPP/%{name} devutils
+
+install -m 644 src/wicket-examples/target/wicket-examples-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/examples-sources-%{version}.jar
+install -m 644 src/wicket-examples/target/wicket-examples-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/examples-test-sources-%{version}.jar
+install -m 644 src/wicket-examples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-examples.pom
+%add_to_maven_depmap org.apache.wicket wicket-examples %{version} JPP/%{name} examples
+
+install -m 644 src/wicket-extensions/target/wicket-extensions-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/extensions-%{version}.jar
-install -m 644 src/jdk-1.4/wicket-extensions/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-extensions.pom
+install -m 644 src/wicket-extensions/target/wicket-extensions-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/extensions-javadoc-%{version}.jar
+install -m 644 src/wicket-extensions/target/wicket-extensions-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/extensions-sources-%{version}.jar
+install -m 644 src/wicket-extensions/target/wicket-extensions-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/extensions-test-sources-%{version}.jar
+install -m 644 src/wicket-extensions/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-extensions.pom
 %add_to_maven_depmap org.apache.wicket wicket-extensions %{version} JPP/%{name} extensions
 
-install -m 644 src/jdk-1.4/wicket-ioc/target/wicket-ioc-%{version}.jar \
-         $RPM_BUILD_ROOT%{_javadir}/%{name}/ioc-%{version}.jar
-install -m 644 src/jdk-1.4/wicket-ioc/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ioc.pom
-%add_to_maven_depmap org.apache.wicket wicket-ioc %{version} JPP/%{name} ioc
-
-install -m 644 src/jdk-1.4/wicket/target/wicket-%{version}.jar \
-         $RPM_BUILD_ROOT%{_javadir}/%{name}/wicket-%{version}.jar
-install -m 644 src/jdk-1.4/wicket/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-wicket.pom
-%add_to_maven_depmap org.apache.wicket wicket %{version} JPP/%{name} wicket
-
-install -m 644 src/jdk-1.4/wicket-spring/target/wicket-spring-%{version}.jar \
-         $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-%{version}.jar
-install -m 644 src/jdk-1.4/wicket-spring/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-spring.pom
-%add_to_maven_depmap org.apache.wicket wicket-spring %{version} JPP/%{name} spring
-
-install -m 644 src/jdk-1.4/wicket-velocity/target/wicket-velocity-%{version}.jar \
-         $RPM_BUILD_ROOT%{_javadir}/%{name}/velocity-%{version}.jar
-install -m 644 src/jdk-1.4/wicket-velocity/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-velocity.pom
-%add_to_maven_depmap org.apache.wicket wicket-velocity %{version} JPP/%{name} velocity
-
-install -m 644 src/jdk-1.5/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jdk15.pom
-%add_to_maven_depmap org.apache.wicket wicket-jdk15 %{version} JPP/%{name} jdk15
-
-install -m 644 src/jdk-1.5/wicket-auth-roles/target/wicket-auth-roles-%{version}.jar \
-         $RPM_BUILD_ROOT%{_javadir}/%{name}/auth-roles-%{version}.jar
-install -m 644 src/jdk-1.5/wicket-auth-roles/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-auth-roles.pom
-%add_to_maven_depmap org.apache.wicket wicket-auth-roles %{version} JPP/%{name} auth-roles
-
-install -m 644 src/jdk-1.5/wicket-guice/target/wicket-guice-%{version}.jar \
+install -m 644 src/wicket-guice/target/wicket-guice-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/guice-%{version}.jar
-install -m 644 src/jdk-1.5/wicket-guice/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-guice.pom
+install -m 644 src/wicket-guice/target/wicket-guice-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/guice-javadoc-%{version}.jar
+install -m 644 src/wicket-guice/target/wicket-guice-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/guice-sources-%{version}.jar
+install -m 644 src/wicket-guice/target/wicket-guice-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/guice-test-sources-%{version}.jar
+install -m 644 src/wicket-guice/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-guice.pom
 %add_to_maven_depmap org.apache.wicket wicket-guice %{version} JPP/%{name} guice
 
-install -m 644 src/jdk-1.5/wicket-jmx/target/wicket-jmx-%{version}.jar \
+install -m 644 src/wicket-ioc/target/wicket-ioc-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/ioc-%{version}.jar
+install -m 644 src/wicket-ioc/target/wicket-ioc-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/ioc-javadoc-%{version}.jar
+install -m 644 src/wicket-ioc/target/wicket-ioc-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/ioc-sources-%{version}.jar
+install -m 644 src/wicket-ioc/target/wicket-ioc-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/ioc-test-sources-%{version}.jar
+install -m 644 src/wicket-ioc/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ioc.pom
+%add_to_maven_depmap org.apache.wicket wicket-ioc %{version} JPP/%{name} ioc
+
+install -m 644 src/wicket-jmx/target/wicket-jmx-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/jmx-%{version}.jar
-install -m 644 src/jdk-1.5/wicket-jmx/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jmx.pom
+install -m 644 src/wicket-jmx/target/wicket-jmx-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/jmx-javadoc-%{version}.jar
+install -m 644 src/wicket-jmx/target/wicket-jmx-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/jmx-sources-%{version}.jar
+install -m 644 src/wicket-jmx/target/wicket-jmx-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/jmx-test-sources-%{version}.jar
+install -m 644 src/wicket-jmx/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jmx.pom
 %add_to_maven_depmap org.apache.wicket wicket-jmx %{version} JPP/%{name} jmx
 
-install -m 644 src/jdk-1.5/wicket-objectssizeof-agent/target/wicket-objectsizeof-agent-%{version}.jar \
+install -m 644 src/wicket-objectssizeof-agent/target/wicket-objectsizeof-agent-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/objectsizeof-agent-%{version}.jar
-install -m 644 src/jdk-1.5/wicket-objectssizeof-agent/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-objectsizeof-agent.pom
+install -m 644 src/wicket-objectssizeof-agent/target/wicket-objectsizeof-agent-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/objectsizeof-agent-javadoc-%{version}.jar
+install -m 644 src/wicket-objectssizeof-agent/target/wicket-objectsizeof-agent-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/objectsizeof-agent-sources-%{version}.jar
+install -m 644 src/wicket-objectssizeof-agent/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-objectsizeof-agent.pom
 %add_to_maven_depmap org.apache.wicket wicket-objectsizeof-agent %{version} JPP/%{name} objectsizeof-agent
 
-install -m 644 src/jdk-1.5/wicket-spring-annot/target/wicket-spring-annot-%{version}.jar \
-         $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-annot-%{version}.jar
-install -m 644 src/jdk-1.5/wicket-spring-annot/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-spring-annot.pom
-%add_to_maven_depmap org.apache.wicket wicket-spring-annot %{version} JPP/%{name} spring-annot
+install -m 644 src/wicket-request/target/wicket-request-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/request-%{version}.jar
+install -m 644 src/wicket-request/target/wicket-request-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/request-javadoc-%{version}.jar
+install -m 644 src/wicket-request/target/wicket-request-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/request-sources-%{version}.jar
+install -m 644 src/wicket-request/target/wicket-request-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/request-test-sources-%{version}.jar
+install -m 644 src/wicket-request/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-request.pom
+%add_to_maven_depmap org.apache.wicket wicket-request %{version} JPP/%{name} request
+
+install -m 644 src/wicket-spring/target/wicket-spring-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-%{version}.jar
+install -m 644 src/wicket-spring/target/wicket-spring-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-javadoc-%{version}.jar
+install -m 644 src/wicket-spring/target/wicket-spring-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-sources-%{version}.jar
+install -m 644 src/wicket-spring/target/wicket-spring-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-test-sources-%{version}.jar
+install -m 644 src/wicket-spring/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-spring.pom
+%add_to_maven_depmap org.apache.wicket wicket-spring %{version} JPP/%{name} spring
+
+install -m 644 src/wicket-util/target/wicket-util-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/util-%{version}.jar
+install -m 644 src/wicket-util/target/wicket-util-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/util-javadoc-%{version}.jar
+install -m 644 src/wicket-util/target/wicket-util-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/util-sources-%{version}.jar
+install -m 644 src/wicket-util/target/wicket-util-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/util-test-sources-%{version}.jar
+install -m 644 src/wicket-util/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-util.pom
+%add_to_maven_depmap org.apache.wicket wicket-util %{version} JPP/%{name} util
+
+install -m 644 src/wicket-velocity/target/wicket-velocity-%{version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/velocity-%{version}.jar
+install -m 644 src/wicket-velocity/target/wicket-velocity-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/velocity-javadoc-%{version}.jar
+install -m 644 src/wicket-velocity/target/wicket-velocity-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/velocity-sources-%{version}.jar
+install -m 644 src/wicket-velocity/target/wicket-velocity-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/velocity-test-sources-%{version}.jar
+install -m 644 src/wicket-velocity/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-velocity.pom
+%add_to_maven_depmap org.apache.wicket wicket-velocity %{version} JPP/%{name} velocity
 
 install -m 644 src/testing/wicket-threadtest/target/wicket-threadtest-%{version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{name}/threadtest-%{version}.jar
+install -m 644 src/testing/wicket-threadtest/target/wicket-threadtest-%{version}-javadoc.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/threadtest-javadoc-%{version}.jar
+install -m 644 src/testing/wicket-threadtest/target/wicket-threadtest-%{version}-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/threadtest-sources-%{version}.jar
+install -m 644 src/testing/wicket-threadtest/target/wicket-threadtest-%{version}-test-sources.jar \
+         $RPM_BUILD_ROOT%{_javadir}/%{name}/threadtest-test-sources-%{version}.jar
 install -m 644 src/testing/wicket-threadtest/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-threadtest.pom
 %add_to_maven_depmap org.apache.wicket wicket-threadtest %{version} JPP/%{name} threadtest
 
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
+# war
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-install -m 0644 src/jdk-1.4/wicket-quickstart/target/wicket-quickstart.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-install -m 0644 src/jdk-1.5/wicket-examples/target/wicket-examples.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install -m 0644 src/wicket-examples/target/wicket-examples.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr src/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%post javadoc
-#rm -f %{_javadocdir}/%{name}
-#ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-#%postun javadoc
-#if [ "$1" = "0" ]; then
-#    rm -f %{_javadocdir}/%{name}
-#fi
-
 %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
 
 %files
 %defattr(0644,root,root,0755)
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/archetype-quickstart*.jar
+%{_javadir}/%{name}/archetype*.jar
 %{_javadir}/%{name}/extensions*.jar
-%{_javadir}/%{name}/wicket*.jar
-%{_javadir}/%{name}/auth-roles*.jar
+%{_javadir}/%{name}/core*.jar
 %{_javadir}/%{name}/jmx*.jar
 %{_javadir}/%{name}/objectsizeof*.jar
+%{_javadir}/%{name}/request*.jar
+%{_javadir}/%{name}/util*.jar
 %{_datadir}/maven2/poms/*
 %dir %{_datadir}/%{name}-%{version}
-%{_datadir}/%{name}-%{version}/%{name}-quickstart.war
 %{_mavendepmapfragdir}/*
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*-%{version}.jar.*
-%endif
+
+%files auth-roles
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/auth-roles*.jar
 
 %files datetime
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/datetime*.jar
 
+%files devutils
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/devutils*.jar
+
 %files ioc
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/ioc*.jar
@@ -434,14 +495,27 @@
 
 %files demo
 %defattr(0644,root,root,0755)
+%{_javadir}/%{name}/examples*.jar
 %{_datadir}/%{name}-%{version}/%{name}-examples.war
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 20 2012 Ralph Apel <[email protected]> 0:1.5.8-1
+- 1.5.8
+
+* Sun Feb 05 2012 Ralph Apel <[email protected]> 0:1.3.7-2
+- Replace (B)R portals-bridges-common with portals-bridges1-common
+
+* Wed Feb 02 2012 Ralph Apel <[email protected]> 0:1.3.7-1
+- 1.3.7 as wicket13 for JPP-6
+
+* Wed Jun 03 2009 David Walluck <[email protected]> 0:1.3.6-1
+- 1.3.6
+
 * Mon Aug 11 2008 Ralph Apel <r.apel at r-apel.de> 0:1.3.4-1.jpp5
 - Initial release