[Jpackage-commits] dist/ehcache-core/devel .cvsignore, 1.1, 1.2 ehcache-core-component-info.xml, NONE, 1.1 ehcache-core-jpp-depmap.xml, NONE, 1.1 ehcache-core-jxr.patch, NONE, 1.1 ehcache-core-no-checkstyle.patch, NONE, 1.1 ehcache-core-no-maven-changes-plugin.patch, NONE, 1.1 ehcache-core-no-test.patch, NONE, 1.1 ehcache-core-no-ydoc.patch, NONE, 1.1 ehcache-core-settings.xml, NONE, 1.1 ehcache-core.spec, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Sat Dec 11 11:09:33 CET 2010


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

Modified Files:
	.cvsignore sources 
Added Files:
	ehcache-core-component-info.xml ehcache-core-jpp-depmap.xml 
	ehcache-core-jxr.patch ehcache-core-no-checkstyle.patch 
	ehcache-core-no-maven-changes-plugin.patch 
	ehcache-core-no-test.patch ehcache-core-no-ydoc.patch 
	ehcache-core-settings.xml ehcache-core.spec 
Log Message:
- initial import

--- NEW FILE: ehcache-core-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>javax.transaction</groupId>
         <artifactId>jta</artifactId>
         <version>1.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jta_1_1_api</artifactId>
         <version>1.1</version>
      </jpp>
   </dependency>
</dependencies>

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ehcache-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	11 Dec 2010 09:57:14 -0000	1.1
--- .cvsignore	11 Dec 2010 10:09:31 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ ehcache-core-2.3.1.tar.bz2

--- NEW FILE: ehcache-core.spec ---
# Copyright (c) 2000-2009, 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 with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}

%bcond_with gcj_support
%bcond_with repolib

%define repodir %{_javadir}/repository.jboss.com/net/sf/ehcache/ecache-core/%{version}-brew
%define repodirlib %{repodir}/lib
%define repodirsrc %{repodir}/src

%if %with gcj_support
%define gcj_support 1
%else
%define gcj_support 0
%endif

%define section free

Name:           ehcache-core
Version:        2.3.1
Release:        1%{?dist}
Epoch:          0
Summary:        Ehcache Core
License:        ASL 2.0
URL:            http://ehcache.org/
Group:          Development/Libraries/Java
# svn export http://svn.terracotta.org/svn/ehcache/tags/ehcache-core-2.3.1/ ehcache-core-2.3.1 && tar cjf ehcache-core-2.3.1.tar.bz2 ehcache-core-2.3.1
# Exported revision 3313.
Source0:        %{name}-%{version}.tar.bz2
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Source3:        %{name}-component-info.xml
# FIXME: Missing a lot of test dependencies
Patch0:         %{name}-no-test.patch
# FIXME: [INFO] Reporting mojo's can only be called from ReportDocumentRender
Patch1:         %{name}-no-checkstyle.patch
# FIXME: Missing ydoc (ydoc.doclets.YStandard)
Patch2:         %{name}-no-ydoc.patch
# FIXME: [INFO] Error getting reports from the plugin 'org.apache.maven.plugins:maven-changes-plugin': Error adding plugin dependency 'org.apache.maven.doxia:doxia-site-renderer:jar' into plugin manager: Cannot add jar resource: ehcache-core-2.3.1/m2_repo/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar (error discovering new components)
# Component descriptor role: 'org.codehaus.plexus.velocity.VelocityComponent', implementation: 'org.codehaus.plexus.velocity.DefaultVelocityComponent', role hint: 'doxia-default' has a hint, but there are other implementations that don't
# [INFO] ------------------------------------------------------------------------
# [INFO] Trace
# org.apache.maven.lifecycle.LifecycleExecutionException: Error getting reports from the plugin 'org.apache.maven.plugins:maven-changes-plugin': Error adding plugin dependency 'org.apache.maven.doxia:doxia-site-renderer:jar' into plugin manager: Cannot add jar resource: ehcache-core-2.3.1/m2_repo/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar (error discovering new components)
Patch3:         %{name}-no-maven-changes-plugin.patch
Patch4:         %{name}-jxr.patch
Requires(post): jpackage-utils >= 0:1.7.3
Requires(postun): jpackage-utils >= 0:1.7.3
Requires:       java >= 0:1.5.0
Requires:       jpackage-utils
Requires:       hibernate3
Requires:       jta_1_1_api
Requires:       slf4j
BuildRequires:  ehcache-parent >= 0:2.1
BuildRequires:  hibernate3
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  jta_1_1_api
BuildRequires:  slf4j
BuildRequires:  maven2 >= 0:2.0.7
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-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-source
BuildRequires:  maven-release
%if 0
BuildRequires:  maven2-default-skin
BuildRequires:  maven-jxr
BuildRequires:  mojo-maven2-plugin-findbugs
%endif
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This is the ehcache core module. Pair it with other modules for added
functionality.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires:       jpackage-utils

%description javadoc
%{summary}.

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

%description manual
%{summary}.
%endif

%if %with repolib
%package repolib
Summary:        Artifacts to be uploaded to a repository library
Group:          Development/Libraries/Java

%description repolib
Artifacts to be uploaded to a repository library.
This package is not meant to be installed but so its contents
can be extracted through rpm2cpio.
%endif

%prep
%setup -q
%patch0 -p0 -b .sav0
%patch1 -p0 -b .sav1
%patch2 -p0 -b .sav2
%patch3 -p0 -b .sav3
%patch4 -p0 -b .sav4

cp -p %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/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_repo/repository</url>|g" settings.xml

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

%build
export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
export M2_SETTINGS=$(pwd)/settings.xml
# FIXME: project.build.outputDirectory undefined
%{_bindir}/mvn-jpp \
        -e \
        -s $M2_SETTINGS \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.skip=true \
        -Dproject.build.outputDirectory=$(pwd)/target/classes \
        install javadoc:javadoc \
%if 0
        site
%endif

%install
rm -rf %{buildroot}

# jars
mkdir -p %{buildroot}%{_javadir}
cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)

# pom
mkdir -p %{buildroot}%{_datadir}/maven2/poms
cp -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap net.sf.ehcache ehcache-core %{version} JPP %{name}

# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%if 0
## manual
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
cp -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}
rm -r %{buildroot}%{_docdir}/%{name}-%{version}/apidocs
%endif

%if %with repolib
%{__install} -d -m 755 %{buildroot}%{repodir}
%{__install} -d -m 755 %{buildroot}%{repodirlib}
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{repodir}/component-info.xml
tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
%{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
%{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
%{__install} -d -m 755 %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{PATCH1} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{PATCH2} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{PATCH3} %{buildroot}%{repodirsrc}
%{__install} -p -m 644 %{PATCH4} %{buildroot}%{repodirsrc}
%{__cp} -p %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom %{buildroot}%{repodirlib}/ehcache-core.pom
%{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/ehcache-core.jar
%endif

%clean
rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%{_javadir}*/%{name}-%{version}.jar
%{_javadir}*/%{name}.jar
%{_datadir}/maven2/poms/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}

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

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

%if %with repolib
%files repolib
%defattr(0644,root,root,0755)
%dir %{_javadir}*
%{_javadir}*/repository.jboss.com
%endif

%changelog
* Sat Dec 11 2010 David Walluck <dwalluck at redhat.com> 0:2.3.1-1
- release

--- NEW FILE: ehcache-core-no-test.patch ---
--- pom.xml.orig	2010-12-11 04:10:33.136644190 -0500
+++ pom.xml	2010-12-11 04:10:54.409160330 -0500
@@ -75,12 +75,12 @@
             <version>3.5.1-Final</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.codehaus.btm</groupId>
             <artifactId>btm</artifactId>
             <version>2.0.1</version>
             <scope>test</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
@@ -89,7 +89,7 @@
         </dependency>
 
         <!-- Test scope -->
-        <dependency>
+        <!--<dependency>
             <groupId>net.sf.hibernate</groupId>
             <artifactId>hibernate</artifactId>
             <scope>test</scope>
@@ -134,7 +134,7 @@
             <artifactId>xsom</artifactId>
             <version>20081112</version>
             <scope>test</scope>
-        </dependency>
+        </dependency>-->
         <!--Required for site generation-->
         <!--<dependency>-->
         <!--<groupId>org.apache.maven.doxia</groupId>-->

--- NEW FILE: ehcache-core-no-ydoc.patch ---
--- pom.xml~	2010-12-11 04:19:45.000000000 -0500
+++ pom.xml	2010-12-11 04:22:09.262532883 -0500
@@ -211,14 +211,14 @@
                             <goal>javadoc</goal>
                         </goals>
                         <configuration>
-                            <doclet>ydoc.doclets.YStandard</doclet>
+                            <!--<doclet>ydoc.doclets.YStandard</doclet>
                             <docletPath>
                                 ${ydoc.home}/lib/ydoc.jar${path.separator}${ydoc.home}/lib/class2svg.jar${path.separator}${ydoc.home}/resources
                             </docletPath>
                             <additionalparam>-license ${ydoc.license} -filter
                                 ydoc.filters.ExcludeFilter -filterpath
                                 ${ydoc.home}/lib/ydoc.jar -umlautogen
-                            </additionalparam>
+                            </additionalparam>-->
                             <author>true</author>
                             <bottom>true</bottom>
                             <!--<destDir>${project.build.directory}/site/javadoc</destDir>-->

--- NEW FILE: ehcache-core-jxr.patch ---
--- pom.xml~	2010-12-11 04:26:10.000000000 -0500
+++ pom.xml	2010-12-11 04:31:35.528268894 -0500
@@ -640,9 +640,9 @@
 
             <!--Java Cross Reference (JXR) -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jxr-maven-plugin</artifactId>
-                <version>2.0-beta-1</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.2</version>
                 <configuration>
                     <outputDirectory>${project.build.directory}/site</outputDirectory>
                     <docTitle>ehcache</docTitle>

--- NEW FILE: ehcache-core-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-core-no-checkstyle.patch ---
--- pom.xml~	2010-12-11 04:17:17.000000000 -0500
+++ pom.xml	2010-12-11 04:19:06.028087743 -0500
@@ -417,7 +417,7 @@
                 </executions>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>2.3</version>
@@ -445,7 +445,7 @@
                     <includeTestSourceDirectory>false</includeTestSourceDirectory>
                     <enableRulesSummary>true</enableRulesSummary>
                 </configuration>
-            </plugin>
+            </plugin>-->
 
 
             <!--<plugin>-->

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ehcache-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	11 Dec 2010 09:57:14 -0000	1.1
--- sources	11 Dec 2010 10:09:31 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 894d52183372eacdc9148fd4b6e51b9e  ehcache-core-2.3.1.tar.bz2

--- NEW FILE: ehcache-core-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="net/sf/ehcache/ecache-core"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="ecache-core.jar"/>


    <export>
      <include input="ecache-core.jar"/>

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

--- NEW FILE: ehcache-core-no-maven-changes-plugin.patch ---
--- pom.xml~	2010-12-11 04:23:14.000000000 -0500
+++ pom.xml	2010-12-11 04:25:40.592659368 -0500
@@ -619,7 +619,7 @@
             </plugin>
 
             <!--Manual Changelist -->
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-changes-plugin</artifactId>
                 <version>2.3</version>
@@ -636,7 +636,7 @@
                         </reports>
                     </reportSet>
                 </reportSets>
-            </plugin>
+            </plugin>-->
 
             <!--Java Cross Reference (JXR) -->
             <plugin>




More information about the JPackage-commits mailing list