[Jpackage-commits] dist/ops4j-pax-runner/JPP-6 Makefile, NONE, 1.1 ops4j-pax-runner-Run.patch, NONE, 1.1 ops4j-pax-runner-UnsupportedBundle.patch, NONE, 1.1 ops4j-pax-runner-UnsupportedStartLevel.patch, NONE, 1.1 ops4j-pax-runner-assembly-pom.patch, NONE, 1.1 ops4j-pax-runner-jpp-depmap.xml, NONE, 1.1 ops4j-pax-runner-pom.patch, NONE, 1.1 ops4j-pax-runner-settings.xml, NONE, 1.1 ops4j-pax-runner.spec, NONE, 1.1 sources, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Sun Feb 5 14:56:01 CET 2012


Update of /home/projects/jpackage/cvs/dist/ops4j-pax-runner/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv27293/JPP-6

Added Files:
	Makefile ops4j-pax-runner-Run.patch 
	ops4j-pax-runner-UnsupportedBundle.patch 
	ops4j-pax-runner-UnsupportedStartLevel.patch 
	ops4j-pax-runner-assembly-pom.patch 
	ops4j-pax-runner-jpp-depmap.xml ops4j-pax-runner-pom.patch 
	ops4j-pax-runner-settings.xml ops4j-pax-runner.spec sources 
Log Message:
Import ops4j-pax-runner into JPP-6

--- NEW FILE: ops4j-pax-runner-UnsupportedStartLevel.patch ---
--- pax-runner/src/main/java/org/ops4j/pax/runner/osgi/UnsupportedStartLevel.java.sav	2011-03-01 17:35:34.000000000 +0100
+++ pax-runner/src/main/java/org/ops4j/pax/runner/osgi/UnsupportedStartLevel.java	2011-03-01 17:36:39.000000000 +0100
@@ -59,4 +59,9 @@
         throw new UnsupportedOperationException();
     }
 
+    public boolean isBundleActivationPolicyUsed( Bundle bundle )
+    {
+        throw new UnsupportedOperationException();
+    }
+
 }

--- NEW FILE: Makefile ---
# Makefile for source rpm: ops4j-pax-runner
# $Id: Makefile,v 1.1 2012/02/05 13:55:59 jpackage Exp $
NAME := ops4j-pax-runner
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: ops4j-pax-runner-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: ops4j-pax-runner-jpp-depmap.xml ---
<dependencies>

 <dependency>
   <maven>
     <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.bundlerepository</artifactId>
     <version>1.6.4</version>
   </maven>
   <jpp>
     <groupId>JPP/apache-felix</groupId>
     <artifactId>org.apache.felix.bundlerepository</artifactId>
     <version>1.6.4</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-common-artifact-filters</artifactId>
     <version>1.3</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>maven-common-artifact-filters</artifactId>
     <version>1.3</version>
   </jpp>
 </dependency>

<!--
 <dependency>
   <maven>
     <groupId>org.sonatype.jline</groupId>
     <artifactId>jline2</artifactId>
     <version>2.5</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jline2</artifactId>
     <version>2.5</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.mortbay.jetty</groupId>
     <artifactId>servlet-api</artifactId>
     <version>2.5-20081211</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>servlet_2_5_api</artifactId>
     <version>2.5</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.osgi</groupId>
     <artifactId>org.osgi.core</artifactId>
     <version>4.0.1</version>
   </maven>
   <jpp>
     <groupId>JPP/felix</groupId>
     <artifactId>org.osgi.core</artifactId>
     <version>1.4.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.osgi</groupId>
     <artifactId>org.osgi.compendium</artifactId>
     <version>4.0.1</version>
   </maven>
   <jpp>
     <groupId>JPP/felix</groupId>
     <artifactId>org.osgi.compendium</artifactId>
     <version>1.4.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.framework</artifactId>
     <version>1.0.0</version>
   </maven>
   <jpp>
     <groupId>JPP/felix</groupId>
     <artifactId>org.apache.felix.framework</artifactId>
     <version>3.0.9</version>
   </jpp>
 </dependency>

-->

</dependencies>

--- NEW FILE: sources ---
57ec03d653e0e815a884ff6c4cb7dad9  ops4j-pax-runner-1.5.0.tgz

--- NEW FILE: ops4j-pax-runner-Run.patch ---
--- pax-runner/src/main/java/org/ops4j/pax/runner/Run.java.sav6	2008-03-15 19:58:13.000000000 +0100
+++ pax-runner/src/main/java/org/ops4j/pax/runner/Run.java	2008-06-23 14:23:56.000000000 +0200
@@ -103,7 +103,9 @@
         NullArgumentException.validateNotNull( resolver, "PropertyResolver" );
 
         final ServiceRegistry serviceRegistry = new ServiceRegistry( null );
-        final EventDispatcher dispatcher = EventDispatcher.start( new Logger( Logger.LOG_DEBUG ) );
+        Logger logger = new Logger( );
+        logger.setLogLevel ( Logger.LOG_DEBUG );
+        final EventDispatcher dispatcher = EventDispatcher.start( logger );
         serviceRegistry.addServiceListener( new ServiceListener()
         {
             public void serviceChanged( ServiceEvent event )

--- NEW FILE: ops4j-pax-runner-pom.patch ---
--- pom.xml.sav0	2010-09-13 09:22:39.000000000 +0200
+++ pom.xml	2011-03-01 18:37:48.000000000 +0100
@@ -69,6 +69,7 @@
           <goals>deploy</goals>
         </configuration>
       </plugin>
+<!--
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>retrotranslator-maven-plugin</artifactId>
@@ -85,6 +86,7 @@
           </execution>
         </executions>
       </plugin>
+-->
     </plugins>
     <pluginManagement>
       <plugins>
@@ -266,7 +268,7 @@
         <module>pax-runner</module>
         <module>pax-runner-no-jcl</module>
         <module>pax-runner-assembly</module>
-        <module>pax-runner-eclipse</module>
+        <!--<module>pax-runner-eclipse</module>-->
       </modules>
     </profile>
   </profiles>

--- NEW FILE: ops4j-pax-runner.spec ---
# Copyright (c) 2000-2012, 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 section         free

Name:           ops4j-pax-runner
Summary:        Pax OSGi bundle runner
Url:            http://paxrunner.ops4j.org/
Version:        1.5.0
Release:        2%{?dist}
Epoch:          0
License:        Apache 2.0 License
Group:          Development/Libraries
Source0:        ops4j-pax-runner-1.5.0.tgz
# svn export http://scm.ops4j.org/repos/ops4j/qa/pax/runner-1.5.0/ ops4j-pax-runner-1.5.0
# tar czf ops4j-pax-runner-1.5.0.tgz ops4j-pax-runner-1.5.0/

Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml

Patch0:         ops4j-pax-runner-pom.patch
Patch1:         ops4j-pax-runner-UnsupportedBundle.patch
Patch2:         ops4j-pax-runner-UnsupportedStartLevel.patch
Patch3:         ops4j-pax-runner-Run.patch
Patch4:         ops4j-pax-runner-assembly-pom.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  ant >= 0:1.7.1
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-dependency
BuildRequires:  maven2-plugin-idea
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-release
BuildRequires:  maven2-plugin-remote-resources
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  maven-surefire-provider-junit4
BuildRequires:  apache-commons-parent
BuildRequires:  ops4j-pax-master

BuildRequires:  apache-felix-maven-bundle-plugin
BuildRequires:  aries-testsupport

BuildRequires:  jline2
BuildRequires:  ops4j-pax-scanner
BuildRequires:  ops4j-pax-swissbox
BuildRequires:  ops4j-pax-url

Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5
Requires:  java >= 0:1.6.0
Requires:  ops4j-pax-scanner
Requires:  ops4j-pax-swissbox
Requires:  ops4j-pax-url

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot

%description
Pax OSGi runner.

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

%description javadoc
%{summary}.

%prep
%setup -q 
chmod -R go=u-w *
for f in $(find . -name "*.jar"); do
  mv $f $f.no
done
cp %{SOURCE1} settings.xml
%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4


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

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository

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

export SETTINGS=$(pwd)/settings.xml

mvn-jpp \
        -e \
        -s $SETTINGS \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.failure.ignore=true \
        install 
mvn-jpp \
        -e \
        -s $SETTINGS \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Daggregate=true \
        javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT

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

install -m 644 pax-runner-commons/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-commons.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-commons %{version} JPP/%{name} pax-runner-commons
install -m 644 pax-runner-handler/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-handler.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-handler %{version} JPP/%{name} pax-runner-handler
install -m 644 pax-runner-no-jcl/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-no-jcl.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-no-jcl %{version} JPP/%{name} pax-runner-no-jcl
install -m 644 pax-runner-platform-concierge/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-platform-concierge.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-platform-concierge %{version} JPP/%{name} pax-runner-platform-concierge
install -m 644 pax-runner-platform-equinox/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-platform-equinox.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-platform-equinox %{version} JPP/%{name} pax-runner-platform-equinox
install -m 644 pax-runner-platform-felix/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-platform-felix.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-platform-felix %{version} JPP/%{name} pax-runner-platform-felix
install -m 644 pax-runner-platform-knopflerfish/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-platform-knopflerfish.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-platform-knopflerfish %{version} JPP/%{name} pax-runner-platform-knopflerfish
install -m 644 pax-runner-platform/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner-platform.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner-platform %{version} JPP/%{name} pax-runner-platform
install -m 644 pax-runner/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-pax-runner.pom
%add_to_maven_depmap org.ops4j.pax.runner pax-runner %{version} JPP/%{name} pax-runner
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runner.pom
%add_to_maven_depmap org.ops4j.pax runner %{version} JPP/%{name} runner


install -m 644 pax-runner-commons/target/pax-runner-commons-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-handler/target/pax-runner-handler-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-no-jcl/target/pax-runner-no-jcl-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-platform-concierge/target/pax-runner-platform-concierge-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-platform-equinox/target/pax-runner-platform-equinox-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-platform-felix/target/pax-runner-platform-felix-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-platform-knopflerfish/target/pax-runner-platform-knopflerfish-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner-platform/target/pax-runner-platform-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 pax-runner/target/pax-runner-1.5.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}


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

# javadoc
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} # ghost symlink

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Sun Feb 05 2012 Ralph Apel <r.apel at r-apel.de> 0:1.5.0-2
- Promote to free

* Mon Jun 27 2011 Ralph Apel <r.apel at r-apel.de> 0:1.5.0-1
- First release

--- NEW FILE: ops4j-pax-runner-assembly-pom.patch ---
--- pax-runner-assembly/pom.xml.sav	2011-03-01 18:11:23.000000000 +0100
+++ pax-runner-assembly/pom.xml	2011-03-01 18:12:03.000000000 +0100
@@ -85,6 +85,7 @@
       <version>1.5.0</version>
       <type>jar</type>
     </dependency>
+<!--
     <dependency>
       <groupId>org.ops4j.pax.runner</groupId>
       <artifactId>pax-runner</artifactId>
@@ -92,6 +93,7 @@
       <type>jar</type>
       <classifier>jdk14</classifier>
     </dependency>
+-->
   </dependencies>
 
-</project>
\ Kein Zeilenumbruch am Dateiende.
+</project>

--- NEW FILE: ops4j-pax-runner-UnsupportedBundle.patch ---
--- pax-runner/src/main/java/org/ops4j/pax/runner/osgi/UnsupportedBundle.java.sav1	2007-09-11 07:39:53.000000000 +0200
+++ pax-runner/src/main/java/org/ops4j/pax/runner/osgi/UnsupportedBundle.java	2011-06-27 18:01:17.000000000 +0200
@@ -22,10 +22,12 @@
 import java.net.URL;
 import java.util.Dictionary;
 import java.util.Enumeration;
+import java.util.Map;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Version;
 
 public class UnsupportedBundle
     implements Bundle
@@ -42,12 +44,24 @@
         throw new UnsupportedOperationException();
     }
 
+    public void start(int opts)
+        throws BundleException
+    {
+        throw new UnsupportedOperationException();
+    }
+
     public void stop()
         throws BundleException
     {
         throw new UnsupportedOperationException();
     }
 
+    public void stop(int opts)
+        throws BundleException
+    {
+        throw new UnsupportedOperationException();
+    }
+
     public void update()
         throws BundleException
     {
@@ -147,4 +161,15 @@
     {
         throw new UnsupportedOperationException();
     }
+
+    public Map getSignerCertificates(int signerType)
+    {
+        return (Map)null;
+    }
+
+    public Version getVersion()
+    {
+        return (Version)null;
+    }
+
 }




More information about the JPackage-commits mailing list