[Jpackage-commits] dist/ehcache/devel .cvsignore, 1.1, 1.2 ehcache-1.3.0-beans_xml.patch, NONE, 1.1 ehcache-1.3.0-core-build.patch, NONE, 1.1 ehcache-1.3.0-core-pom-nohibernate-nospring.patch, NONE, 1.1 ehcache-1.3.0-core-pom-nohibernate.patch, NONE, 1.1 ehcache-1.3.0-core-pom-nospring.patch, NONE, 1.1 ehcache-1.3.0-core-pom.patch, NONE, 1.1 ehcache-1.3.0-debugger-pom.patch, NONE, 1.1 ehcache-1.3.0-jpp-depmap.xml, NONE, 1.1 ehcache-1.3.0-pom.patch, NONE, 1.1 ehcache-1.3.0-site_xml.patch, NONE, 1.1 ehcache-settings.xml, NONE, 1.1 ehcache.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:07:36 CEST 2008


Update of /home/projects/jpackage/cvs/dist/ehcache/devel
In directory ryu.zarb.org:/tmp/cvs-serv25372/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ehcache-1.3.0-beans_xml.patch ehcache-1.3.0-core-build.patch 
	ehcache-1.3.0-core-pom-nohibernate-nospring.patch 
	ehcache-1.3.0-core-pom-nohibernate.patch 
	ehcache-1.3.0-core-pom-nospring.patch 
	ehcache-1.3.0-core-pom.patch ehcache-1.3.0-debugger-pom.patch 
	ehcache-1.3.0-jpp-depmap.xml ehcache-1.3.0-pom.patch 
	ehcache-1.3.0-site_xml.patch ehcache-settings.xml ehcache.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ehcache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:06:58 -0000	1.1
--- .cvsignore	28 May 2008 18:07:33 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ ehcache-1.3.0-src.tar.gz
+ ehcache-autogenerated-files.tar.gz

--- NEW FILE: ehcache-1.3.0-beans_xml.patch ---
--- core/src/test/resources/spring/ehcache-beans.xml.sav4	2007-07-10 11:18:45.000000000 +0200
+++ core/src/test/resources/spring/ehcache-beans.xml	2008-03-05 19:54:20.000000000 +0100
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+                  "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
@@ -23,4 +25,4 @@
         </property>
     </bean>
 
-</beans>
\ No newline at end of file
+</beans>

--- NEW FILE: ehcache-1.3.0-site_xml.patch ---
--- core/src/site/site.xml.sav	2008-02-04 13:32:49.000000000 +0100
+++ core/src/site/site.xml	2008-02-04 13:33:20.000000000 +0100
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="Maven">
+    <skin>
+     <groupId>org.apache.maven</groupId>
+     <artifactId>maven-default-skin</artifactId>
+     <version>1.0</version>
+    </skin>
     <bannerLeft>
         <name>ehcache</name>
         <src>images/ehcache_logo.gif</src>

--- NEW FILE: ehcache-1.3.0-core-pom.patch ---
--- core/pom.xml.sav2	2007-07-10 11:18:45.000000000 +0200
+++ core/pom.xml	2008-04-30 12:56:14.000000000 +0200
@@ -23,6 +23,10 @@
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
         <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
@@ -63,10 +67,12 @@
             <groupId>checkstyle</groupId>
             <artifactId>checkstyle-optional</artifactId>
         </dependency>
+<!--
         <dependency>
             <groupId>com.cenqua.clover</groupId>
             <artifactId>clover</artifactId>
         </dependency>
+-->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
@@ -75,18 +81,26 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
         </dependency>
+<!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
+-->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+<!--
+        <dependency>
             <groupId>org.acegisecurity</groupId>
             <artifactId>acegi-security</artifactId>
         </dependency>
+-->
     </dependencies>
 
     <build>
@@ -102,6 +116,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                  <dependency>
+                    <groupId>sun.jdk</groupId>
+                    <artifactId>tools</artifactId>
+                    <version>1.5.0</version>
+                    <scope>system</scope>
+                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                  </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>rmic</id>
@@ -125,9 +148,11 @@
                                 <ant antfile="${basedir}/build.xml" inheritRefs="true">
                                     <target name="generate-checkstyle-config"/>
                                 </ant>
+<!--
                                 <ant antfile="${basedir}/build.xml" inheritRefs="true">
                                     <target name="book"/>
                                 </ant>
+-->
                             </tasks>
                         </configuration>
                         <goals>
@@ -142,9 +167,11 @@
                                 <ant antfile="${basedir}/build.xml" inheritRefs="true">
                                     <target name="generate-checkstyle-config"/>
                                 </ant>
+<!--
                                 <ant antfile="${basedir}/build.xml" inheritRefs="true">
                                     <target name="singlepageguide"/>
                                 </ant>
+-->
                             </tasks>
                         </configuration>
                         <goals>
@@ -165,7 +192,7 @@
                 <configuration>
                     <skip>${test.unit.skip}</skip>
                     <includes>
-                        <include>**/*UnitTest.java</include>
+                        <include>**/*Test.java</include>
                     </includes>
                     <excludes>
                         <exclude>**/*$*</exclude>
@@ -241,6 +268,8 @@
                 <configuration>
                     <configLocation>${basedir}/config/checkstyle.xml</configLocation>
                     <propertiesLocation>${basedir}/config/checkstyle.properties</propertiesLocation>
+                    <suppressionsLocation>${basedir}/config/suppressions.xml</suppressionsLocation>
+                    <headerLocation>${basedir}/config/ClassHeader.txt</headerLocation>
                     <enableRSS>false</enableRSS>
                 </configuration>
             </plugin>
@@ -270,6 +299,7 @@
                 <version>2.0</version>
                 <!--<version>2.3-SNAPSHOT</version> Not allowed to include snapshots in central releases-->
                 <configuration>
+<!--
                     <doclet>ydoc.doclets.YStandard</doclet>
                     <docletPath>
                         ${ydoc.home}/lib/ydoc.jar${path.separator}${ydoc.home}/lib/class2svg.jar${path.separator}${ydoc.home}/resources
@@ -277,9 +307,12 @@
                     <additionalparam>-license ${ydoc.license} -filter ydoc.filters.ExcludeFilter -filterpath
                         ${ydoc.home}/lib/ydoc.jar -umlautogen
                     </additionalparam>
+-->
                     <author>true</author>
                     <bottom>true</bottom>
+<!--
                     <destDir>${project.build.directory}/site/javadoc</destDir>
+-->
                     <header><![CDATA[<a href="/" target="_top">ehcache</a>]]></header>
                     <minmemory>128m</minmemory>
                     <maxmemory>512</maxmemory>
@@ -312,6 +345,7 @@
             </plugin>
 
             <!-- Manual Changelist -->
+<!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>changes-maven-plugin</artifactId>
@@ -328,8 +362,10 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+-->
 
             <!-- ToDos -->
+<!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>taglist-maven-plugin</artifactId>
@@ -338,11 +374,12 @@
                     <tags>todo, TODO, @todo</tags>
                 </configuration>
             </plugin>
+-->
 
             <!-- Java Cross Reference (JXR) -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jxr-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
                 <configuration>
                     <outputDirectory>${project.build.directory}/site</outputDirectory>
                 </configuration>

--- NEW FILE: ehcache-1.3.0-debugger-pom.patch ---
--- debugger/pom.xml.sav	2008-02-05 17:20:40.000000000 +0100
+++ debugger/pom.xml	2008-02-05 17:21:17.000000000 +0100
@@ -29,6 +29,7 @@
     </dependencies>
     <build>
         <plugins>
+<!--
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>shade-maven-plugin</artifactId>
@@ -46,6 +47,7 @@
               </execution>
             </executions>
           </plugin>
+-->
         </plugins>
     </build>
 </project>

--- NEW FILE: ehcache-1.3.0-core-build.patch ---
--- core/build.xml.sav0	2007-07-10 11:18:45.000000000 +0200
+++ core/build.xml	2008-02-05 16:52:07.000000000 +0100
@@ -3,7 +3,9 @@
     <!-- Load Maven antlib and make pom.xml available as maven.project -->
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
         <classpath>
-            <pathelement location="tools/maven-artifact-ant-2.0.4-dep.jar"/>
+            <fileset dir="tools">
+                <include name="**/*.jar"/>
+            </fileset>
         </classpath>
     </typedef>
 
@@ -31,6 +33,7 @@
     <!-- Set up project.class.path -->
     <path id="project.class.path">
         <path refid="dependency.classpath"/>
+        <pathelement location="${java.home}/../lib/tools.jar"/>
         <!--Overcome Maven Antlib bugs -->
         <path location="tools/jmxremote-1_0_1.jar"/>
         <path location="tools/jmxri-1.2.1.jar"/>
@@ -50,14 +53,16 @@
     </target>
 
     <!-- Generate Clover code coverage report -->
+<!--
     <target name="clover"
             depends="clean, with.clover, checkstyle, test, clover.html, clover-check-coverage"
             description="Runs tests and test coverage">
         <echo message="Use ant build to build a distribution"/>
     </target>
+-->
 
     <target name="qa"
-            depends="clean, with.clover, checkstyle, compile, javadoc"
+            depends="clean, checkstyle, compile, javadoc"
             description="QA checks before check-in and full run on continous integration server">
     </target>
 
@@ -411,14 +416,19 @@
 
 
     <!-- Not Broken in TeamCity 1.1 -->
+<!--
     <taskdef resource="com/cenqua/ant/antlib.xml" classpath="tools/cenquatasks.jar"/>
     <extendclasspath path="tools/clover-1.3.13.jar"/>
+-->
 
+<!--
     <taskdef resource="clovertasks" classpath="tools/clover-1.3.13.jar"/>
     <typedef resource="clovertypes">
         <classpath refid="project.class.path"/>
     </typedef>
+-->
 
+<!--
     <target name="with.clover">
         <mkdir dir="${build.log.dir}"/>
         <clover-setup initString="${build.log.dir}/mycoverage.db"
@@ -428,7 +438,9 @@
             <statementContext name="iflog" regexp="^if \(LOG\.is.*"/>
         </clover-setup>
     </target>
+-->
 
+<!--
     <target name="clover.html" depends="with.clover">
 
         <clover-report>
@@ -438,12 +450,15 @@
         </clover-report>
         <clover-log level="summary" filter="log,iflog,catch"/>
     </target>
+-->
 
+<!--
     <target name="clover-check-coverage" depends="with.clover" if="singleRMIRegistryPerVM">
         <echo message="Java: ${ant.java.version}"/>
         <clover-check target="${clover.test.coverage.percentage}" filter="log,iflog,catch"
                       haltOnFailure="true"/>
     </target>
+-->
 
     <!-- JDKs below 1.5 do not support multiple RMI Registries per VM and we must therefore exclude some tests -->
     <condition property="singleRMIRegistryPerVM" value="true">
@@ -490,10 +505,12 @@
             description="Prepare to run  the web tests ">
     </target>
 
+<!--
     <artifact:dependencies filesetId="clover.fileset">
         <dependency groupId="com.cenqua.clover" artifactId="clover"
                     version="1.3.13"/>
     </artifact:dependencies>
+-->
 
     <target name="deploy-default-web-app-orion">
         <unzip dest="${build.dir}" src="${lib.compile.dir}/web/orion.zip"/>
@@ -794,10 +811,12 @@
                 author="true"
                 version="true"
                 use="true"
-                windowtitle="${name}"
+                windowtitle="${name}">
+<!--
                 doclet="ydoc.doclets.YStandard"
                 docletpath="${ydoc.home}/lib/ydoc.jar:${ydoc.home}/lib/class2svg.jar:${ydoc.home}/resources:${build.classes.dir}:${ydoc.home}/licenses/ydoc.license"
                 additionalparam="-umlautogen">
+-->
             <tag name="noinspection" description="IntelliJ Inspection Ignore tag"
                  enabled="false"/>
             <tag name="revised"

--- NEW FILE: ehcache-1.3.0-jpp-depmap.xml ---
<dependencies>
<!--
-->

  <dependency>
    <maven>
      <groupId>org.hibernate</groupId>
      <artifactId>hibernate</artifactId>
      <version>3.2.1.ga</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>hibernate3</artifactId>
      <version>3.2.0</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>net.sf.hibernate</groupId>
      <artifactId>hibernate</artifactId>
      <version>2.1.8</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>hibernate2</artifactId>
      <version>2.1.8</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>aopalliance</groupId>
      <artifactId>aopalliance</artifactId>
      <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>aopalliance</artifactId>
      <version>1.0</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>org.springframework</groupId>
      <artifactId>spring-mock</artifactId>
      <version>2.0.2</version>
    </maven>
    <jpp>
      <groupId>JPP/spring2</groupId>
      <artifactId>test</artifactId>
      <version>2.5.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>org.springframework</groupId>
      <artifactId>spring-aop</artifactId>
      <version>2.0.2</version>
    </maven>
    <jpp>
      <groupId>JPP/spring2</groupId>
      <artifactId>aop</artifactId>
      <version>2.5.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>org.springframework</groupId>
      <artifactId>spring</artifactId>
      <version>2.0.2</version>
    </maven>
    <jpp>
      <groupId>JPP/spring2</groupId>
      <artifactId>core</artifactId>
      <version>2.5.1</version>
    </jpp>
  </dependency>

</dependencies>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ehcache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:06:58 -0000	1.1
--- sources	28 May 2008 18:07:33 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ ed3c54ac106e9f32e6af8f2ffb931b92  ehcache-1.3.0-src.tar.gz
+ 1607d8d1ef2a4a2b5c368814bab9804d  ehcache-autogenerated-files.tar.gz

--- NEW FILE: ehcache-1.3.0-pom.patch ---
--- pom.xml.sav5	2007-07-10 11:18:45.000000000 +0200
+++ pom.xml	2008-04-30 11:27:47.000000000 +0200
@@ -178,6 +178,12 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>2.0.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.acegisecurity</groupId>
                 <artifactId>acegi-security</artifactId>
                 <version>1.0.3</version>
@@ -256,9 +262,9 @@
         </pluginManagement>
     </build>
 
+<!--
     <profiles>
         <profile>
-            <!-- No-test profile:  equivalent to -Dmaven.test.skip=true -->
             <id>nt</id>
             <build>
                 <plugins>
@@ -273,6 +279,7 @@
             </build>
         </profile>
     </profiles>
+-->
 
     <developers>
         <developer>

--- NEW FILE: ehcache-1.3.0-core-pom-nospring.patch ---
--- core/pom.xml.sav	2008-03-06 14:36:04.000000000 +0100
+++ core/pom.xml	2008-03-06 14:36:41.000000000 +0100
@@ -73,6 +73,7 @@
             <artifactId>clover</artifactId>
         </dependency>
 -->
+<!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
@@ -81,16 +82,19 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
         </dependency>
+-->
 <!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
 -->
+<!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
         </dependency>
+-->
 <!--
         <dependency>
             <groupId>org.acegisecurity</groupId>

--- NEW FILE: ehcache.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

# If you don't want to run the lengthy tests
# give rpmbuild option '--without tests'

%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
%define without_tests %{?_without_tests:1}%{!?_without_tests:0}

# If you don't want to build with hibernate cache provider, 
# while hibernate3 isn't available yet,
# give rpmbuild option '--without hibernate'

%define with_hibernate %{!?_without_hibernate:1}%{?_without_hibernate:0}
%define without_hibernate %{?_without_hibernate:1}%{!?_without_hibernate:0}

# If you don't want to build with spring integration,
# while spring2 isn't available yet,
# give rpmbuild option '--without spring'

%define with_spring %{!?_without_spring:1}%{?_without_spring:0}
%define without_spring %{?_without_spring:1}%{!?_without_spring:0}

%define section free
%define namedversion 1.3.0

Summary:        Easy Hibernate Cache
Name:           ehcache
Version:        1.3.0
Release:        2jpp
Epoch:          0
License:        LGPL
URL:            http://ehcache.sourceforge.net/
Group:          Development/Libraries/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Source0:        ehcache-1.3.0-src.tar.gz
# svn export http://svn.sourceforge.net/svnroot/ehcache/branches/ehcache-1.3.0

Source1:        %{name}-settings.xml
Source2:        %{name}-%{version}-jpp-depmap.xml
Source3:        %{name}-autogenerated-files.tar.gz
Patch0:         ehcache-1.3.0-core-build.patch
Patch1:         ehcache-1.3.0-debugger-pom.patch
Patch2:         ehcache-1.3.0-core-pom.patch
Patch3:         ehcache-1.3.0-site_xml.patch
Patch4:         ehcache-1.3.0-beans_xml.patch
Patch5:         ehcache-1.3.0-pom.patch
Patch6:         ehcache-1.3.0-core-pom-nohibernate.patch
Patch7:         ehcache-1.3.0-core-pom-nohibernate-nospring.patch
Patch8:         ehcache-1.3.0-core-pom-nospring.patch

BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  junit
BuildRequires:  ant
BuildRequires:  ant-junit
BuildRequires:  antlr
BuildRequires:  checkstyle
BuildRequires:  checkstyle-optional
BuildRequires:  httpunit
BuildRequires:  nekohtml
BuildRequires:  rhino
BuildRequires:  servlet_2_4_api
%if %{with_maven}
BuildRequires:  maven-artifact-ant
BuildRequires:  maven2-default-skin
BuildRequires:  maven2 >= 2.0.4-10jpp
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-checkstyle
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-project-info-reports
BuildRequires:  maven2-plugin-pmd
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-surefire
BuildRequires:  maven2-plugin-jxr
%endif
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-logging
BuildRequires:  jsr107cache
%if %{with_hibernate}
BuildRequires:  hibernate2
BuildRequires:  hibernate3
%endif
%if %{with_spring}
BuildRequires:  spring2-core
BuildRequires:  spring2-aop
BuildRequires:  spring2-test
%endif
#
Requires:  /usr/sbin/update-alternatives
Requires:  jakarta-commons-beanutils
Requires:  jakarta-commons-collections
Requires:  jakarta-commons-logging
Requires:  jsr107cache
Provides:  hibernate_in_process_cache
Provides:  ehcache-bootstrap = 0:%{version}-%{release}
Obsoletes:  ehcache-bootstrap
Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4
%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif

%if ! %{gcj_support}
BuildArch:      noarch
%endif

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
Ehcache is a pure Java, in-process cache with the following features:
   1. Fast
   2. Simple
   3. Acts as a pluggable cache for Hibernate 2.1, 3 and 3.1.
   4. Small foot print. Both in terms of size and memory requirements.
   5. Minimal dependencies.
   6. Fully documented. See the online Documentation, FAQ and the 
      online JavaDoc.
   7. Provides Memory and Disk stores.
   8. Comprehensively Test Coverage. See the clover test report.
   9. Scalable to hundreds of caches and large multi-cpu servers.
  10. Multiple CacheManagers per virtual machine (new in 1.2)
  11. Provides LRU, LFU and FIFO cache eviction policies. (new in 1.2)
  12. Persistent disk store which stores data between VM restarts.
  13. Supports the registration of CacheManager and CacheEventListener 
      for flexible integration(new in 1.2)
  14. Distributed caching, with fine grained control overf discovery 
      and delivery options.
  15. Pluggable distribution API  for extending distribution with 
      different mechanisms.
  16. Available under the Apache 1.1license. Ehcache's copyright and 
      licensing has been reviewed and approved by the Apache Software 
      Foundation, making ehcache suitable for use in Apache projects.
  17. Production tested. All final versions of ehcache are production 
      tested for several weeks on a large and very busy eCommerce site 
      before release.
  18. BlockingCache, SelfPopulatingCache, gzipping, caching Servlet 
      filters, and AsynchronousFaultTolerantCommandExecutor available 
      in the optional ehcache-constructs package.


%if %{with_hibernate}
%package hibernate
Summary:        Hibernate3 cache provider in %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = 0:%{version}
Requires:       hibernate3

%description hibernate
%{summary}.
%endif

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%if %{with_maven}
%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}.
%endif

%prep
%setup -q 
cp %{SOURCE1} settings.xml
# remove all binary libs
#find . -name "*.jar" -exec rm -f {} \;
for j in $(find . -name "*.jar"); do
       mv $j $j.no
done
%if %{without_maven}
gzip -dc %{SOURCE3} | tar xf -
%endif

%if %{with_maven}
%patch0 -b .sav0
%endif
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4
%patch5 -b .sav5

%if %{without_hibernate}
rm core/src/test/java/net/sf/ehcache/hibernate/HibernateAPIUsageTest.java
rm core/src/main/java/net/sf/ehcache/hibernate/EhCacheProvider.java
rm core/src/main/java/net/sf/ehcache/hibernate/SingletonEhCacheProvider.java
rm core/src/main/java/net/sf/ehcache/hibernate/EhCache.java
%patch6 -b .sav6
%if %{without_spring}
%patch7 -b .sav7
%endif
%endif
%if %{without_spring}
rm core/src/test/java/net/sf/ehcache/spring/SpringIntegrationTest.java
%if %{with_hibernate}
%patch8 -b .sav8
%endif
%endif


%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0

%if %{with_maven}
ln -sf $(build-classpath maven2/artifact) core/tools/maven-artifact.jar
ln -sf $(build-classpath maven2/artifact-ant) core/tools/maven-artifact-ant.jar
ln -sf $(build-classpath maven2/artifact-manager) core/tools/maven-artifact-manager.jar
ln -sf $(build-classpath maven2/error-diagnostics) core/tools/maven-error-diagnostics.jar
ln -sf $(build-classpath maven2/model) core/tools/maven-model.jar
ln -sf $(build-classpath maven2/profile) core/tools/maven-profile.jar
ln -sf $(build-classpath maven2/project) core/tools/maven-project.jar
ln -sf $(build-classpath maven2/settings) core/tools/maven-settings.jar
ln -sf $(build-classpath maven-wagon/provider-api) core/tools/maven-wagon-provider-api.jar
ln -sf $(build-classpath plexus/container-default) core/tools/plexus-container-default.jar
ln -sf $(build-classpath plexus/utils) core/tools/plexus-utils.jar
ln -sf $(build-classpath classworlds) core/tools/classworlds.jar

sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mkdir -p $MAVEN_REPO_LOCAL/org.apache.maven/
ln -sf $(build-classpath maven2/default-skin) $MAVEN_REPO_LOCAL/org.apache.maven/maven-default-skin.jar

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

mkdir -p core/target/classes
cp core/src/main/config/ehcache-failsafe.xml core/target/classes

export MAVEN_SETTINGS=$(pwd)/settings.xml
pushd core
mvn-jpp \
        -e \
        -s $MAVEN_SETTINGS \
        -Dmaven2.jpp.mode=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.failure.ignore=true \
%if %{with_tests}
        -Dmaven.test.skip=false \
        -Dtest.unit.skip=false \
        -Dtest.int.skip=false \
%else
        -Dmaven.test.skip=true \
        -Dtest.unit.skip=true \
        -Dtest.int.skip=true \
%endif
        ant:ant install site
popd
pushd debugger
mvn-jpp \
        -e \
        -s $MAVEN_SETTINGS \
        -Dmaven2.jpp.mode=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.failure.ignore=true \
        ant:ant install javadoc:javadoc
popd

%else
export CLASSPATH=$(build-classpath \
backport-util-concurrent \
commons-httpclient \
%if %{with_hibernate}
hibernate2 \
hibernate3 \
%endif
httpunit \
jsr107cache \
servlet_2_4_api \
%if %{with_spring}
spring2/test \
%endif
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd core
ant -f maven-build.xml -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
CLASSPATH=$CLASSPATH:$(pwd)/core/target/%{name}-%{namedversion}.jar
pushd debugger
ant -f maven-build.xml -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
%endif
mkdir core/target/dist
cp core/target/%{name}-%{namedversion}.jar \
           core/target/dist/%{name}-hibernate-%{namedversion}.jar
mkdir temp
pushd temp
jar xf ../core/target/%{name}-%{namedversion}.jar
rm -rf net/sf/ehcache/hibernate/
jar cmf META-INF/MANIFEST.MF ../core/target/dist/%{name}-%{namedversion}.jar *
popd

%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install -m 644 core/target/dist/%{name}-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%if %{with_hibernate}
install -m 644 core/target/dist/%{name}-hibernate-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-hibernate-%{version}.jar
%endif
install -m 644 debugger/target/%{name}-debugger-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-debugger-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} 
  ln -sf %{name}-%{version}.jar %{name}.jar
  ln -sf %{name}-debugger-%{version}.jar %{name}-debugger.jar
%if %{with_hibernate}
  ln -sf %{name}-hibernate-%{version}.jar %{name}-hibernate.jar
%endif
)
%add_to_maven_depmap net.sf.ehcache %{name} %{version} JPP %{name}
%add_to_maven_depmap net.sf.ehcache %{name}-parent %{version} JPP %{name}-parent

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
install -m 644 core/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
install -m 644 debugger/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-debugger.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
cp -pr core/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/debugger
cp -pr debugger/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/debugger
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

## manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p core/LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%if %{with_maven}
rm -rf core/target/site/apidocs
cp -pr core/target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%endif

# hibernate_in_process_cache ghost symlink
ln -s %{_sysconfdir}/alternatives \
  $RPM_BUILD_ROOT%{_javadir}/hibernate_in_process_cache.jar

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-alternatives --install %{_javadir}/hibernate_in_process_cache.jar \
  hibernate_in_process_cache %{_javadir}/%{name}.jar 90
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%preun
{
  [ $1 -eq 0 ] || exit 0
  update-alternatives --remove hibernate_in_process_cache %{_javadir}/%{name}.jar
} >/dev/null 2>&1 || :

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%files
%defattr(0644,root,root,0755)
%dir %{_docdir}/%{name}-%{version}
%{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-debugger-%{version}.jar
%{_javadir}/%{name}-debugger.jar
%ghost %{_javadir}/hibernate_in_process_cache.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
%endif

%if %{with_hibernate}
%files hibernate
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-hibernate-%{version}.jar
%{_javadir}/%{name}-hibernate.jar
%endif

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%if %{with_maven}
%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}/site
%endif

%changelog
* Wed Apr 30 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.3.0-2jpp
- Fix depmap frag and add ehcache-parent.pom
- Replace mojo-maven2-plugin-jxr by maven2-plugin-jxr, 
  provided by maven-jxr

* Wed Mar 05 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.3.0-1jpp
- Upgrade to 1.3.0

* Tue Aug 07 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.0.3-2jpp
- Fix maven build to include ehcache-failsafe.xml

* Tue Aug 07 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.0.3-1jpp
- Upgrade to 1.2.0_03
- Build with maven2 by default
- Add gcj_support option
- Make Vendor, Distribution based on macro
- Add pom and depmap frags
- (Re-)add -manual subpackage

* Wed Jun 21 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- Upgrade to 1.2

* Tue Feb 28 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1-4jpp
- Re-add patch to fix tests so that they build on JRockit

* Thu Feb 16 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1-3jpp
- Patch the checkstyle config to build with checkstyle-4.1
- Enable failOnViolation of checkstyle target
- Drop ehcache-test.patch: some platform dependency ?
- Reduce requires
- Add -hibernate subpackage for hibernate provider (patched to hibernate3)
- Add option --without hibernate for bootstrap purposes

* Thu Jan 05 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1-2jpp
- First JPP 1.7 build
- Do not support hibernate 2 any longer

* Tue Nov 01 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
- Upgrade to 1.1

* Sat Jul 09 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-2jpp
- Inhibit failure due to checkstyle

* Tue Dec 14 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1jpp
- Upgrade to 1.0
- Drop many wrong Requires and BuildRequires

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.9-1jpp
- Upgrade to 0.9
- Drop saxpath requirements
- Require jaxen >= 1.1

* Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.8-3jpp
- Build with ant-1.6.2

* Fri Jul 02 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.8-2jpp
- Relax some versioned dependencies
- Provide hibernate_in_process_cache and do update-alternatives, prio 90
- Continue providing ehcache-bootstrap but obsolete package ehcache-bootstrap
- Fix jboss4 dependencies to = 4.0.0

* Thu Jun 10 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.8-1jpp
- First JPackage release.

--- NEW FILE: ehcache-1.3.0-core-pom-nohibernate-nospring.patch ---
--- core/pom.xml.sav	2008-03-06 14:30:17.000000000 +0100
+++ core/pom.xml	2008-03-06 14:30:55.000000000 +0100
@@ -75,6 +75,7 @@
             <artifactId>clover</artifactId>
         </dependency>
 -->
+<!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
@@ -83,16 +84,19 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
         </dependency>
+-->
 <!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
 -->
+<!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
         </dependency>
+-->
 <!--
         <dependency>
             <groupId>org.acegisecurity</groupId>

--- NEW FILE: ehcache-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: ehcache-1.3.0-core-pom-nohibernate.patch ---
--- core/pom.xml.sav	2008-03-06 14:28:20.000000000 +0100
+++ core/pom.xml	2008-03-06 14:28:57.000000000 +0100
@@ -34,6 +34,7 @@
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
+<!--
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
@@ -42,6 +43,7 @@
             <groupId>net.sf.hibernate</groupId>
             <artifactId>hibernate</artifactId>
         </dependency>
+-->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>




More information about the JPackage-commits mailing list