[Jpackage-commits] dist/apache-shiro/devel .cvsignore, 1.1, 1.2 apache-shiro-core-pom.patch, NONE, 1.1 apache-shiro-jpp-depmap.xml, NONE, 1.1 apache-shiro-samples-pom.patch, NONE, 1.1 apache-shiro-samples-spring-pom.patch, NONE, 1.1 apache-shiro-settings.xml, NONE, 1.1 apache-shiro-support-aspectj-pom.patch, NONE, 1.1 apache-shiro-support-ehcache-pom.patch, NONE, 1.1 apache-shiro-support-quartz-pom.patch, NONE, 1.1 apache-shiro-support-spring-pom.patch, NONE, 1.1 apache-shiro-web-pom.patch, NONE, 1.1 apache-shiro.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Mon Oct 3 10:45:19 CEST 2011


Update of /home/projects/jpackage/cvs/dist/apache-shiro/devel
In directory ryu.zarb.org:/tmp/cvs-serv20942/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apache-shiro-core-pom.patch apache-shiro-jpp-depmap.xml 
	apache-shiro-samples-pom.patch 
	apache-shiro-samples-spring-pom.patch 
	apache-shiro-settings.xml 
	apache-shiro-support-aspectj-pom.patch 
	apache-shiro-support-ehcache-pom.patch 
	apache-shiro-support-quartz-pom.patch 
	apache-shiro-support-spring-pom.patch 
	apache-shiro-web-pom.patch apache-shiro.spec 
Log Message:
Import apache-shiro into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-shiro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	3 Oct 2011 08:42:54 -0000	1.1
--- .cvsignore	3 Oct 2011 08:45:16 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ shiro-root-1.1.0-source-release.zip

--- NEW FILE: apache-shiro-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: apache-shiro-samples-spring-pom.patch ---
--- samples/spring/pom.xml.sav7	2010-10-30 02:34:32.000000000 +0200
+++ samples/spring/pom.xml	2011-06-24 19:44:44.000000000 +0200
@@ -69,8 +69,7 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>

--- NEW FILE: apache-shiro-support-quartz-pom.patch ---
--- support/quartz/pom.xml.sav	2011-06-24 17:45:44.000000000 +0200
+++ support/quartz/pom.xml	2011-06-24 17:46:13.000000000 +0200
@@ -67,6 +67,7 @@
                         <Import-Package>
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             org.quartz*;version="[1.5.0, 1.6.0)", 
+                            org.slf4j*;version="[1.6.1)", 
                             *
                         </Import-Package>
                     </instructions>

--- NEW FILE: apache-shiro-support-aspectj-pom.patch ---
--- support/aspectj/pom.xml.sav	2011-06-24 17:23:58.000000000 +0200
+++ support/aspectj/pom.xml	2011-06-24 17:24:32.000000000 +0200
@@ -90,6 +90,7 @@
                         <Import-Package>
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             org.aspectj*;version="[1.6.0, 2.0.0)",
+                            org.slf4j*;version="[1.6.1)",
                             *
                         </Import-Package>
                     </instructions>

--- NEW FILE: apache-shiro-support-spring-pom.patch ---
--- support/spring/pom.xml.sav	2011-06-24 17:54:55.000000000 +0200
+++ support/spring/pom.xml	2011-06-24 17:55:34.000000000 +0200
@@ -91,6 +91,7 @@
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             org.aopalliance*;version="[1.0.0, 2.0.0)",
                             org.springframework*;version="[2.5.0, 4.0.0)",
+                            org.slf4j*;version="[1.6.1)",
                             *
                         </Import-Package>
                     </instructions>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-shiro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	3 Oct 2011 08:42:54 -0000	1.1
--- sources	3 Oct 2011 08:45:16 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 883696c7a8a06163af4c386394c6fe13  shiro-root-1.1.0-source-release.zip

--- NEW FILE: apache-shiro-core-pom.patch ---
--- core/pom.xml.sav	2011-06-24 17:04:41.000000000 +0200
+++ core/pom.xml	2011-06-24 17:07:36.000000000 +0200
@@ -55,6 +55,7 @@
                         <Import-Package>
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             org.apache.commons.beanutils*;resolution:=optional,
+                            org.slf4j;version="[1.6.1)",
                             *
                         </Import-Package>
                     </instructions>

--- NEW FILE: apache-shiro-jpp-depmap.xml ---
<dependencies>
<!--
-->

<dependency>
    <maven>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-io</artifactId>
        <version>1.3.2</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>commons-io</artifactId>
        <version>1.4</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.hibernate</groupId>
        <artifactId>hibernate</artifactId>
        <version>3.2.6.ga</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>hibernate3-core</artifactId>
        <version>3.3.2</version>
    </jpp>
</dependency>

<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>

<dependency>
    <maven>
        <groupId>org.codehaus.mojo.webstart</groupId>
        <artifactId>webstart</artifactId>
        <version>1.0-beta-1</version>
    </maven>
    <jpp>
        <groupId>JPP/mojo</groupId>
        <artifactId>webstart</artifactId>
        <version>1.0-beta-1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>org.codehaus.mojo.webstart</groupId>
        <artifactId>webstart-maven-plugin</artifactId>
        <version>1.0-beta-1</version>
    </maven>
    <jpp>
        <groupId>JPP/mojo</groupId>
        <artifactId>webstart-maven-plugin</artifactId>
        <version>1.0-beta-1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>org.codehaus.mojo.webstart</groupId>
        <artifactId>webstart-pack200-jdk15</artifactId>
        <version>1.0-beta-1</version>
    </maven>
    <jpp>
        <groupId>JPP/mojo</groupId>
        <artifactId>webstart-pack200-jdk15</artifactId>
        <version>1.0-beta-1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>org.codehaus.mojo.webstart</groupId>
        <artifactId>webstart-jarsigner-api</artifactId>
        <version>1.0-beta-1</version>
    </maven>
    <jpp>
        <groupId>JPP/mojo</groupId>
        <artifactId>webstart-jarsigner-api</artifactId>
        <version>1.0-beta-1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>org.codehaus.mojo.webstart</groupId>
        <artifactId>webstart-pack200-anttasks</artifactId>
        <version>1.2-SNAPSHOT</version>
    </maven>
    <jpp>
        <groupId>JPP/mojo</groupId>
        <artifactId>webstart-pack200-anttasks</artifactId>
        <version>1.0-beta-1</version>
    </jpp>
</dependency>

   <dependency>
      <maven>
         <groupId>taglibs</groupId>
         <artifactId>standard</artifactId>
         <version>1.1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>taglibs-standard</artifactId>
         <version>1.1.2</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jsp-2.1-jetty</artifactId>
         <version>6.1.21</version>
      </maven>
      <jpp>
         <groupId>JPP/jetty6/jsp-2.1</groupId>
         <artifactId>jsp-2.1-jetty</artifactId>
         <version>6.1.22</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.8.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit4</artifactId>
         <version>4.8.2</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>javax.servlet.jsp</groupId>
         <artifactId>jsp-api</artifactId>
         <version>2.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jsp_2_1_api</artifactId>
         <version>2.1</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jstl</artifactId>
         <version>1.2</version>
      </jpp>
   </dependency>

<dependency>
    <maven>
        <groupId>org.opensymphony.quartz</groupId>
        <artifactId>quartz</artifactId>
        <version>1.6.1</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>quartz16</artifactId>
        <version>1.6.5</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>asm</groupId>
        <artifactId>asm</artifactId>
        <version>3.1</version>
    </maven>
    <jpp>
        <groupId>JPP/objectweb-asm</groupId>
        <artifactId>asm</artifactId>
        <version>3.3.1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>asm</groupId>
        <artifactId>asm-util</artifactId>
        <version>3.1</version>
    </maven>
    <jpp>
        <groupId>JPP/objectweb-asm</groupId>
        <artifactId>asm-util</artifactId>
        <version>3.3.1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>asm</groupId>
        <artifactId>asm-commons</artifactId>
        <version>3.1</version>
    </maven>
    <jpp>
        <groupId>JPP/objectweb-asm</groupId>
        <artifactId>asm-commons</artifactId>
        <version>3.3.1</version>
    </jpp>
</dependency>

</dependencies>

--- NEW FILE: apache-shiro.spec ---
# Copyright (c) 2000-2011, 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}}}

%define section free
%define namedversion 1.2.0-m1

Summary:        Shiro security framework
Name:           apache-shiro
Version:        1.1.0
Release:        1%{?dist}
Epoch:          0
Group:          Development/Java
License:        Apache License 2.0
URL:            http://shiro.apache.org
Source0:        http://www.apache.org/dist//shiro/1.1.0/shiro-root-1.1.0-source-release.zip
Source1:        %{name}-jpp-depmap.xml
Source2:        %{name}-settings.xml

Patch0:         apache-shiro-core-pom.patch
Patch1:         apache-shiro-web-pom.patch
Patch2:         apache-shiro-support-aspectj-pom.patch
Patch3:         apache-shiro-support-ehcache-pom.patch
Patch4:         apache-shiro-support-quartz-pom.patch
Patch5:         apache-shiro-support-spring-pom.patch
Patch6:         apache-shiro-samples-pom.patch
Patch7:         apache-shiro-samples-spring-pom.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel = 0:1.6.0
BuildRequires:  junit4
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  easymock2
BuildRequires:  spring3-test

BuildRequires:  aspectj
BuildRequires:  ehcache
BuildRequires:  groovy17
BuildRequires:  hsqldb
BuildRequires:  jetty6
BuildRequires:  quartz
BuildRequires:  spring3-context
BuildRequires:  spring3-jdbc
BuildRequires:  spring3-orm
BuildRequires:  spring2-webmvc

Requires:  java >= 0:1.6.0
Requires:  aspectj
Requires:  ehcache
Requires:  groovy17
Requires:  jetty6
Requires:  quartz
Requires:  spring3-context
Requires:  spring3-jdbc
Requires:  spring3-orm

Requires(post):   jpackage-utils >= 0:1.7.5
Requires(postun): jpackage-utils >= 0:1.7.5

%if %{gcj_support}
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}-root

%description
Apache Shiro is a powerful and easy-to-use Java security 
framework that performs authentication, authorization, 
cryptography, and session management. With Shiro.s 
easy-to-understand API, you can quickly and easily 
secure any application . from the smallest mobile 
applications to the largest web and enterprise 
applications.

%package javadoc
Group:          Development/Documentation
Summary:        Javadoc for %{name}

%description javadoc
%{summary}.

%prep
%setup -q -n shiro-root-%{version}
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4
%patch5 -b .sav5
%patch6 -b .sav6
%patch7 -b .sav7

%build
cp %{SOURCE2} 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
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

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

export M2SETTINGS=$(pwd)/settings.xml
export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository

mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Dmaven.test.failure.ignore=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        -DobrRepository=NONE \
        install 

mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        javadoc:aggregate

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-root.pom
%add_to_maven_depmap org.apache.shiro shiro-root %{version} JPP/%{name} root

install -m 644 all/target/shiro-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/all-%{version}.jar
install -m 644 all/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-all.pom
%add_to_maven_depmap org.apache.shiro shiro-all %{version} JPP/%{name} all

install -m 644 core/target/shiro-core-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-tests-%{version}.jar
install -m 644 core/target/shiro-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
install -m 644 core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
%add_to_maven_depmap org.apache.shiro shiro-core %{version} JPP/%{name} core

install -m 644 samples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-samples.pom
%add_to_maven_depmap org.apache.shiro.samples shiro-samples %{version} JPP/%{name} samples

install -m 644 samples/aspectj/target/samples-aspectj-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/samples-aspectj-%{version}.jar
install -m 644 samples/aspectj/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-samples-aspectj.pom
%add_to_maven_depmap org.apache.shiro.samples samples-aspectj %{version} JPP/%{name} samples-aspectj

install -m 644 samples/quickstart/target/samples-quickstart-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/samples-quickstart-%{version}.jar
install -m 644 samples/quickstart/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-samples-quickstart.pom
%add_to_maven_depmap org.apache.shiro.samples samples-quickstart %{version} JPP/%{name} samples-quickstart

install -m 644 support/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-support.pom
%add_to_maven_depmap org.apache.shiro shiro-support %{version} JPP/%{name} support

install -m 644 support/aspectj/target/shiro-aspectj-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/aspectj-%{version}.jar
install -m 644 support/aspectj/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-aspectj.pom
%add_to_maven_depmap org.apache.shiro shiro-aspectj %{version} JPP/%{name} aspectj

install -m 644 support/ehcache/target/shiro-ehcache-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/ehcache-%{version}.jar
install -m 644 support/ehcache/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ehcache.pom
%add_to_maven_depmap org.apache.shiro shiro-ehcache %{version} JPP/%{name} ehcache

install -m 644 support/groovy/target/shiro-groovy-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/groovy-%{version}.jar
install -m 644 support/groovy/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-groovy.pom
%add_to_maven_depmap org.apache.shiro shiro-groovy %{version} JPP/%{name} groovy

install -m 644 support/quartz/target/shiro-quartz-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/quartz-%{version}.jar
install -m 644 support/quartz/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-quartz.pom
%add_to_maven_depmap org.apache.shiro shiro-quartz %{version} JPP/%{name} quartz

install -m 644 support/spring/target/shiro-spring-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-%{version}.jar
install -m 644 support/spring/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-spring.pom
%add_to_maven_depmap org.apache.shiro shiro-spring %{version} JPP/%{name} spring

install -m 644 web/target/shiro-web-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/web-%{version}.jar
install -m 644 web/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-web.pom
%add_to_maven_depmap org.apache.shiro shiro-web %{version} JPP/%{name} web

(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 644 samples/web/target/samples-web-%{version}.war $RPM_BUILD_ROOT%{_datadir}/%{name}


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

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%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

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

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

%changelog
* Sun Jul 17 2011 Ralph Apel <r.apel at r-apel.de> 0:1.1.0-1
- Initial release


--- NEW FILE: apache-shiro-support-ehcache-pom.patch ---
--- support/ehcache/pom.xml.sav	2011-06-24 17:32:01.000000000 +0200
+++ support/ehcache/pom.xml	2011-06-24 17:32:40.000000000 +0200
@@ -67,6 +67,7 @@
                         <Import-Package>
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             net.sf.ehcache*;version="[1.4.0, 2.0.0)", 
+                            org.slf4j.*;version="[1.6.1)", 
                             *</Import-Package>
                     </instructions>
                 </configuration>

--- NEW FILE: apache-shiro-web-pom.patch ---
--- web/pom.xml.sav	2011-06-24 17:18:27.000000000 +0200
+++ web/pom.xml	2011-06-24 17:19:12.000000000 +0200
@@ -79,7 +79,7 @@
                     <instructions>
                         <Bundle-SymbolicName>org.apache.shiro.web</Bundle-SymbolicName>
                         <Export-Package>org.apache.shiro.web*;version=${project.version}</Export-Package>
-                        <Import-Package>org.apache.shiro*;version="${shiro.osgi.importRange}",*</Import-Package>
+                        <Import-Package>org.apache.shiro*;version="${shiro.osgi.importRange}",org.slf4j;version="[1.6.1)",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

--- NEW FILE: apache-shiro-samples-pom.patch ---
--- samples/pom.xml.sav6	2010-10-30 02:34:32.000000000 +0200
+++ samples/pom.xml	2011-06-24 20:15:04.000000000 +0200
@@ -35,9 +35,9 @@
         <module>aspectj</module>
         <module>quickstart</module>
         <module>web</module>
-        <module>spring-client</module>
-        <module>spring</module>
-        <module>spring-hibernate</module>
+        <!--<module>spring-client</module>-->
+        <!--<module>spring</module>-->
+        <!--<module>spring-hibernate</module>-->
     </modules>
 
     <reporting>




More information about the JPackage-commits mailing list