[Jpackage-commits] dist/picocontainer2/devel .cvsignore, 1.1, 1.2 picocontainer2-distribution-temp-pom.patch, NONE, 1.1 picocontainer2-gems-pom.patch, NONE, 1.1 picocontainer2-jpp-depmap.xml, NONE, 1.1 picocontainer2-pom.patch, NONE, 1.1 picocontainer2-settings.xml, NONE, 1.1 picocontainer2.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Mon Dec 13 16:52:44 CET 2010


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

Modified Files:
	.cvsignore sources 
Added Files:
	picocontainer2-distribution-temp-pom.patch 
	picocontainer2-gems-pom.patch picocontainer2-jpp-depmap.xml 
	picocontainer2-pom.patch picocontainer2-settings.xml 
	picocontainer2.spec 
Log Message:
Import picocontainer2 into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/picocontainer2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	13 Dec 2010 15:51:53 -0000	1.1
--- .cvsignore	13 Dec 2010 15:52:41 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ picocontainer2-2.4.tar.gz

--- NEW FILE: picocontainer2-gems-pom.patch ---
--- gems/pom.xml.sav	2010-12-11 17:04:55.000000000 +0100
+++ gems/pom.xml	2010-12-11 17:05:13.000000000 +0100
@@ -16,7 +16,7 @@
     </dependency>
     <!-- For proxy -->
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.objectweb.asm</groupId>
       <artifactId>asm</artifactId>
       <scope>provided</scope>
     </dependency>

--- NEW FILE: picocontainer2-pom.patch ---
--- pom.xml.sav	2010-12-11 16:48:55.000000000 +0100
+++ pom.xml	2010-12-11 16:49:21.000000000 +0100
@@ -75,7 +75,7 @@
       </dependency>
       <!-- For proxy -->
       <dependency>
-        <groupId>asm</groupId>
+        <groupId>org.objectweb.asm</groupId>
         <artifactId>asm</artifactId>
         <version>3.0</version>
       </dependency>

--- NEW FILE: picocontainer2.spec ---
# Copyright (c) 2000-2010, 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_without maven
%bcond_with gcj_support

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

%define section free
%define oname picocontainer

Name:           picocontainer2
Version:        2.4
Release:        1%{?dist}
Epoch:          0
Summary:        Dependency-injection container
Group:          Development/Libraries/Java
License:        BSD
URL:            http://picocontainer.codehaus.org/
# svn export http://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-2.4/
Source0:        picocontainer2-2.4.tar.gz
Source1:        picocontainer2-settings.xml
Source2:        picocontainer2-jpp-depmap.xml
Patch0:         %{name}-pom.patch
Patch1:         %{name}-gems-pom.patch
Patch99:        %{name}-distribution-temp-pom.patch
Requires(post): jpackage-utils >= 0:1.7.5
Requires(postun): jpackage-utils >= 0:1.7.5
Requires:       java >= 0:1.6.0
Requires:       proxytoys
Requires:       apache-commons-logging
Requires:       log4j

BuildRequires:  java-devel >= 0:1.6.0
%if %with maven
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-dependency
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:  maven2-plugin-surefire
BuildRequires:  maven-release
BuildRequires:  mojo-maven2-plugin-cobertura >= 0:16-2
BuildRequires:  maven2-default-skin
#BuildRequires:  liberation-fonts
BuildRequires:  annotation_1_0_api
%else
BuildRequires:  ant
BuildRequires:  ant-junit
%endif
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  cobertura
BuildRequires:  gnu-getopt
BuildRequires:  apache-commons-parent
BuildRequires:  apache-commons-logging
BuildRequires:  jakarta-slide-webdavclient
BuildRequires:  jetty5
BuildRequires:  jmock2
BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  log4j
BuildRequires:  plexus-utils
BuildRequires:  prefuse
BuildRequires:  proxytoys
BuildRequires:  servletapi5
BuildRequires:  xml-commons-jaxp-1.3-apis
BuildRequires:  xpp3-minimal
BuildRequires:  xstream >= 0:1.2.1
%if %{gcj_support}
BuildRequires:  java-gcj-compat-devel
%endif
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
PicoContainer is a lightweight and highly embeddable container 
for components that honour Dependency Injection.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
BuildRequires:  apache-commons-logging-javadoc

%description javadoc
%{summary}.

%prep
%setup -q -n picocontainer-%{version}
%patch0 -b .sav0
%patch1 -b .sav1
%patch99 -b .sav99
cp -p %{SOURCE1} settings.xml

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

%build
%if %with maven
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
export MAVEN_SETTINGS=$(pwd)/settings.xml
mvn-jpp \
        -e -s $MAVEN_SETTINGS \
        -Preporting,distribution \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.test.failure.ignore=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:aggregate

%else
export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
pushd container
  export CLASSPATH=$(build-classpath jmock xstream)
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  %{ant} -Dbuild.sysclasspath=only jar javadoc
popd
pushd tck
  export CLASSPATH=$(build-classpath jmock junit xstream)
  CLASSPATH=$CLASSPATH:../container/target/%{name}-%{version}.jar
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  %{ant} -Dbuild.sysclasspath=only jar javadoc
popd
pushd gems
  export CLASSPATH=$(build-classpath commons-logging proxytoys prefuse jmock log4j xstream cglib-nodep xpp3-minimal)
  CLASSPATH=$CLASSPATH:../container/target/%{name}-%{version}.jar
  CLASSPATH=$CLASSPATH:../tck/target/%{name}-tck-%{version}.jar
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  %{ant} -Dbuild.sysclasspath=only jar javadoc
popd
%endif

%install
rm -rf $RPM_BUILD_ROOT

#jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 tck/target/%{oname}-tck-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-tck-%{version}.jar
install -m 644 gems/target/%{oname}-gems-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-gems-%{version}.jar
install -m 644 container/target/%{oname}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# create unversioned symlinks
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)

%add_to_maven_depmap org.picocontainer picocontainer-parent %{version} JPP %{name}-parent
%add_to_maven_depmap org.picocontainer picocontainer-distribution %{version} JPP %{name}-distribution
%add_to_maven_depmap org.picocontainer picocontainer %{version} JPP %{name}
%add_to_maven_depmap org.picocontainer picocontainer-tck %{version} JPP %{name}-tck
%add_to_maven_depmap org.picocontainer picocontainer-gems %{version} JPP %{name}-gems

# 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 distribution/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-distribution.pom
install -m 644 container/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
install -m 644 tck/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-tck.pom
install -m 644 gems/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-gems.pom

#javadocs
install -d -m 755 $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}

# manual
%if %with maven
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr distribution/target/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%endif

%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)
%doc %{_docdir}/%{name}-%{version}
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-gems-%{version}.jar
%{_javadir}/%{name}-gems.jar
%{_javadir}/%{name}-tck-%{version}.jar
%{_javadir}/%{name}-tck.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.db
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.so
%endif

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/*

%changelog
* Sat Dec 11 2010 Ralph Apel <r.apel at r-apel.de> 0:2.4-1
- 2.4 as picocontainer2

* Thu Oct 14 2010 Ralph Apel <r.apel at r-apel.de> 0:1.3-5
- fix pom naming
- build with maven by default

* Tue Mar 17 2009 David Walluck <dwalluck at redhat.com> 0:1.3-4
- fix build with ant

* Thu Jul 24 2008 David Walluck <dwalluck at redhat.com> 0:1.3-3
- update for JPackage 5

* Wed Jul 09 2008 Fernando Nasser <fnasser at redhat.com> - 0:1.3-2
- Use new package for dependency, release, cobertura, surefire, site, source
  and project-info-reports plugins
- Needs jakarta-slide-webdavclient

* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.3-1jpp
- Upgrade to 1.3
- Switch to maven2 build
- Add pom and depmap frags
- Add gcj_support option

* Fri Jul 21 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
- Fix unversioned symlinks

* Mon May 22 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- First JPP-1.7 release


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/picocontainer2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	13 Dec 2010 15:51:53 -0000	1.1
--- sources	13 Dec 2010 15:52:42 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 5aba839bbfd33656fd2f14aeccc8bf3e  picocontainer2-2.4.tar.gz

--- NEW FILE: picocontainer2-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: picocontainer2-distribution-temp-pom.patch ---
--- distribution/pom.xml.sav	2010-12-11 19:27:27.000000000 +0100
+++ distribution/pom.xml	2010-12-11 19:48:22.000000000 +0100
@@ -87,6 +87,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.codehaus.xsite</groupId>
         <artifactId>xsite-maven-plugin</artifactId>
@@ -106,6 +107,7 @@
           </execution>
         </executions>
       </plugin>
+      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -143,4 +145,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

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

  <dependency>
    <maven>
      <groupId>junit</groupId>
      <artifactId>junit-dep</artifactId>
      <version>4.4</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>junit4</artifactId>
      <version>4.5</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>javax.annotation</groupId>
      <artifactId>jsr250-api</artifactId>
      <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>annotation_1_0_api</artifactId>
      <version>1.0</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>mx4j</groupId>
      <artifactId>mx4j-impl</artifactId>
      <version>2.1.1</version>
    </maven>
    <jpp>
      <groupId>JPP/mx4j</groupId>
      <artifactId>mx4j-impl</artifactId>
      <version>3.0.2</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>proxytoys</groupId>
      <artifactId>proxytoys</artifactId>
      <version>0.2.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>proxytoys</artifactId>
      <version>0.2.1</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>simple-jndi</groupId>
      <artifactId>simple-jndi</artifactId>
      <version>0.11.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>simple-jndi</artifactId>
      <version>0.11.4.1</version>
    </jpp>
  </dependency>

</dependencies>




More information about the JPackage-commits mailing list