Attachment 595001 Details for Bug 836218 – Enable new modules

[patch] Enable new modules

0001-Enable-new-modules.patch (text/plain), 28.63 KB, created by gil cattaneo on 2012-06-28 12:04:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-06-28 12:04:46 UTC

Size: 28.63 KB

patch

obsolete

>From 9e1099058aa74a1e9129575aa35af4e2cc75a891 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Thu, 28 Jun 2012 11:55:43 +0200
>Subject: [PATCH] Enable new modules
>
>---
> spring-framework-3.1.1-depmap                     |   26 ++
> spring-framework-3.1.1-pom.xml                    |   38 +++
> springframework-3.1.1-context_support-pom.patch   |   43 +++
> springframework-3.1.1-jms-connector-api.patch     |   15 +
> springframework-3.1.1-orm-jpa_api.patch           |   24 ++
> springframework-3.1.1-orm-pom.patch               |  111 +++++++
> springframework-3.1.1-oxm-remove-castor-xml.patch |   17 +
> springframework-3.1.1-struts-pom.patch            |   25 ++
> springframework-3.1.1-velocity.patch              |   12 +
> springframework-3.1.1-web_servlet-pom.patch       |   15 +
> springframework.spec                              |  334 ++++++++++++++++++++-
> 11 files changed, 658 insertions(+), 2 deletions(-)
> create mode 100644 spring-framework-3.1.1-depmap
> create mode 100644 spring-framework-3.1.1-pom.xml
> create mode 100644 springframework-3.1.1-context_support-pom.patch
> create mode 100644 springframework-3.1.1-jms-connector-api.patch
> create mode 100644 springframework-3.1.1-orm-jpa_api.patch
> create mode 100644 springframework-3.1.1-orm-pom.patch
> create mode 100644 springframework-3.1.1-oxm-remove-castor-xml.patch
> create mode 100644 springframework-3.1.1-struts-pom.patch
> create mode 100644 springframework-3.1.1-velocity.patch
> create mode 100644 springframework-3.1.1-web_servlet-pom.patch
>
>diff --git a/spring-framework-3.1.1-depmap b/spring-framework-3.1.1-depmap
>new file mode 100644
>index 0000000..da33c09
>--- /dev/null
>+++ b/spring-framework-3.1.1-depmap
>@@ -0,0 +1,26 @@
>+<dependencies>
>+<dependency>
>+    <maven>
>+        <groupId>javax.servlet</groupId>
>+        <artifactId>servlet-api</artifactId>
>+        <version>2.5</version>
>+    </maven>
>+    <jpp>
>+        <groupId>JPP</groupId>
>+        <artifactId>tomcat-servlet-3.0-api</artifactId>
>+        <version>7.0.27</version>
>+    </jpp>
>+</dependency>
>+<dependency>
>+    <maven>
>+        <groupId>org.apache.tomcat</groupId>
>+        <artifactId>tomcat-servlet-api</artifactId>
>+        <version>7.0.8</version>
>+    </maven>
>+    <jpp>
>+        <groupId>JPP</groupId>
>+        <artifactId>tomcat-servlet-3.0-api</artifactId>
>+        <version>7.0.27</version>
>+    </jpp>
>+</dependency>
>+</dependencies>
>\ No newline at end of file
>diff --git a/spring-framework-3.1.1-pom.xml b/spring-framework-3.1.1-pom.xml
>new file mode 100644
>index 0000000..913034a
>--- /dev/null
>+++ b/spring-framework-3.1.1-pom.xml
>@@ -0,0 +1,38 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+
>+
>+<project
>+  xmlns="http://maven.apache.org/POM/4.0.0"
>+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
>+
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>org.springframework</groupId>
>+  <artifactId>spring-project</artifactId>
>+  <packaging>pom</packaging>
>+  <version>3.1.1.RELEASE</version>
>+
>+  <modules>
>+    
>+    <module>org.springframework.aop</module>
>+    <module>org.springframework.beans</module>
>+    <module>org.springframework.context</module>
>+    <module>org.springframework.core</module>
>+    <module>org.springframework.expression</module>
>+    <module>org.springframework.instrument</module>
>+    <module>org.springframework.jdbc</module>
>+    <module>org.springframework.transaction</module>
>+    <module>org.springframework.context.support</module>
>+    <module>org.springframework.oxm</module>
>+    <module>org.springframework.web</module>
>+    <module>org.springframework.jms</module>
>+    <module>org.springframework.orm</module>
>+    <module>org.springframework.web.servlet</module>
>+    <module>org.springframework.web.portlet</module>
>+    <module>org.springframework.web.struts</module>
>+    
>+    
>+  </modules>
>+
>+</project>
>diff --git a/springframework-3.1.1-context_support-pom.patch b/springframework-3.1.1-context_support-pom.patch
>new file mode 100644
>index 0000000..a7de1d6
>--- /dev/null
>+++ b/springframework-3.1.1-context_support-pom.patch
>@@ -0,0 +1,43 @@
>+--- org.springframework.context.support/pom.xml	2012-02-17 00:33:27.000000000 +0100
>++++ org.springframework.context.support/pom.xml-gil	2012-05-26 13:46:06.445609117 +0200
>+@@ -22,13 +22,13 @@
>+   </licenses>
>+   <dependencies>
>+     <dependency>
>+-      <groupId>com.bea.commonj</groupId>
>+-      <artifactId>com.springsource.commonj</artifactId>
>++      <groupId>org.apache.geronimo.specs</groupId>
>++      <artifactId>geronimo-commonj_1.1_spec</artifactId>
>+       <version>1.1.0</version>
>+       <optional>true</optional>
>+     </dependency>
>+     <dependency>
>+-      <groupId>opensymphony</groupId>
>++      <groupId>org.quartz-scheduler</groupId>
>+       <artifactId>quartz</artifactId>
>+       <version>1.6.2</version>
>+       <optional>true</optional>
>+@@ -39,12 +39,12 @@
>+       <version>1.8.0.10</version>
>+       <scope>test</scope>
>+     </dependency>
>+-    <dependency>
>++    
>+     <dependency>
>+       <groupId>javax.mail</groupId>
>+       <artifactId>mail</artifactId>
>+@@ -52,7 +52,7 @@
>+       <optional>true</optional>
>+     </dependency>
>+     <dependency>
>+-      <groupId>jasperreports</groupId>
>++      <groupId>net.sf.jasperreports</groupId>
>+       <artifactId>jasperreports</artifactId>
>+       <version>2.0.5</version>
>+       <optional>true</optional>
>diff --git a/springframework-3.1.1-jms-connector-api.patch b/springframework-3.1.1-jms-connector-api.patch
>new file mode 100644
>index 0000000..0d2c743
>--- /dev/null
>+++ b/springframework-3.1.1-jms-connector-api.patch
>@@ -0,0 +1,15 @@
>+--- org.springframework.jms/pom.xml	2012-02-17 00:33:27.000000000 +0100
>++++ org.springframework.jms/pom.xml-gil	2012-05-28 20:42:14.303907848 +0200
>+@@ -28,9 +28,9 @@
>+       <scope>provided</scope>
>+     </dependency>
>+     <dependency>
>+-      <groupId>org.apache.geronimo.specs</groupId>
>+-      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
>+-      <version>2.0.0</version>
>++      <groupId>org.jboss.spec.javax.resource</groupId>
>++      <artifactId>jboss-connector-api_1.6_spec</artifactId>
>++      <version>1.0.1-SNAPSHOT</version>
>+       <optional>true</optional>
>+     </dependency>
>+     <dependency>
>diff --git a/springframework-3.1.1-orm-jpa_api.patch b/springframework-3.1.1-orm-jpa_api.patch
>new file mode 100644
>index 0000000..3a54f34
>--- /dev/null
>+++ b/springframework-3.1.1-orm-jpa_api.patch
>@@ -0,0 +1,24 @@
>+--- org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java	2012-02-17 00:33:27.000000000 +0100
>++++ org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java-gil	2012-05-28 21:59:48.230933098 +0200
>+@@ -20,6 +20,8 @@
>+ import java.util.LinkedList;
>+ import java.util.List;
>+ import java.util.Properties;
>++import javax.persistence.SharedCacheMode;
>++import javax.persistence.ValidationMode;
>+ import javax.persistence.spi.ClassTransformer;
>+ import javax.persistence.spi.PersistenceUnitTransactionType;
>+ import javax.sql.DataSource;
>+@@ -220,4 +222,12 @@
>+ 		return builder.toString();
>+ 	}
>+ 
>++	public SharedCacheMode getSharedCacheMode() {
>++		throw new UnsupportedOperationException("getSharedCacheMode");
>++	}
>++
>++	public ValidationMode getValidationMode() {
>++		throw new UnsupportedOperationException("getValidationMode");
>++	}
>++
>+ }
>diff --git a/springframework-3.1.1-orm-pom.patch b/springframework-3.1.1-orm-pom.patch
>new file mode 100644
>index 0000000..0f744c2
>--- /dev/null
>+++ b/springframework-3.1.1-orm-pom.patch
>@@ -0,0 +1,111 @@
>+--- org.springframework.orm/pom.xml	2012-05-28 21:51:34.670930420 +0200
>++++ org.springframework.orm/pom.xml-gil	2012-05-28 21:51:41.811930459 +0200
>+@@ -34,15 +34,57 @@
>+       <optional>true</optional>
>+     </dependency>
>+     
>+-    <dependency>
>++    
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-lib</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>+     </dependency>
>+     <dependency>
>+       <groupId>org.apache.openjpa</groupId>
>+-      <artifactId>openjpa</artifactId>
>++      <artifactId>openjpa-kernel</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-jdbc</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-persistence</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-persistence-jdbc</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-xmlstore</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-slice</artifactId>
>++      <version>1.1.0</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.apache.openjpa</groupId>
>++      <artifactId>openjpa-jest</artifactId>
>+       <version>1.1.0</version>
>+       <optional>true</optional>
>+     </dependency>
>+@@ -59,14 +101,14 @@
>+       <optional>true</optional>
>+     </dependency>
>+     <dependency>
>+-      <groupId>org.eclipse.persistence</groupId>
>+-      <artifactId>org.eclipse.persistence.asm</artifactId>
>++      <groupId>asm</groupId>
>++      <artifactId>asm</artifactId>
>+       <version>1.0.1</version>
>+       <scope>test</scope>
>+     </dependency>
>+     <dependency>
>+-      <groupId>org.eclipse.persistence</groupId>
>+-      <artifactId>org.eclipse.persistence.antlr</artifactId>
>++      <groupId>antlr</groupId>
>++      <artifactId>antlr</artifactId>
>+       <version>1.0.1</version>
>+       <scope>test</scope>
>+     </dependency>
>+@@ -76,12 +118,12 @@
>+       <version>3.6.0.Final</version>
>+       <optional>true</optional>
>+     </dependency>
>+-    <dependency>
>++    
>+     <dependency>
>+       <groupId>net.sf.cglib</groupId>
>+       <artifactId>cglib</artifactId>
>+@@ -100,12 +142,12 @@
>+       <scope>test</scope>
>+       <optional>true</optional>
>+     </dependency>
>+-    <dependency>
>++    
>+     <dependency>
>+       <groupId>org.hibernate</groupId>
>+       <artifactId>hibernate-entitymanager</artifactId>
>diff --git a/springframework-3.1.1-oxm-remove-castor-xml.patch b/springframework-3.1.1-oxm-remove-castor-xml.patch
>new file mode 100644
>index 0000000..cf70e33
>--- /dev/null
>+++ b/springframework-3.1.1-oxm-remove-castor-xml.patch
>@@ -0,0 +1,17 @@
>+--- org.springframework.oxm/pom.xml	2012-02-17 00:33:27.000000000 +0100
>++++ org.springframework.oxm/pom.xml-gil	2012-05-28 16:19:08.362620455 +0200
>+@@ -52,12 +52,12 @@
>+       <version>2.4.0</version>
>+       <optional>true</optional>
>+     </dependency>
>+-    <dependency>
>++    
>+     <dependency>
>+       <groupId>org.springframework</groupId>
>+       <artifactId>spring-beans</artifactId>
>diff --git a/springframework-3.1.1-struts-pom.patch b/springframework-3.1.1-struts-pom.patch
>new file mode 100644
>index 0000000..f222434
>--- /dev/null
>+++ b/springframework-3.1.1-struts-pom.patch
>@@ -0,0 +1,25 @@
>+--- org.springframework.web.struts/pom.xml	2012-02-17 00:33:27.000000000 +0100
>++++ org.springframework.web.struts/pom.xml-gil	2012-05-29 16:33:35.035832593 +0200
>+@@ -40,8 +40,20 @@
>+       <scope>test</scope>
>+     </dependency>
>+   <dependency>
>+-    <groupId>struts</groupId>
>+-    <artifactId>struts</artifactId>
>++    <groupId>org.apache.struts</groupId>
>++    <artifactId>struts-core</artifactId>
>++    <version>1.2.9</version>
>++    <scope>compile</scope>
>++  </dependency>
>++  <dependency>
>++    <groupId>org.apache.struts</groupId>
>++    <artifactId>struts-extras</artifactId>
>++    <version>1.2.9</version>
>++    <scope>compile</scope>
>++  </dependency>
>++  <dependency>
>++    <groupId>org.apache.struts</groupId>
>++    <artifactId>struts-tiles</artifactId>
>+     <version>1.2.9</version>
>+     <scope>compile</scope>
>+   </dependency>
>diff --git a/springframework-3.1.1-velocity.patch b/springframework-3.1.1-velocity.patch
>new file mode 100644
>index 0000000..927e59f
>--- /dev/null
>+++ b/springframework-3.1.1-velocity.patch
>@@ -0,0 +1,12 @@
>+--- org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java	2012-02-17 00:33:27.000000000 +0100
>++++ org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java-gil	2012-05-26 14:15:18.849596556 +0200
>+@@ -250,9 +250,6 @@
>+ 			// Perform actual initialization.
>+ 			velocityEngine.init();
>+ 		}
>+-		catch (IOException ex) {
>+-			throw ex;
>+-		}
>+ 		catch (VelocityException ex) {
>+ 			throw ex;
>+ 		}
>diff --git a/springframework-3.1.1-web_servlet-pom.patch b/springframework-3.1.1-web_servlet-pom.patch
>new file mode 100644
>index 0000000..3acf034
>--- /dev/null
>+++ b/springframework-3.1.1-web_servlet-pom.patch
>@@ -0,0 +1,15 @@
>+--- org.springframework.web.servlet/pom.xml	2012-05-28 22:22:09.863940376 +0200
>++++ org.springframework.web.servlet/pom.xml-gil	2012-05-28 22:26:27.471941775 +0200
>+@@ -128,6 +128,12 @@
>+       <optional>true</optional>
>+     </dependency>
>+     <dependency>
>++      <groupId>org.apache.tiles</groupId>
>++      <artifactId>tiles-el</artifactId>
>++      <version>2.1.2</version>
>++      <optional>true</optional>
>++    </dependency>
>++    <dependency>
>+       <groupId>velocity</groupId>
>+       <artifactId>velocity</artifactId>
>+       <version>1.5</version>
>diff --git a/springframework.spec b/springframework.spec
>index 4072719..bd74aef 100644
>--- a/springframework.spec
>+++ b/springframework.spec
>@@ -1,7 +1,7 @@
> Name: springframework
> Summary: Spring Java Application Framework
> Version: 3.1.1
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> Epoch: 0
> License: ASL 2.0
> Group: Development/Libraries
>@@ -10,7 +10,9 @@ BuildArch: noarch
> 
> # curl https://nodeload.github.com/SpringSource/spring-framework/tarball/v3.1.1.RELEASE > spring-framework-3.1.1.tar.gz
> Source0: %{name}-%{version}.tar.gz
>-Source1: pom.xml
>+Source1: spring-framework-%{version}-pom.xml
>+# force use tomcat 7.x apis
>+Source2: spring-framework-%{version}-depmap
> 
> # Use the group id of Jetty 8, it has to be org.eclipse.jetty instead of
> # org.mortbay.jetty:
>@@ -67,6 +69,26 @@ Patch14: %{name}-fix-derby-aid.patch
> # Fix the tomcat catalina artifact id to use the one in Tomcat 7 as Tomcat 6
> # has no POMs:
> Patch15: %{name}-fix-tomcat-catalina-aid.patch
>+# change
>+# com.bea.commonj com.springsource.commonj org.apache.geronimo.specs geronimo-commonj_1.1_spec
>+# opensymphony with org.quartz-scheduler
>+# remove javax.activation
>+# fix jasperreports gId
>+Patch17: springframework-3.1.1-context_support-pom.patch
>+# fix build with velocity 1.7
>+Patch18: springframework-3.1.1-velocity.patch
>+# unavailable deps castor-xml
>+Patch19: springframework-3.1.1-oxm-remove-castor-xml.patch
>+# use jboss-connector-api_1.6_spec instead of geronimo-j2ee-connector_1.5_spec
>+Patch20: springframework-3.1.1-jms-connector-api.patch
>+# fix openjpa deps
>+Patch21: springframework-3.1.1-orm-pom.patch
>+# jpa-2.0-api support
>+Patch22: springframework-3.1.1-orm-jpa_api.patch
>+# add tiles-el
>+Patch23: springframework-3.1.1-web_servlet-pom.patch
>+# fix struts deps
>+Patch24: springframework-3.1.1-struts-pom.patch
> 
> # Build requirements (alphabetical):
> BuildRequires: aopalliance
>@@ -113,6 +135,42 @@ BuildRequires: objectweb-asm
> BuildRequires: tomcat-el-2.2-api
> BuildRequires: tomcat-lib >= 7.0.27-2
> 
>+BuildRequires: apache-poi
>+BuildRequires: apache-commons-fileupload >= 1.2.2-5
>+BuildRequires: apache-commons-lang
>+BuildRequires: apache-commons-pool
>+BuildRequires: axis
>+BuildRequires: eclipselink
>+BuildRequires: freemarker >= 2.3.19
>+BuildRequires: geronimo-commonj
>+BuildRequires: geronimo-jaxrpc
>+BuildRequires: geronimo-jms
>+BuildRequires: geronimo-saaj
>+BuildRequires: glassfish-jaxb
>+BuildRequires: glassfish-toplink-essentials
>+BuildRequires: hessian
>+BuildRequires: httpcomponents-client
>+BuildRequires: itext
>+BuildRequires: jackson
>+BuildRequires: jakarta-commons-httpclient
>+BuildRequires: jakarta-taglibs-standard
>+BuildRequires: jasperreports
>+BuildRequires: jboss-jsf-2.1-api
>+BuildRequires: jboss-jsp-2.2-api
>+BuildRequires: jdo2-api
>+BuildRequires: jexcelapi
>+BuildRequires: jibx >= 1.2.4-3
>+BuildRequires: openjpa
>+BuildRequires: portlet-2.0-api
>+BuildRequires: rome >= 0.9-11
>+BuildRequires: struts
>+BuildRequires: tiles
>+BuildRequires: tomcat-servlet-3.0-api
>+BuildRequires: velocity
>+BuildRequires: velocity-tools
>+BuildRequires: xmlbeans
>+BuildRequires: xstream
>+
> # Runtime requirements (only for the main package, other requirements go in the
> # subpackages):
> Requires: apache-commons-collections
>@@ -200,6 +258,26 @@ The Spring Application Context is a complete superset of a bean factory, and
> adds enhanced capabilities to it, some of them more J2EE and
> enterprise-centric.
> 
>+%package context-support
>+Summary:  Spring Context Support
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-jdbc = %{version}-%{release}
>+Requires: %{name}-tx = %{version}-%{release}
>+Requires: apache-commons-collections
>+Requires: freemarker >= 2.3.19
>+Requires: geronimo-commonj
>+Requires: jasperreports
>+Requires: javamail
>+Requires: velocity
>+
>+%description context-support
>+Spring J2EE Framework.
>+
>+This package provide Quartz/CommonJ scheduling,
>+UI templating, mail and caching.
> 
> %package expression
> Summary: Spring Expression Language (SpEL)
>@@ -239,6 +317,91 @@ Requires: derby
> Spring JDBC takes care of all the low-level details associated to the
> development with JDBC.
> 
>+%package jms
>+Summary:  Spring jms
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-aop = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-oxm = %{version}-%{release}
>+Requires: %{name}-tx = %{version}-%{release}
>+Requires: aopalliance
>+Requires: apache-commons-pool
>+Requires: geronimo-jms
>+Requires: geronimo-jta
>+Requires: jackson
>+Requires: jboss-connector-1.6-api
>+
>+%description jms
>+Spring J2EE Framework.
>+This package provide Java Message Service 1.0.2/1.1 support.
>+
>+%package orm
>+Summary:  Spring ORM
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-aop = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-jdbc = %{version}-%{release}
>+Requires: %{name}-tx = %{version}-%{release}
>+Requires: %{name}-web = %{version}-%{release}
>+Requires: aopalliance
>+Requires: eclipselink
>+Requires: geronimo-jta
>+Requires: glassfish-toplink-essentials
>+Requires: hibernate3
>+Requires: hibernate-jpa-2.0-api
>+Requires: jdo2-api
>+Requires: openjpa
>+Requires: tomcat-servlet-3.0-api
>+
>+%description orm
>+Spring J2EE Framework.
>+
>+This package provide JDO support, JPA support, Hibernate
>+support, TopLink support, iBATIS support.
>+
>+%package oxm
>+Summary:  Spring OXM
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: aopalliance
>+Requires: apache-commons-lang
>+Requires: glassfish-jaxb
>+Requires: jibx >= 1.2.4-3
>+Requires: xmlbeans
>+Requires: xstream
>+
>+%description oxm
>+Spring J2EE Framework.
>+
>+This package provide marshaling and unmarshalling
>+for XML with JAXB context and JiBX binding factories.
>+
>+%package struts
>+Summary:  Spring Web Struts
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-core = %{version}-%{release}
>+Requires: %{name}-web = %{version}-%{release}
>+Requires: %{name}-webmvc = %{version}-%{release}
>+Requires: apache-commons-beanutils
>+Requires: jakarta-taglibs-standard
>+Requires: jboss-jsp-2.2-api
>+Requires: tomcat-servlet-3.0-api
>+Requires: struts
>+
>+%description struts
>+Spring J2EE Framework.
>+
>+This package provide integrate a Struts
>+application with Spring
> 
> %package tx
> Summary: Spring Transaction Management
>@@ -252,6 +415,93 @@ supports declarative transaction management, provides a simpler API for
> programmatic transaction management and integrates with Spring's various data
> access abstractions.
> 
>+%package web
>+Summary:  Spring Web
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-aop = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-oxm = %{version}-%{release}
>+Requires: aopalliance
>+Requires: apache-commons-fileupload >= 1.2.2-5
>+Requires: axis
>+Requires: hessian
>+Requires: httpcomponents-client
>+Requires: jakarta-commons-httpclient
>+Requires: jackson
>+Requires: log4j
>+Requires: portlet-2.0-api
>+Requires: rome >= 0.9-11
>+Requires: tomcat-servlet-3.0-api
>+Requires: jboss-el-2.2-api
>+Requires: jboss-jsf-2.1-api
>+Requires: jboss-jsp-2.2-api
>+Requires: geronimo-jaxrpc
>+Requires: geronimo-saaj
>+
>+%description web
>+Spring J2EE Framework.
>+
>+This package provide web application context, multipart
>+resolver, HTTP-based remoting support.
>+
>+%package webmvc
>+Summary:  Spring Web Servlet
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-context-support = %{version}-%{release}
>+Requires: %{name}-expression = %{version}-%{release}
>+Requires: %{name}-orm = %{version}-%{release}
>+Requires: %{name}-oxm = %{version}-%{release}
>+Requires: %{name}-web = %{version}-%{release}
>+Requires: apache-poi
>+Requires: freemarker
>+Requires: geronimo-jta
>+Requires: geronimo-validation
>+Requires: itext
>+Requires: jackson
>+Requires: jakarta-taglibs-standard
>+Requires: jasperreports
>+Requires: jboss-el-2.2-api
>+Requires: jboss-jsp-2.2-api
>+Requires: jexcelapi
>+Requires: objectweb-asm
>+Requires: rome >= 0.9-11
>+Requires: tiles
>+Requires: tomcat-servlet-3.0-api
>+Requires: velocity
>+Requires: velocity-tools
>+
>+%description webmvc
>+Spring J2EE Framework.
>+
>+This package provide framework servlets, web MVC framework,
>+web controllers, web views for JSP, Velocity, Tiles,
>+iText and POI.
>+
>+%package webmvc-portlet
>+Summary:  Spring Web Portlet
>+Group:    Development/Libraries
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-beans = %{version}-%{release}
>+Requires: %{name}-context = %{version}-%{release}
>+Requires: %{name}-web = %{version}-%{release}
>+Requires: %{name}-webmvc = %{version}-%{release}
>+Requires: apache-commons-fileupload >= 1.2.2-5
>+Requires: jboss-el-2.2-api
>+Requires: jboss-jsp-2.2-api
>+Requires: objectweb-asm
>+Requires: portlet-2.0-api
>+Requires: tomcat-servlet-3.0-api
>+
>+%description webmvc-portlet
>+Spring J2EE Framework.
>+
>+This package provide support development of Portlet
>+applications with Spring.
> 
> %prep
> %setup -q -n SpringSource-spring-framework-79c9ca1
>@@ -271,6 +521,15 @@ access abstractions.
> %patch14 -p1
> %patch15 -p1
> 
>+%patch17 -p0
>+%patch18 -p0
>+%patch19 -p0
>+%patch20 -p0
>+%patch21 -p0
>+%patch22 -p0
>+%patch23 -p0
>+%patch24 -p0
>+
> # ERROR: XThis is not public in Bsh
> rm org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
> rm org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
>@@ -282,6 +541,15 @@ rm org.springframework.context/src/main/java/org/springframework/scripting/jruby
> # Remove all the EHCache sources:
> rm -rf org.springframework.context/src/main/java/org/springframework/cache/ehcache
> rm -rf org.springframework.context/src/test/resources/org/springframework/cache/ehcache
>+# require quartz 1.6.2
>+rm -rf org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz
>+# require castor-xml
>+rm -rf org.springframework.oxm/src/main/java/org/springframework/oxm/castor/*
>+# fix hessian aId
>+sed -i "s|<artifactId>com.springsource.com.caucho|<artifactId>hessian|" org.springframework.web/pom.xml
>+# not available build desp
>+rm -rf org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/*
>+rm -rf org.springframework.orm/src/main/java/org/springframework/orm/ibatis/*
> 
> # Put the dummy root POM in place:
> cp %{SOURCE1} pom.xml
>@@ -293,6 +561,7 @@ cp %{SOURCE1} pom.xml
> # available in the distribution at the moment:
> mvn-rpmbuild \
>   -Dproject.build.sourceEncoding=ISO-8859-1 \
>+  -Dmaven.local.depmap.file="%{SOURCE2}" \
>   -Dmaven.test.skip=true \
>   install \
>   javadoc:aggregate
>@@ -326,6 +595,14 @@ org.springframework.expression spring-expression
> org.springframework.instrument spring-instrument
> org.springframework.jdbc spring-jdbc
> org.springframework.transaction spring-tx
>+org.springframework.context.support spring-context-support
>+org.springframework.oxm spring-oxm
>+org.springframework.web spring-web
>+org.springframework.jms spring-jms
>+org.springframework.orm spring-orm
>+org.springframework.web.servlet spring-webmvc
>+org.springframework.web.portlet spring-webmvc-portlet
>+org.springframework.web.struts spring-struts
> .
> 
> # Install javadoc files:
>@@ -366,6 +643,12 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
> %{_mavenpomdir}/JPP.%{name}-spring-context.pom
> 
> 
>+%files context-support
>+%{_javadir}/%{name}/spring-context-support.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-context-support.pom
>+%{_mavendepmapfragdir}/%{name}-context-support
>+
>+
> %files expression
> %{_mavendepmapfragdir}/%{name}-expression
> %{_javadir}/%{name}/spring-expression.jar
>@@ -384,13 +667,60 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
> %{_mavenpomdir}/JPP.%{name}-spring-jdbc.pom
> 
> 
>+%files jms
>+%{_javadir}/%{name}/spring-jms.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-jms.pom
>+%{_mavendepmapfragdir}/%{name}-jms
>+
>+
>+%files orm
>+%{_javadir}/%{name}/spring-orm.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-orm.pom
>+%{_mavendepmapfragdir}/%{name}-orm
>+
>+%files oxm
>+%{_javadir}/%{name}/spring-oxm.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-oxm.pom
>+%{_mavendepmapfragdir}/%{name}-oxm
>+
>+
>+%files struts
>+%{_javadir}/%{name}/spring-struts.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-struts.pom
>+%{_mavendepmapfragdir}/%{name}-struts
>+
>+
> %files tx
> %{_mavendepmapfragdir}/%{name}-tx
> %{_javadir}/%{name}/spring-tx.jar
> %{_mavenpomdir}/JPP.%{name}-spring-tx.pom
> 
> 
>+%files web
>+%{_javadir}/%{name}/spring-web.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-web.pom
>+%{_mavendepmapfragdir}/%{name}-web
>+
>+
>+%files webmvc
>+%{_javadir}/%{name}/spring-webmvc.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-webmvc.pom
>+%{_mavendepmapfragdir}/%{name}-webmvc
>+
>+
>+%files webmvc-portlet
>+%{_javadir}/%{name}/spring-webmvc-portlet.jar
>+%{_mavenpomdir}/JPP.%{name}-spring-webmvc-portlet.pom
>+%{_mavendepmapfragdir}/%{name}-webmvc-portlet
>+
>+
> %changelog
>+* Thu Jun 28 2012 gil cattaneo <puntogil@libero.it> 0:3.1.1-7
>+- Enable new modules:  
>+- spring-context-support, spring-oxm, spring-web,
>+- spring-jms, spring-orm, spring-webmvc,
>+- spring-webmvc-portlet, spring-struts
>+
> * Wed May 9 2012 Juan Hernandez <juan.hernandez@redhat.com> 0:3.1.1-6
> - Don't own the maven fragments directory (rhbz#819804)
> - Add requirement on jpackage-utils
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 836218: 595001 | 597972 | 597973