[Jpackage-commits] dist/picocontainer-script/JPP-6 Makefile, NONE, 1.1 picocontainer-script-distribution-temp-pom.patch, NONE, 1.1 picocontainer-script-jpp-depmap.xml, NONE, 1.1 picocontainer-script-settings.xml, NONE, 1.1 picocontainer-script.spec, NONE, 1.1 sources, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Mon Dec 13 23:21:47 CET 2010


Update of /home/projects/jpackage/cvs/dist/picocontainer-script/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv25660/JPP-6

Added Files:
	Makefile picocontainer-script-distribution-temp-pom.patch 
	picocontainer-script-jpp-depmap.xml 
	picocontainer-script-settings.xml picocontainer-script.spec 
	sources 
Log Message:
Import picocontainer-script into JPP-6

--- NEW FILE: picocontainer-script-distribution-temp-pom.patch ---
--- distribution/pom.xml.sav	2010-12-11 22:10:01.000000000 +0100
+++ distribution/pom.xml	2010-12-11 22:10:24.000000000 +0100
@@ -135,6 +135,7 @@
           </execution>
         </executions>
       </plugin>
+      <!--
       <plugin>
         <groupId>org.codehaus.xsite</groupId>
         <artifactId>xsite-maven-plugin</artifactId>
@@ -154,6 +155,7 @@
           </execution>
         </executions>
       </plugin>
+      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -203,4 +205,4 @@
       <url>dav:https://dav.codehaus.org/picocontainer/script</url>
     </site>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: Makefile ---
# Makefile for source rpm: picocontainer-script
# $Id: Makefile,v 1.1 2010/12/13 22:21:45 jpackage Exp $
NAME := picocontainer-script
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)

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

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

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

</dependencies>

--- NEW FILE: sources ---
8176bc354ac8de5261deaef688ce6f7d  picocontainer-script-2.0.tar.gz

--- NEW FILE: picocontainer-script-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: picocontainer-script.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

Name:           picocontainer-script
Version:        2.0
Release:        1%{?dist}
Epoch:          0
Summary:        Scripting-layer for picocontainer
Group:          Development/Libraries/Java
License:        BSD
URL:            http://picocontainer.codehaus.org/
Source0:        picocontainer-script-2.0.tar.gz
# svn export https://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-script-2.0/
# tar czf picocontainer-script-2.0.tar.gz picocontainer-script-2.0/

Source1:        picocontainer-script-settings.xml
Source2:        picocontainer-script-jpp-depmap.xml
Patch0:         %{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:       picocontainer2 >= 0:2.4

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
%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
The main scope of PicoContainer Script to provide a scripting
layer on top of PicoContainer, adding the following features:
* Classloader (classpath) management,including programmable 
  permissions
* Class name based composition (via reflection)
* Meta-data and script language support:
  o XML
  o Beanshell
  o Groovy
  o JRuby
  o Jython (Python)
  o Rhino (Javascript)
It is important to stress that there is no "official" script
or meta-data language. We support multiple script languages 
to give the use the maximum flexibility in the choice that 
suits the task at hand. XML is of course the most widely 
used and mature meta-data markup, but lacks the programming 
features of some scripting languages, such as Groovy or 
JRuby with its builder syntax.

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

%description javadoc
%{summary}.

%prep
%setup -q 
%patch0 -b .sav0
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`
export CLASSPATH=$(build-classpath jmock xstream)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
%{ant} -Dbuild.sysclasspath=only jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT

#jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 script-core/target/%{name}-core-%{version}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar
install -m 644 script-bsh/target/%{name}-bsh-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-bsh-%{version}.jar
install -m 644 script-groovy/target/%{name}-groovy-%{version}.jar \
         $RPM_BUILD_ROOT%{_javadir}/%{name}-groovy-%{version}.jar
install -m 644 script-jruby/target/%{name}-jruby-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-jruby-%{version}.jar
install -m 644 script-jython/target/%{name}-jython-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-jython-%{version}.jar
install -m 644 script-rhino/target/%{name}-rhino-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-rhino-%{version}.jar
install -m 644 script-tck/target/%{name}-tck-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-tck-%{version}.jar
install -m 644 script-testmodel/target/%{name}-testmodel-%{version}.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{name}-testmodel-%{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.script picocontainer-script %{version} JPP %{name}
%add_to_maven_depmap org.picocontainer.script picocontainer-script-core %{version} JPP %{name}-core
%add_to_maven_depmap org.picocontainer.script picocontainer-script-bsh %{version} JPP %{name}-bsh
%add_to_maven_depmap org.picocontainer.script picocontainer-script-groovy %{version} JPP %{name}-groovy
%add_to_maven_depmap org.picocontainer.script picocontainer-script-jruby %{version} JPP %{name}-jruby
%add_to_maven_depmap org.picocontainer.script picocontainer-script-jython %{version} JPP %{name}-jython
%add_to_maven_depmap org.picocontainer.script picocontainer-script-rhino %{version} JPP %{name}-rhino
%add_to_maven_depmap org.picocontainer.script picocontainer-script-tck %{version} JPP %{name}-tck
%add_to_maven_depmap org.picocontainer.script picocontainer-script-testmodel %{version} JPP %{name}-testmodel

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
install -m 644 script-core/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-core.pom
install -m 644 script-bsh/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-bsh.pom
install -m 644 script-groovy/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-groovy.pom
install -m 644 script-jruby/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-jruby.pom
install -m 644 script-jython/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-jython.pom
install -m 644 script-rhino/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-rhino.pom
install -m 644 script-tck/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-tck.pom
install -m 644 script-testmodel/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-testmodel.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}/*.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.0-1
- 2.0 release





More information about the JPackage-commits mailing list