[Jpackage-commits] rpms/free/spring2 org-springframework-component-info.xml, NONE, 1.1 spring-2.5.6-doc-pdf.patch, NONE, 1.1 spring2-2.5.6-build-no-link.patch, NONE, 1.1 spring2-2.5.6-xmlgraphics-fop.patch, NONE, 1.1 spring2-component-info.xml, NONE, 1.1 spring2.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Fri Jul 3 00:04:08 CEST 2009


Update of /home/projects/jpackage/cvs/rpms/free/spring2
In directory ryu.zarb.org:/tmp/EtbHRU7rjP/rpms/free/spring2

Modified Files:
	spring2.spec 
Added Files:
	org-springframework-component-info.xml 
	spring-2.5.6-doc-pdf.patch spring2-2.5.6-build-no-link.patch 
	spring2-2.5.6-xmlgraphics-fop.patch spring2-component-info.xml 
Log Message:
2.5.6-3.SEC01.jpp6

--- NEW FILE: spring2-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="spring"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="spring-aop.jar"/>
    <artifact id="spring-beans.jar"/>
    <artifact id="spring-core.jar"/>
    <artifact id="spring-context.jar"/>
    <artifact id="spring-web.jar"/>
    <artifact id="spring-webmvc.jar"/>


    <export>
      <include input="spring-aop.jar"/>
      <include input="spring-context.jar"/>
      <include input="spring-webmvc.jar"/>
      <include input="spring-core.jar"/>
      <include input="spring-web.jar"/>
      <include input="spring-beans.jar"/>

    </export>
  </component>
</project>

--- NEW FILE: spring2-2.5.6-build-no-link.patch ---
--- build.xml.orig	2009-06-01 16:55:29.000000000 -0400
+++ build.xml	2009-06-01 16:59:11.000000000 -0400
@@ -1276,40 +1276,40 @@
 			<packageset dir="${tiger.mock.dir}">
 				<include name="org/springframework/**"/>
 			</packageset>
-			<link href="http://java.sun.com/javase/6/docs/api"/>
-			<link href="http://java.sun.com/j2ee/1.4/docs/api"/>
-			<link href="http://aopalliance.sourceforge.net/doc"/>
+			
+			
+			
 			<!-- Caucho Burlap/Hessian -->
-			<link href="http://cglib.sourceforge.net/apidocs"/>
+			
 			<!-- EasyMock -->
-			<link href="http://ehcache.sourceforge.net/apidocs"/>
-			<link href="http://freemarker.sourceforge.net/docs/api/"/>
-			<link href="http://www.hibernate.org/hib_docs/v3/api"/>
+			
+			
+			
 			<!-- iBATIS -->
 			<!-- iText -->
 			<!-- Commons Attributes -->
-			<link href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/"/>
-			<link href="http://jakarta.apache.org/commons/dbcp/apidocs/"/>
-			<link href="http://jakarta.apache.org/commons/fileupload/apidocs/"/>
-			<link href="http://jakarta.apache.org/commons/httpclient/apidocs/"/>
-			<link href="http://jakarta.apache.org/commons/logging/apidocs/"/>
-			<link href="http://jakarta.apache.org/commons/pool/apidocs/"/>
+			
+			
+			
+			
+			
+			
 			<!-- JasperReports -->
 			<!-- JDO -->
 			<!-- JMX -->
 			<!-- JOTM -->
 			<!-- JPA -->
 			<!-- JSF -->
-			<link href="http://junit.sourceforge.net/javadoc_40/"/>
-			<link href="http://logging.apache.org/log4j/docs/api/"/>
-			<link href="http://jakarta.apache.org/regexp/apidocs/"/>
-			<link href="http://jakarta.apache.org/poi/apidocs/"/>
-			<link href="http://portals.apache.org/pluto/multiproject/portlet-api/apidocs/"/>
-			<link href="http://www.opensymphony.com/quartz/api/"/>
-			<link href="http://struts.apache.org/struts-doc-1.2.9/api/"/>
-      <link href="http://java.sun.com/javase/6/docs/jre/api/net/httpserver/spec/"/>
-      <link href="http://tiles.apache.org/framework/apidocs/"/>
-			<link href="http://velocity.apache.org/engine/devel/apidocs/"/>
+			
+			
+			
+			
+			
+			
+			
+      
+      
+			
 		</javadoc>
 
 	</target>
@@ -2439,8 +2439,8 @@
 			<packageset dir="${sandbox.src.dir}">
 				<include name="org/springframework/**"/>
 			</packageset>
-			<link href="http://java.sun.com/j2ee/1.4/docs/api"/>
-			<link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+			
+			
 		</javadoc>
 
 	</target>

--- NEW FILE: spring-2.5.6-doc-pdf.patch ---
--- build.xml.pdf	2009-03-20 16:50:22.254154899 -0400
+++ build.xml	2009-03-20 16:51:26.178031166 -0400
@@ -1793,8 +1793,9 @@
 					<include name="**/*.jar"/>
 				</fileset>
 			</classpath>
-			<jvmarg value="-Xmx256M"/>
+			<jvmarg value="-Xmx512M"/>
 			<jvmarg value="-XX:MaxPermSize=128m"/>
+			<jvmarg value="-XX:-UseGCOverheadLimit"/>
 			<arg value="-o"/>
 			<arg value="${basedir}/${dist.ref.dir}/pdf/docbook_fop.tmp"/>
 			<arg value="${basedir}/${doc.ref.dir}/src/index.xml"/>

Index: spring2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/spring2/spring2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** spring2.spec	22 Mar 2009 11:46:14 -0000	1.5
--- spring2.spec	2 Jul 2009 22:04:06 -0000	1.6
***************
*** 29,57 ****
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! # If you want to build with hibernate2 support
! # give rpmbuild option '--with hibernate2'
  
! %define with_hibernate2 %{?_with_hibernate2:1}%{!?_with_hibernate2:0}
! %define without_hibernate2 %{!?_with_hibernate2:1}%{?_with_hibernate2:0}
  
[...1717 lines suppressed...]
! - comment out Requires: jaxrpc_1_1_api
! 
! * Wed Apr 01 2009 David Walluck <dwalluck at redhat.com> 0:2.5.6-1.3
! - add all produced zips
! 
! * Tue Mar 31 2009 David Walluck <dwalluck at redhat.com> 0:2.5.6-1.2
! - use upstream name for zip
! 
! * Fri Mar 27 2009 David Walluck <dwalluck at redhat.com> 0:2.5.6-1.1
! - add zip package
! 
! * Mon Mar 16 2009 Ralph Apel <r.apel at r-apel.de> 0:2.5.6-1
  - 2.5.6
  - Adapt to struts-1.3.8
***************
*** 1431,1433 ****
  * Fri Oct 08 2004 Ralph Apel <r.apel at r-apel.de> 0:1.1-1jpp
  - First release
- 
--- 1794,1795 ----

--- NEW FILE: spring2-2.5.6-xmlgraphics-fop.patch ---
--- build.xml.orig	2009-04-24 18:01:31.000000000 -0400
+++ build.xml	2009-04-24 18:03:50.000000000 -0400
@@ -1803,12 +1803,13 @@
 			<arg value="double.sided=${double.sided}"/>
 		</java>
 
-		<java classname="org.apache.fop.apps.Fop" fork="true" maxmemory="256m" dir="${doc.ref.dir}">
+		<java classname="org.apache.fop.cli.Main" fork="true" maxmemory="256m" dir="${doc.ref.dir}">
 			<classpath>
 				<fileset dir="${basedir}/${doc.ref.dir}/lib">
 					<include name="**/*.jar"/>
 				</fileset>
 			</classpath>
+                        <jvmarg value="-Djava.awt.headless=true"/>
 			<arg value="${basedir}/${dist.ref.dir}/pdf/docbook_fop.tmp"/>
 			<arg value="${basedir}/${dist.ref.dir}/pdf/spring-reference.pdf"/>
 		</java>
@@ -2015,12 +2016,13 @@
 			<arg value="double.sided=${double.sided}"/>
 		</java>
 
-		<java classname="org.apache.fop.apps.Fop" fork="true" maxmemory="256m" dir="${doc.mvcstep.dir}">
+		<java classname="org.apache.fop.cli.Main" fork="true" maxmemory="256m" dir="${doc.mvcstep.dir}">
 			<classpath>
 				<fileset dir="${basedir}/${doc.ref.dir}/lib">
 					<include name="**/*.jar"/>
 				</fileset>
 			</classpath>
+                        <jvmarg value="-Djava.awt.headless=true"/>
 			<arg value="${basedir}/${dist.mvcstep.dir}/pdf/docbook_fop.tmp"/>
 			<arg value="${basedir}/${dist.mvcstep.dir}/pdf/spring-mvc-step-by-step.pdf"/>
 		</java>

--- NEW FILE: org-springframework-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="org/springframework"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="spring-context-support.jar"/>


    <export>
      <include input="spring-context-support.jar"/>

    </export>
  </component>
</project>




More information about the JPackage-commits mailing list