[RPM (6.0)] [DIST generic] portals-jetspeed2-2.1.3-4.jpp6

Ralph Apel <[email protected]> Tue, 25 Sep 2012 10:06:44 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : portals-jetspeed2            Relocations: (not relocatable)
Version     : 2.1.3                             Vendor: JPackage Project
Release     : 4.jpp6                        Build Date: Tue 25 Sep 2012 09:11:32 AM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries/Application Frameworks   Source RPM: (none)
Size        : 16463454                         License: Apache Software License 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://portals.apache.org/jetspeed-2/
Summary     : Jetspeed2 Enterprise Portal
Description :
Jetspeed-2 is the next-generation enterprise portal at Apache.
Jetspeed-2 offers several architectural enhancements and
improvements over Jetspeed 1.0. First, Jetspeed-2 is conformant
to the Java Portlet Standard and will provide a standard
mechanism for the deployment of portlets. Second, Jetspeed-2
has matured to a more scalable architecture featuring
multi-threaded functionality. Third, Jetspeed-2 is decoupled
from several legacy open source projects. Fourth, Jetspeed-2
is based on a component architecture.
Jetspeed is an Open Source implementation of an Enterprise
Information Portal, using Java and XML. A portal makes network
resources (applications, databases and so forth) available to
end-users. The user can access the portal via a web browser,
WAP-phone, pager or any other device. Jetspeed acts as the
central hub where information from multiple sources are made
available in an easy to use manner.
The data presented via Jetspeed is independent of content type.
This means that content from for example XML,RSS or SMTP can be
integrated with Jetspeed. The actual presentation of the data is
handled via ates XSL and delivered to the user for example via
the combination of Java Server Pages (JSPs) and HTML. Jetspeed
provides support for templating and content publication
frameworks such as Cocoon, WebMacro and Velocity. Note that
outside of regular browser Jetspeed also supports WAP devices.

---------------
Ralph Apel <r.apel at r-apel.de> 0:2.1.3-4
- First JPP-6 release
- Nodemo option hardwired
---------------
portals-jetspeed2.src: W: strange-permission portals-jetspeed2-settings.xml 0674
portals-jetspeed2.src: W: strange-permission portals-jetspeed2-jpp-depmap.xml 0674
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-ConnectionRepositoryEntry.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-JetspeedSerializerSecondaryImpl.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-applications-nodemo.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-components-capabilities-pom.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-noservers-pom.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-OJBHelper.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-components-portal-pom.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-JetspeedSerializerImpl.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-components-serializer-pom.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-components-page-manager-pom.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-java5.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-maven-plugin-project.patch
portals-jetspeed2.src: W: source-or-patch-not-bzipped portals-jetspeed2-components-jetspeed-pom.patch
portals-jetspeed2.src:489: W: rpm-buildroot-usage %prep rm -rf $RPM_BUILD_ROOT
portals-jetspeed2.src: W: no-signature
portals-jetspeed2.src: W: no-cleaning-of-buildroot %install
portals-jetspeed2.src: W: invalid-license Apache Software License 2.0
1 packages and 0 specfiles checked; 0 errors, 19 warnings.

---------------
Index: portals-jetspeed2-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/portals-jetspeed2/portals-jetspeed2-jpp-depmap.xml,v
retrieving revision 1.1
diff -u -r1.1 portals-jetspeed2-jpp-depmap.xml
--- portals-jetspeed2-jpp-depmap.xml	15 Aug 2008 11:32:37 -0000	1.1
+++ portals-jetspeed2-jpp-depmap.xml	25 Sep 2012 08:06:43 -0000
@@ -1,4 +1,5 @@
 <dependencies>
+<!--
  <dependency>
    <maven>
      <groupId>isorelax</groupId>
@@ -40,19 +41,6 @@
 
  <dependency>
    <maven>
-     <groupId>javax.servlet</groupId>
-     <artifactId>servlet-api</artifactId>
-     <version>2.3</version>
-   </maven>
-   <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>servlet_2_3_api</artifactId>
-     <version>2.3</version>
-   </jpp>
- </dependency>
-
- <dependency>
-   <maven>
      <groupId>ant</groupId>
      <artifactId>ant-nodeps</artifactId>
      <version>1.6.5</version>
@@ -78,43 +66,6 @@
 
  <dependency>
    <maven>
-     <groupId>torque</groupId>
-     <artifactId>torque</artifactId>
-     <version>3.2-rc3</version>
-   </maven>
-   <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>db-torque-runtime</artifactId>
-     <version>3.3</version>
-   </jpp>
- </dependency>
- <dependency>
-   <maven>
-     <groupId>torque</groupId>
-     <artifactId>torque-gen</artifactId>
-     <version>3.2-rc3</version>
-   </maven>
-   <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>db-torque-generator</artifactId>
-     <version>3.3</version>
-   </jpp>
- </dependency>
- <dependency>
-   <maven>
-     <groupId>torque</groupId>
-     <artifactId>torque-gen-templates</artifactId>
-     <version>3.2-rc3</version>
-   </maven>
-   <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>db-torque-templates</artifactId>
-     <version>3.3</version>
-   </jpp>
- </dependency>
-
- <dependency>
-   <maven>
      <groupId>commons-betwixt</groupId>
      <artifactId>commons-betwixt</artifactId>
      <version>20061115</version>
@@ -154,323 +105,399 @@
 
  <dependency>
    <maven>
-     <groupId>commons-primitives</groupId>
-     <artifactId>commons-primitives</artifactId>
-     <version>1.0</version>
+     <groupId>javax.jms</groupId>
+     <artifactId>jms</artifactId>
+     <version>1.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>commons-primitives</artifactId>
-     <version>1.0</version>
+     <artifactId>jms_1_1_api</artifactId>
+     <version>1.1</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>avalon-logkit</groupId>
-     <artifactId>avalon-logkit</artifactId>
-     <version>2.1</version>
+     <groupId>cglib</groupId>
+     <artifactId>cglib</artifactId>
+     <version>2.1_3</version>
    </maven>
    <jpp>
-     <groupId>JPP/excalibur</groupId>
-     <artifactId>avalon-logkit</artifactId>
-     <version>2.2.1</version>
+     <groupId>JPP</groupId>
+     <artifactId>cglib</artifactId>
+     <version>2.1.3</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
-     <groupId>avalon-framework</groupId>
-     <artifactId>avalon-framework-api</artifactId>
-     <version>4.3</version>
+     <groupId>cglib</groupId>
+     <artifactId>cglib-nodep</artifactId>
+     <version>2.1_3</version>
    </maven>
    <jpp>
-     <groupId>JPP/excalibur</groupId>
-     <artifactId>avalon-framework-api</artifactId>
-     <version>4.3.1</version>
+     <groupId>JPP</groupId>
+     <artifactId>cglib-nodep</artifactId>
+     <version>2.1.3</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>javax.jms</groupId>
-     <artifactId>jms</artifactId>
-     <version>1.1</version>
+     <groupId>ojb</groupId>
+     <artifactId>db-ojb</artifactId>
+     <version>1.0.3</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>jms_1_1_api</artifactId>
-     <version>1.1</version>
+     <groupId>JPP/db-ojb</groupId>
+     <artifactId>db-ojb</artifactId>
+     <version>1.0.4</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>javax.transaction</groupId>
-     <artifactId>jta</artifactId>
-     <version>1.0.1B</version>
+     <groupId>xpp3</groupId>
+     <artifactId>xpp3</artifactId>
+     <version>1.1.3.4.O</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>jta_1_0_1B_api</artifactId>
-     <version>1.0.1B</version>
+     <artifactId>xpp3</artifactId>
+     <version>1.1.3.8</version>
    </jpp>
  </dependency>
-
  <dependency>
    <maven>
-     <groupId>xalan</groupId>
-     <artifactId>xalan-serializer</artifactId>
-     <version>2.7.0</version>
+     <groupId>xpp3</groupId>
+     <artifactId>xpp3_min</artifactId>
+     <version>1.1.3.4.O</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>xalan-j2-serializer</artifactId>
-     <version>2.7.0</version>
+     <artifactId>xpp3-minimal</artifactId>
+     <version>1.1.3.8</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>org.apache.jcs</groupId>
-     <artifactId>jcs</artifactId>
-     <version>1.3</version>
+     <groupId>mx4j</groupId>
+     <artifactId>mx4j</artifactId>
+     <version>3.0.1</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>jcs</artifactId>
-     <version>1.2.7</version>
+     <groupId>JPP/mx4j</groupId>
+     <artifactId>mx4j</artifactId>
+     <version>3.0.1</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>org.springframework</groupId>
-     <artifactId>spring-ojb</artifactId>
-     <version>2.0-rc2</version>
+     <groupId>radeox</groupId>
+     <artifactId>radeox</artifactId>
+     <version>0.9</version>
    </maven>
    <jpp>
-     <groupId>JPP/spring</groupId>
-     <artifactId>orm</artifactId>
-     <version>1.2.9</version>
+     <groupId>JPP</groupId>
+     <artifactId>radeox</artifactId>
+     <version>0.9</version>
    </jpp>
  </dependency>
-
  <dependency>
    <maven>
-     <groupId>org.springframework</groupId>
-     <artifactId>spring-jdbc</artifactId>
-     <version>1.2.9</version>
+     <groupId>radeox</groupId>
+     <artifactId>radeox-oro</artifactId>
+     <version>0.9</version>
    </maven>
    <jpp>
-     <groupId>JPP/spring</groupId>
-     <artifactId>jdbc</artifactId>
-     <version>1.2.9</version>
+     <groupId>JPP</groupId>
+     <artifactId>oro</artifactId>
+     <version>2.0.8</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>mockrunner</groupId>
-     <artifactId>mockrunner</artifactId>
-     <version>0.3.8</version>
+     <groupId>xstream</groupId>
+     <artifactId>xstream</artifactId>
+     <version>1.2</version>
    </maven>
    <jpp>
-     <groupId>JPP/mockrunner</groupId>
-     <artifactId>mockrunner</artifactId>
-     <version>0.3.8</version>
+     <groupId>JPP</groupId>
+     <artifactId>xstream</artifactId>
+     <version>1.2.2</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>ehcache</groupId>
-     <artifactId>ehcache</artifactId>
-     <version>1.2.4</version>
+     <groupId>axion</groupId>
+     <artifactId>axion</artifactId>
+     <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>ehcache</artifactId>
-     <version>1.3.0</version>
+     <artifactId>axion</artifactId>
+     <version>1.0</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>mockejb</groupId>
-     <artifactId>mockejb</artifactId>
-     <version>0.6</version>
+     <groupId>commons-collections</groupId>
+     <artifactId>commons-collections</artifactId>
+     <version>3.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>mockejb</artifactId>
-     <version>0.6</version>
+     <artifactId>commons-collections32</artifactId>
+     <version>3.2</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>cglib</groupId>
-     <artifactId>cglib</artifactId>
-     <version>2.1_3</version>
+     <groupId>commons-transaction</groupId>
+     <artifactId>commons-transaction</artifactId>
+     <version>1.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>cglib</artifactId>
-     <version>2.1.3</version>
+     <artifactId>commons-transaction</artifactId>
+     <version>1.1</version>
    </jpp>
  </dependency>
+
  <dependency>
    <maven>
-     <groupId>cglib</groupId>
-     <artifactId>cglib-nodep</artifactId>
-     <version>2.1_3</version>
+     <groupId>commons-primitives</groupId>
+     <artifactId>commons-primitives</artifactId>
+     <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>cglib-nodep</artifactId>
-     <version>2.1.3</version>
+     <artifactId>commons-primitives11</artifactId>
+     <version>1.1</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>struts</groupId>
-     <artifactId>struts</artifactId>
-     <version>1.2.8</version>
+     <groupId>hsqldb</groupId>
+     <artifactId>hsqldb</artifactId>
+     <version>1.8.0.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>struts</artifactId>
-     <version>1.2.9</version>
+     <artifactId>hsqldb</artifactId>
+     <version>1.8.0.8</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>jboss</groupId>
-     <artifactId>jboss-j2ee</artifactId>
-     <version>4.0.2</version>
+     <groupId>stax</groupId>
+     <artifactId>stax-api</artifactId>
+     <version>1.0.1</version>
    </maven>
    <jpp>
-     <groupId>JPP/jboss4</groupId>
-     <artifactId>jboss-j2ee</artifactId>
-     <version>4.0.4</version>
+     <groupId>JPP</groupId>
+     <artifactId>stax_1_0_api</artifactId>
+     <version>1.0</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>ojb</groupId>
-     <artifactId>db-ojb</artifactId>
-     <version>1.0.3</version>
+     <groupId>javacc</groupId>
+     <artifactId>javacc</artifactId>
+     <version>3.2</version>
    </maven>
    <jpp>
-     <groupId>JPP/db-ojb</groupId>
-     <artifactId>db-ojb</artifactId>
-     <version>1.0.4</version>
+     <groupId>JPP</groupId>
+     <artifactId>javacc3</artifactId>
+     <version>3.2</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>castor</groupId>
-     <artifactId>castor</artifactId>
-     <version>1.1.1-xml</version>
+     <groupId>javacc</groupId>
+     <artifactId>javacc</artifactId>
+     <version>3.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>castor-xml</artifactId>
-     <version>1.1.2.1</version>
+     <artifactId>javacc3</artifactId>
+     <version>3.2</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>lucene</groupId>
-     <artifactId>lucene-core</artifactId>
-     <version>2.0.0</version>
+     <groupId>org.apache.myfaces</groupId>
+     <artifactId>myfaces</artifactId>
+     <version>5</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>lucene22</artifactId>
-     <version>2.2.0</version>
+     <groupId>JPP/myfaces</groupId>
+     <artifactId>master</artifactId>
+     <version>5</version>
    </jpp>
  </dependency>
+-->
 
  <dependency>
    <maven>
-     <groupId>commonj</groupId>
-     <artifactId>commonj-twm</artifactId>
-     <version>1.1</version>
+     <groupId>org.apache.pluto</groupId>
+     <artifactId>pluto</artifactId>
+     <version>1.0.1</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>commonj_1_1_apis</artifactId>
-     <version>1.1</version>
+     <groupId>JPP/portals-pluto10</groupId>
+     <artifactId>pluto</artifactId>
+     <version>1.0.1</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>taglibs</groupId>
-     <artifactId>random</artifactId>
-     <version>1.0.2</version>
+     <groupId>portlet-api</groupId>
+     <artifactId>portlet-api</artifactId>
+     <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>taglibs-random</artifactId>
-     <version>1.0.2</version>
+     <artifactId>portlet_1_0_api</artifactId>
+     <version>1.0</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>ddlutils</groupId>
-     <artifactId>ddlutils</artifactId>
-     <version>1.0-RC1-PATCHED</version>
+     <groupId>javax.servlet</groupId>
+     <artifactId>servlet-api</artifactId>
+     <version>2.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>db-ddlutils</artifactId>
-     <version>1.0</version>
+     <artifactId>servlet_2_3_api</artifactId>
+     <version>2.3</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>javolution</groupId>
-     <artifactId>javolution</artifactId>
-     <version>4.0.2</version>
-   </maven>
-   <jpp>
+     <groupId>torque</groupId>
+     <artifactId>torque</artifactId>
+     <version>3.2-rc3</version>
+   </maven>
+   <jpp>
      <groupId>JPP</groupId>
-     <artifactId>javolution</artifactId>
-     <version>5.2.6</version>
+     <artifactId>db-torque-runtime</artifactId>
+     <version>3.3</version>
+   </jpp>
+ </dependency>
+ <dependency>
+   <maven>
+     <groupId>torque</groupId>
+     <artifactId>torque-gen</artifactId>
+     <version>3.2-rc3</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>db-torque-generator</artifactId>
+     <version>3.3</version>
+   </jpp>
+ </dependency>
+ <dependency>
+   <maven>
+     <groupId>torque</groupId>
+     <artifactId>torque-gen-templates</artifactId>
+     <version>3.2-rc3</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>db-torque-templates</artifactId>
+     <version>3.3</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>xpp3</groupId>
-     <artifactId>xpp3</artifactId>
-     <version>1.1.3.4.O</version>
+     <groupId>xalan</groupId>
+     <artifactId>xalan-serializer</artifactId>
+     <version>2.7.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>xpp3</artifactId>
-     <version>1.1.3.8</version>
+     <artifactId>xalan-j2-serializer</artifactId>
+     <version>2.7.0</version>
    </jpp>
  </dependency>
+
  <dependency>
    <maven>
-     <groupId>xpp3</groupId>
-     <artifactId>xpp3_min</artifactId>
-     <version>1.1.3.4.O</version>
+     <groupId>org.apache.jcs</groupId>
+     <artifactId>jcs</artifactId>
+     <version>1.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>xpp3-minimal</artifactId>
-     <version>1.1.3.8</version>
+     <artifactId>jcs</artifactId>
+     <version>1.2.7</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>avalon-logkit</groupId>
+     <artifactId>avalon-logkit</artifactId>
+     <version>2.1</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/excalibur</groupId>
+     <artifactId>avalon-logkit</artifactId>
+     <version>2.2.1</version>
+   </jpp>
+ </dependency>
+ <dependency>
+   <maven>
+     <groupId>avalon-framework</groupId>
+     <artifactId>avalon-framework-api</artifactId>
+     <version>4.3</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/excalibur</groupId>
+     <artifactId>avalon-framework-api</artifactId>
+     <version>4.3.1</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>mockrunner</groupId>
+     <artifactId>mockrunner</artifactId>
+     <version>0.3.8</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/mockrunner</groupId>
+     <artifactId>mockrunner-jdk1.6-j2ee1.4</artifactId>
+     <version>0.4.3</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>ehcache</groupId>
+     <artifactId>ehcache</artifactId>
+     <version>1.2.4</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>ehcache</artifactId>
+     <version>1.3.0</version>
    </jpp>
  </dependency>
 
@@ -483,133 +510,149 @@
    <jpp>
      <groupId>JPP/spring2</groupId>
      <artifactId>webmvc-portlet</artifactId>
-     <version>2.5.1</version>
+     <version>2.5.6</version>
    </jpp>
  </dependency>
 
+<dependency>
+    <maven>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context-support</artifactId>
+        <version>2.5.6.SEC03</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/spring2</groupId>
+        <artifactId>context-support</artifactId>
+        <version>2.5.6.SEC03</version>
+    </jpp>
+</dependency>
+
  <dependency>
    <maven>
-     <groupId>javax.servlet</groupId>
-     <artifactId>jstl</artifactId>
-     <version>1.1.2</version>
+     <groupId>org.springframework</groupId>
+     <artifactId>spring-ojb</artifactId>
+     <version>2.0-rc2</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>taglibs-core</artifactId>
-     <version>1.1.1</version>
+     <groupId>JPP/spring</groupId>
+     <artifactId>orm</artifactId>
+     <version>1.2.9</version>
    </jpp>
  </dependency>
+
  <dependency>
    <maven>
-     <groupId>taglibs</groupId>
-     <artifactId>standard</artifactId>
-     <version>1.1.2</version>
+     <groupId>org.springframework</groupId>
+     <artifactId>spring-jdbc</artifactId>
+     <version>1.2.9</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>taglibs-standard</artifactId>
-     <version>1.1.1</version>
+     <groupId>JPP/spring</groupId>
+     <artifactId>jdbc</artifactId>
+     <version>1.2.9</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>myfaces</groupId>
-     <artifactId>myfaces-api</artifactId>
-     <version>1.1.5</version>
+     <groupId>mockejb</groupId>
+     <artifactId>mockejb</artifactId>
+     <version>0.6</version>
    </maven>
    <jpp>
-     <groupId>JPP/myfaces</groupId>
-     <artifactId>myfaces-jsf-api</artifactId>
-     <version>1.1.0</version>
+     <groupId>JPP</groupId>
+     <artifactId>mockejb</artifactId>
+     <version>0.6</version>
    </jpp>
  </dependency>
+
  <dependency>
    <maven>
-     <groupId>myfaces</groupId>
-     <artifactId>myfaces-impl</artifactId>
-     <version>1.1.5</version>
+     <groupId>struts</groupId>
+     <artifactId>struts</artifactId>
+     <version>1.2.8</version>
    </maven>
    <jpp>
-     <groupId>JPP/myfaces</groupId>
-     <artifactId>myfaces-impl</artifactId>
-     <version>1.1.0</version>
+     <groupId>JPP</groupId>
+     <artifactId>struts</artifactId>
+     <version>1.3.8</version>
    </jpp>
  </dependency>
+
  <dependency>
    <maven>
-     <groupId>myfaces</groupId>
-     <artifactId>tomahawk</artifactId>
-     <version>1.1.5</version>
+     <groupId>jboss</groupId>
+     <artifactId>jboss-j2ee</artifactId>
+     <version>4.0.2</version>
    </maven>
    <jpp>
-     <groupId>JPP/myfaces</groupId>
-     <artifactId>tomahawk</artifactId>
-     <version>1.1.0</version>
+     <groupId>JPP/jboss4</groupId>
+     <artifactId>jboss-j2ee</artifactId>
+     <version>4.0.4</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>mx4j</groupId>
-     <artifactId>mx4j</artifactId>
-     <version>3.0.1</version>
+     <groupId>javax.transaction</groupId>
+     <artifactId>jta</artifactId>
+     <version>1.0.1B</version>
    </maven>
    <jpp>
-     <groupId>JPP/mx4j</groupId>
-     <artifactId>mx4j</artifactId>
-     <version>3.0.1</version>
+     <groupId>JPP</groupId>
+     <artifactId>jta_1_0_1B_api</artifactId>
+     <version>1.0.1B</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>radeox</groupId>
-     <artifactId>radeox</artifactId>
-     <version>0.9</version>
+     <groupId>jdo</groupId>
+     <artifactId>jdo</artifactId>
+     <version>1.0.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>radeox</artifactId>
-     <version>0.9</version>
+     <artifactId>apache-jdo-1.1-api</artifactId>
+     <version>2.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
-     <groupId>radeox</groupId>
-     <artifactId>radeox-oro</artifactId>
-     <version>0.9</version>
+     <groupId>jdo</groupId>
+     <artifactId>jdori</artifactId>
+     <version>1.0.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>oro</artifactId>
-     <version>2.0.8</version>
+     <artifactId>apache-jdo-1.1-impl</artifactId>
+     <version>2.0</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>xstream</groupId>
-     <artifactId>xstream</artifactId>
-     <version>1.2</version>
+     <groupId>castor</groupId>
+     <artifactId>castor</artifactId>
+     <version>1.1.1-xml</version>
    </maven>
    <jpp>
-     <groupId>JPP</groupId>
-     <artifactId>xstream</artifactId>
-     <version>1.2.2</version>
+     <groupId>JPP/castor</groupId>
+     <artifactId>xml</artifactId>
+     <version>1.3.0.1</version>
    </jpp>
  </dependency>
 
  <dependency>
    <maven>
-     <groupId>axion</groupId>
-     <artifactId>axion</artifactId>
-     <version>1.0</version>
+     <groupId>lucene</groupId>
+     <artifactId>lucene-core</artifactId>
+     <version>2.0.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
-     <artifactId>axion</artifactId>
-     <version>1.0</version>
+     <artifactId>lucene22</artifactId>
+     <version>2.2.0</version>
    </jpp>
  </dependency>
 
@@ -626,4 +669,364 @@
    </jpp>
  </dependency>
 
+ <dependency>
+   <maven>
+     <groupId>commonj</groupId>
+     <artifactId>commonj-twm</artifactId>
+     <version>1.1</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>commonj_1_1_apis</artifactId>
+     <version>1.1</version>
+   </jpp>
+ </dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-portletfilter</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-portletfilter</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-common</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-common</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-velocity</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-velocity</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-frameworks</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-frameworks</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-jsf</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-jsf</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-perl</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-perl</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-struts</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-struts</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-groovy</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-groovy</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-applications</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-applications</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>jpetstore</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1/applications</groupId>
+        <artifactId>jpetstore</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>jsf-demo</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1/applications</groupId>
+        <artifactId>jsf-demo</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>perl</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1/applications</groupId>
+        <artifactId>perl</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>springmvc</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1/applications</groupId>
+        <artifactId>springmvc</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges1-mapserver</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1</groupId>
+        <artifactId>portals-bridges1-mapserver</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
+ <dependency>
+   <maven>
+     <groupId>javolution</groupId>
+     <artifactId>javolution</artifactId>
+     <version>4.0.2</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>javolution</artifactId>
+     <version>5.2.6</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>ddlutils</groupId>
+     <artifactId>ddlutils</artifactId>
+     <version>1.0-RC1-PATCHED</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>db-ddlutils</artifactId>
+     <version>1.0</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>myfaces</groupId>
+     <artifactId>myfaces-api</artifactId>
+     <version>1.1.5</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/myfaces</groupId>
+     <artifactId>core11-api</artifactId>
+     <version>1.1.5</version>
+   </jpp>
+ </dependency>
+ <dependency>
+   <maven>
+     <groupId>myfaces</groupId>
+     <artifactId>myfaces-impl</artifactId>
+     <version>1.1.5</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/myfaces</groupId>
+     <artifactId>core11-impl</artifactId>
+     <version>1.1.5</version>
+   </jpp>
+ </dependency>
+ <dependency>
+   <maven>
+     <groupId>myfaces</groupId>
+     <artifactId>tomahawk</artifactId>
+     <version>1.1.5</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/myfaces</groupId>
+     <artifactId>tomahawk</artifactId>
+     <version>1.1.6</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>taglibs</groupId>
+     <artifactId>random</artifactId>
+     <version>1.0.2</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>taglibs-random</artifactId>
+     <version>1.0.2</version>
+   </jpp>
+ </dependency>
+
+ <dependency>
+   <maven>
+     <groupId>javax.servlet</groupId>
+     <artifactId>jstl</artifactId>
+     <version>1.1.2</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>taglibs-core</artifactId>
+     <version>1.1.1</version>
+   </jpp>
+ </dependency>
+ <dependency>
+   <maven>
+     <groupId>taglibs</groupId>
+     <artifactId>standard</artifactId>
+     <version>1.1.2</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>taglibs-standard</artifactId>
+     <version>1.1.1</version>
+   </jpp>
+ </dependency>
+
+<dependency>
+    <maven>
+        <groupId>com.tonicsystems</groupId>
+        <artifactId>jarjar</artifactId>
+        <version>0.6</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>jarjar</artifactId>
+        <version>1.0</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.2</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.3.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>jpetstore</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1/applications</groupId>
+        <artifactId>jpetstore</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+<dependency>
+    <maven>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>jsf-demo</artifactId>
+        <version>1.0.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/portals-bridges1/applications</groupId>
+        <artifactId>jsf-demo</artifactId>
+        <version>1.0.4</version>
+    </jpp>
+</dependency>
+
 </dependencies>
Index: portals-jetspeed2-noservers-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/portals-jetspeed2/portals-jetspeed2-noservers-pom.patch,v
retrieving revision 1.1
diff -u -r1.1 portals-jetspeed2-noservers-pom.patch
--- portals-jetspeed2-noservers-pom.patch	15 Aug 2008 11:32:37 -0000	1.1
+++ portals-jetspeed2-noservers-pom.patch	25 Sep 2012 08:06:43 -0000
@@ -1,5 +1,5 @@
 --- src/pom.xml.sav5	2007-12-22 04:14:55.000000000 +0100
-+++ src/pom.xml	2008-07-14 12:01:10.000000000 +0200
++++ src/pom.xml	2012-09-24 15:50:12.328030231 +0200
 @@ -240,9 +240,11 @@
          <module>portal</module>
  
Index: portals-jetspeed2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/portals-jetspeed2/portals-jetspeed2.spec,v
retrieving revision 1.2
diff -u -r1.2 portals-jetspeed2.spec
--- portals-jetspeed2.spec	15 Aug 2008 16:59:32 -0000	1.2
+++ portals-jetspeed2.spec	25 Sep 2012 08:06:43 -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
@@ -35,17 +35,22 @@
 
 %define section free
 %define bname   jetspeed
+%define _binary_payload w9.gzdio
+%define _source_payload w9.gzdio
+%define _binary_filedigest_algorithm 1
+%define _source_filedigest_algorithm 1
+
+%define with_nodemo 1
+%define without_nodemo 0
 
 Name:           portals-%{bname}2
 Version:        2.1.3
-Release:        2%{dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Jetspeed2 Enterprise Portal
 License:        Apache Software License 2.0
-Url:            http://excalibur.apache.org/
+Url:            http://portals.apache.org/jetspeed-2/
 Group:          Development/Libraries/Application Frameworks
-#Vendor:        JPackage Project
-#Distribution:  JPackage
 Source0:        http://www.apache.org/dist/portals/jetspeed-2/sources/jetspeed-2.1.3-src.tar.gz
 
 Source2:        %{name}-jpp-depmap.xml
@@ -59,14 +64,20 @@
 Patch5:         portals-jetspeed2-noservers-pom.patch
 Patch6:         portals-jetspeed2-applications-nodemo.patch
 Patch7:         portals-jetspeed2-maven-plugin-project.patch
+Patch8:         portals-jetspeed2-OJBHelper.patch
+Patch9:         portals-jetspeed2-ConnectionRepositoryEntry.patch
+Patch10:        portals-jetspeed2-JetspeedSerializerImpl.patch
+Patch11:        portals-jetspeed2-JetspeedSerializerSecondaryImpl.patch
+Patch12:        portals-jetspeed2-java5.patch
+
 BuildRequires:  jpackage-utils >= 0:1.7.5
-BuildRequires:  java-devel >= 0:1.5.0
-BuildRequires:  ant >= 0:1.6.5
+BuildRequires:  java-devel >= 0:1.6.0
+BuildRequires:  ant >= 0:1.7.1
 BuildRequires:  ant-nodeps
 BuildRequires:  antlr
 BuildRequires:  jmock
 BuildRequires:  junit
-BuildRequires:  maven2 >= 0:2.0.7
+BuildRequires:  maven2 >= 0:2.0.8
 BuildRequires:  maven2-plugin-antrun
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-ear
@@ -77,7 +88,7 @@
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven2-plugin-war
-BuildRequires:  maven2-default-skin
+BuildRequires:  maven-skins
 BuildRequires:  maven >= 0:1.1
 BuildRequires:  maven-plugins-base
 BuildRequires:  maven-plugin-license
@@ -85,6 +96,7 @@
 BuildRequires:  maven-artifact-ant
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  mockrunner
+BuildRequires:  myfaces-maven-master-pom
 
 BuildRequires:  aopalliance
 BuildRequires:  excalibur-avalon-framework-api
@@ -96,36 +108,38 @@
 BuildRequires:  db-torque
 BuildRequires:  db-torque-gen
 BuildRequires:  db-torque-maven-plugin
-BuildRequires:  jakarta-commons-beanutils
-BuildRequires:  jakarta-commons-betwixt
-BuildRequires:  jakarta-commons-codec
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-configuration
-BuildRequires:  jakarta-commons-dbcp
-BuildRequires:  jakarta-commons-digester
-BuildRequires:  jakarta-commons-el
-BuildRequires:  jakarta-commons-fileupload
-BuildRequires:  jakarta-commons-httpclient
-BuildRequires:  jakarta-commons-io
-BuildRequires:  jakarta-commons-lang
-BuildRequires:  jakarta-commons-logging
-BuildRequires:  jakarta-commons-pool
-BuildRequires:  jakarta-commons-validator
+BuildRequires:  apache-commons-beanutils
+BuildRequires:  apache-commons-betwixt
+BuildRequires:  apache-commons-codec
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-configuration
+BuildRequires:  apache-commons-dbcp
+BuildRequires:  apache-commons-digester
+BuildRequires:  apache-commons-el
+BuildRequires:  apache-commons-fileupload
+BuildRequires:  apache-commons-httpclient
+BuildRequires:  apache-commons-io
+BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-logging
+BuildRequires:  apache-commons-pool
+BuildRequires:  apache-commons-validator
 BuildRequires:  jakarta-taglibs-standard
 BuildRequires:  jakarta-taglibs-supported-random
 BuildRequires:  jakarta-taglibs-supported-request
 
+BuildRequires:  apache-jdo-1.1-api
+BuildRequires:  apache-jdo-1.1-impl
 BuildRequires:  apacheds10-core
-BuildRequires:  castor-xml
+BuildRequires:  castor
 BuildRequires:  db-ddlutils
 BuildRequires:  db-ojb
 BuildRequires:  derby
 BuildRequires:  ehcache
-BuildRequires:  fop
+BuildRequires:  xmlgraphics-fop
 BuildRequires:  geronimo-specs
 BuildRequires:  gnu-getopt
 BuildRequires:  hsqldb
-BuildRequires:  ibatis
+BuildRequires:  apache-ibatis-sqlmap
 BuildRequires:  javolution
 BuildRequires:  jaxen
 BuildRequires:  jboss4-j2ee
@@ -133,13 +147,15 @@
 BuildRequires:  lucene22
 BuildRequires:  mx4j
 BuildRequires:  log4j
-BuildRequires:  myfaces
+BuildRequires:  myfaces-core11-api
+BuildRequires:  myfaces-core11-impl
+BuildRequires:  myfaces-tomahawk
 BuildRequires:  nekohtml
 BuildRequires:  oro
 BuildRequires:  portals-pluto10
-BuildRequires:  portlet-1.0-api
+BuildRequires:  portlet_1_0_api
 BuildRequires:  regexp
-BuildRequires:  servletapi4
+BuildRequires:  servlet_2_3_api
 BuildRequires:  spring2-all
 BuildRequires:  spring2-beans
 BuildRequires:  spring2-context
@@ -153,30 +169,30 @@
 BuildRequires:  spring-orm
 
 BuildRequires:  struts
-BuildRequires:  sun-mail
+BuildRequires:  glassfish-javamail
 BuildRequires:  tyrex
 BuildRequires:  velocity
 BuildRequires:  velocity-tools
 BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-jaxp-1.3-apis
+#BuildRequires:  xerces-j2
+#BuildRequires:  xml-commons-jaxp-1.3-apis
 BuildRequires:  xpp3-minimal
-BuildRequires:  portals-bridges-common
+BuildRequires:  portals-bridges1-common
 %if %{without_nodemo}
-BuildRequires:  portals-bridges-groovy
-BuildRequires:  portals-bridges-demo
+BuildRequires:  portals-bridges1-groovy
+BuildRequires:  portals-bridges1-demo
 %endif
-BuildRequires:  portals-bridges-velocity
-BuildRequires:  portals-bridges-frameworks
-BuildRequires:  portals-bridges-jsf
-BuildRequires:  portals-bridges-portletfilter
+BuildRequires:  portals-bridges1-velocity
+BuildRequires:  portals-bridges1-frameworks
+BuildRequires:  portals-bridges1-jsf
+BuildRequires:  portals-bridges1-portletfilter
 #BuildRequires:  portals-bridges-perl
 #BuildRequires:  portals-bridges-php
 #BuildRequires:  portals-bridges-struts
 #BuildRequires:  phpportlet
 BuildRequires:  rome
 
-Requires:       java >= 0:1.5.0
+Requires:       java >= 0:1.6.0
 
 Requires(post):    jpackage-utils >= 0:1.7.5
 Requires(postun):  jpackage-utils >= 0:1.7.5
@@ -249,7 +265,7 @@
 Summary:        Ant tasks of %{name}
 Group:          Development/Libraries
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       ant >= 0:1.6.5
+Requires:       ant >= 0:1.7.1
 
 %description ant-tasks
 %{summary}.
@@ -277,25 +293,27 @@
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
 Requires:       %{name}-api
 Requires:       %{name}-commons
+Requires:       apache-jdo-1.1-api
+Requires:       apache-jdo-1.1-impl
 Requires:       aopalliance
 Requires:       asm2
-Requires:       castor-xml
+Requires:       castor
 Requires:       cglib
 Requires:       commonj_1_1_apis
 Requires:       db-ddlutils
 Requires:       ehcache
-Requires:       jakarta-commons-beanutils
-Requires:       jakarta-commons-betwixt
-Requires:       jakarta-commons-codec
-Requires:       jakarta-commons-collections
-Requires:       jakarta-commons-configuration
-Requires:       jakarta-commons-dbcp
-Requires:       jakarta-commons-digester
-Requires:       jakarta-commons-fileupload
-Requires:       jakarta-commons-httpclient
-Requires:       jakarta-commons-io
-Requires:       jakarta-commons-lang
-Requires:       jakarta-commons-logging
+Requires:       apache-commons-beanutils
+Requires:       apache-commons-betwixt
+Requires:       apache-commons-codec
+Requires:       apache-commons-collections
+Requires:       apache-commons-configuration
+Requires:       apache-commons-dbcp
+Requires:       apache-commons-digester
+Requires:       apache-commons-fileupload
+Requires:       apache-commons-httpclient
+Requires:       apache-commons-io
+Requires:       apache-commons-lang
+Requires:       apache-commons-logging
 Requires:       jakarta-taglibs-supported-random
 Requires:       jakarta-oro
 Requires:       javolution
@@ -317,8 +335,8 @@
 Requires:       tyrex
 Requires:       velocity
 Requires:       velocity-tools
-Requires:       xerces-j2
-Requires:       xml-commons-jaxp-1.3-apis
+#Requires:       xerces-j2
+#Requires:       xml-commons-jaxp-1.3-apis
 
 %description components
 %{summary}.
@@ -332,7 +350,7 @@
 Requires:       %{name}-components
 Requires:       %{name}-demo
 Requires:       %{name}-applications
-Requires:       apache-portlet-1.0-api
+Requires:       portlet_1_0_api
 
 
 %description app-servers
@@ -343,8 +361,8 @@
 Summary:        Taglibs of %{name}
 Group:          Development/Libraries
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       portlet-1.0-api
-Requires:       servletapi4
+Requires:       portlet_1_0_api
+Requires:       servlet_2_3_api
 
 %description taglibs
 %{summary}.
@@ -353,10 +371,10 @@
 Summary:        Gems for %{name}
 Group:          Development/Libraries
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-dbcp
-Requires:       jakarta-commons-httpclient
-Requires:       jakarta-commons-lang
-Requires:       jakarta-commons-logging
+Requires:       apache-commons-dbcp
+Requires:       apache-commons-httpclient
+Requires:       apache-commons-lang
+Requires:       apache-commons-logging
 Requires:       portals-bridges-velocity
 Requires:       spring2-webmvc-portlet
 Requires:       spring2-beans
@@ -372,8 +390,8 @@
 Requires:       %{name}-api
 Requires:       %{name}-commons
 Requires:       %{name}-components
-Requires:       jakarta-commons-configuration
-Requires:       jakarta-commons-logging
+Requires:       apache-commons-configuration
+Requires:       apache-commons-logging
 
 %description layout-portlets
 %{summary}.
@@ -387,19 +405,21 @@
 Requires:       %{name}-components = %{epoch}:%{version}-%{release}
 Requires:       %{name}-portals-gems = %{epoch}:%{version}-%{release}
 Requires:       %{name}-taglibs = %{epoch}:%{version}-%{release}
-Requires:       %{name}-webapp-logging = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-collections
-Requires:       jakarta-commons-digester
-Requires:       jakarta-commons-fileupload
-Requires:       jakarta-commons-io
-Requires:       jakarta-commons-lang
-Requires:       jakarta-commons-logging
+Requires:       apache-jdo-1.1-api
+Requires:       apache-jdo-1.1-impl
+Requires:       apache-commons-collections
+Requires:       apache-commons-digester
+Requires:       apache-commons-fileupload
+Requires:       apache-commons-io
+Requires:       apache-commons-lang
+Requires:       apache-commons-logging
 Requires:       jakarta-oro
 Requires:       jakarta-taglibs-standard
 Requires:       jakarta-taglibs-supported-request
 Requires:       jdom
 Requires:       log4j
-Requires:       myfaces
+Requires:       myfaces-core11-api
+Requires:       myfaces-core11-impl
 Requires:       portals-bridges-frameworks
 Requires:       portals-bridges-jsf
 Requires:       portals-bridges-portletfilter
@@ -416,8 +436,8 @@
 Requires:       velocity
 Requires:       velocity-tools
 Requires:       xalan-j2
-Requires:       xerces-j2
-Requires:       xml-commons-jaxp-1.3-apis
+#Requires:       xerces-j2
+#Requires:       xml-commons-jaxp-1.3-apis
 
 %description applications
 %{summary}.
@@ -431,12 +451,12 @@
 Requires:       %{name}-portals-gems = %{epoch}:%{version}-%{release}
 Requires:       antlr
 Requires:       asm2
-Requires:       castor-xml
+Requires:       castor
 Requires:       groovy11
-Requires:       jakarta-commons-collections
-Requires:       jakarta-commons-digester
-Requires:       jakarta-commons-lang
-Requires:       jakarta-commons-logging
+Requires:       apache-commons-collections
+Requires:       apache-commons-digester
+Requires:       apache-commons-lang
+Requires:       apache-commons-logging
 Requires:       jakarta-oro
 Requires:       jakarta-taglibs-standard
 Requires:       jakarta-taglibs-supported-request
@@ -486,6 +506,11 @@
 %patch6 -b .sav6
 %endif
 %patch7 -b .sav7
+%patch8 -b .sav8
+%patch9 -b .sav9
+%patch10 -b .sav10
+%patch11 -b .sav11
+%patch12 -b .sav12
 
 %build
 cp %{SOURCE3} maven2-settings.xml
@@ -499,9 +524,6 @@
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
 
-#export JAVA_HOME=%{_jvmdir}/java-1.5.0
-
-
 export M2SETTINGS=$(pwd)/maven2-settings.xml
 export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
 export M11_HOME_LOCAL=`pwd`/m11_repo
@@ -563,11 +585,6 @@
     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{bname}-api.pom
 %add_to_maven_depmap org.apache.portals.jetspeed-2 jetspeed-api %{version} JPP/%{name} %{bname}-api
 
-#install -m 644 \
-#portlet-api/target/portlet-api-1.0.jar \
-#$RPM_BUILD_ROOT%{_javadir}/%{name}/portlet-1.0-api-%{version}.jar
-
-
 install -m 644 \
 commons/target/%{bname}-commons-%{version}.jar \
     $RPM_BUILD_ROOT%{_javadir}/%{name}/%{bname}-commons-%{version}.jar
@@ -900,16 +917,6 @@
 # create unversioned symlinks
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-maven-plugin-%{version}
-#cp -pr maven-plugin/target/site/apidocs/* \
-#       $RPM_BUILD_ROOT%{_javadocdir}/%{name}-maven-plugin-%{version}
-#ln -s %{name}-maven-plugin-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-maven-plugin
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-portlet-api-%{version}
-#cp -pr portlet-api/target/site/apidocs/* \
-#       $RPM_BUILD_ROOT%{_javadocdir}/%{name}-portlet-api-%{version}
-#ln -s %{name}-portlet-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-portlet-api # ghost symlink
-
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs/* \
        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -931,19 +938,10 @@
 %postun poms
 %update_maven_depmap
 
-#%post javadoc
-#rm -f %{_javadocdir}/%{name}
-#ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-#%postun javadoc
-#if [ "$1" = "0" ]; then
-#  rm -f %{_javadocdir}/%{name}
-#fi
-
 %files poms
 %defattr(0644,root,root,0755)
-%{_datadir}/maven2/poms
-%{_mavendepmapfragdir}
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
 %dir %{_javadir}/%{name}
 %dir %{_javadir}/%{name}/applications
 
@@ -1079,6 +1077,16 @@
 
 
 %changelog
+* Tue Sep 25 2012 Ralph Apel <r.apel at r-apel.de> 0:2.1.3-4
+- First JPP-6 release
+- Nodemo option hardwired
+
+* Fri May 29 2009 Ralph Apel <r.apel at r-apel.de> 0:2.1.3-3.jpp5
+- Drop false -webapp-logging runtime requirement
+- Disown poms and depmap frag dirs
+- Replace fop BR with xmlgraphics-fop
+- Replace ibatis BR with apache-ibatis-sqlmap
+
 * Fri Aug 15 2008 Ralph Apel <r.apel at r-apel.de> 0:2.1.3-2.jpp5
 - Now drop static _nodemo macros