[springframework] Revert "Enable new modules"
Andy Grimm
arg at fedoraproject.org
Thu Jul 19 17:00:52 UTC 2012
commit 4c93bdcd41c4710a4d2e69bbcb177efac55f7141
Author: Andy Grimm <agrimm at gmail.com>
Date: Thu Jul 19 13:00:33 2012 -0400
Revert "Enable new modules"
This reverts commit 84a470812c37215e81b650d94dabf06545e4b430.
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, 2 insertions(+), 658 deletions(-)
---
diff --git a/springframework.spec b/springframework.spec
index bd74aef..4072719 100644
--- a/springframework.spec
+++ b/springframework.spec
@@ -1,7 +1,7 @@
Name: springframework
Summary: Spring Java Application Framework
Version: 3.1.1
-Release: 7%{?dist}
+Release: 6%{?dist}
Epoch: 0
License: ASL 2.0
Group: Development/Libraries
@@ -10,9 +10,7 @@ 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: spring-framework-%{version}-pom.xml
-# force use tomcat 7.x apis
-Source2: spring-framework-%{version}-depmap
+Source1: pom.xml
# Use the group id of Jetty 8, it has to be org.eclipse.jetty instead of
# org.mortbay.jetty:
@@ -69,26 +67,6 @@ 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
@@ -135,42 +113,6 @@ 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
@@ -258,26 +200,6 @@ 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)
@@ -317,91 +239,6 @@ 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
@@ -415,93 +252,6 @@ 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
@@ -521,15 +271,6 @@ applications with Spring.
%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
@@ -541,15 +282,6 @@ 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
@@ -561,7 +293,6 @@ 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
@@ -595,14 +326,6 @@ 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:
@@ -643,12 +366,6 @@ 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
@@ -667,60 +384,13 @@ 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 at 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 at redhat.com> 0:3.1.1-6
- Don't own the maven fragments directory (rhbz#819804)
- Add requirement on jpackage-utils
More information about the scm-commits
mailing list