[jbosgi-resolver/f17] Initial import
Marek Goldmann
goldmann at fedoraproject.org
Thu Jun 28 12:22:26 UTC 2012
commit b5fb2240472f24bd4e78de6f8784013576d1db4b
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Thu Jun 28 14:22:11 2012 +0200
Initial import
.gitignore | 1 +
0001-Use-felix-directly.patch | 69 +++++++++++++++++++++++++
0002-JDK7-support.patch | 54 ++++++++++++++++++++
jbosgi-resolver.spec | 112 +++++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 237 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..050f9dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jbosgi-resolver-2.0.0.Beta2.tar.xz
diff --git a/0001-Use-felix-directly.patch b/0001-Use-felix-directly.patch
new file mode 100644
index 0000000..e8d7d5f
--- /dev/null
+++ b/0001-Use-felix-directly.patch
@@ -0,0 +1,69 @@
+From 683b1908ced48e8ed2b799a410f1c548a76b96ae Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Thu, 14 Jun 2012 12:22:40 +0200
+Subject: [PATCH 1/2] Use felix directly
+
+---
+ api/pom.xml | 4 ++--
+ felix/pom.xml | 4 ++--
+ pom.xml | 7 +++----
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/api/pom.xml b/api/pom.xml
+index 6e0dce9..a3815c2 100644
+--- a/api/pom.xml
++++ b/api/pom.xml
+@@ -48,8 +48,8 @@
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.core</artifactId>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+diff --git a/felix/pom.xml b/felix/pom.xml
+index 08a7be1..4b71c16 100644
+--- a/felix/pom.xml
++++ b/felix/pom.xml
+@@ -48,8 +48,8 @@
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.core</artifactId>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+diff --git a/pom.xml b/pom.xml
+index 2de87d4..97f0d1b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -44,7 +44,6 @@
+ <version.jboss.osgi.vfs>1.0.6</version.jboss.osgi.vfs>
+ <version.jboss.shrinkwrap>1.0.0-cr-1</version.jboss.shrinkwrap>
+ <version.junit>4.10</version.junit>
+- <version.osgi.core>4.2.0</version.osgi.core>
+ </properties>
+
+ <!-- Dependency Management -->
+@@ -81,9 +80,9 @@
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.core</artifactId>
+- <version>${version.osgi.core}</version>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>org.apache.felix.framework</artifactId>
++ <version>4.0.2</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
+--
+1.7.10.2
+
diff --git a/0002-JDK7-support.patch b/0002-JDK7-support.patch
new file mode 100644
index 0000000..b401d14
--- /dev/null
+++ b/0002-JDK7-support.patch
@@ -0,0 +1,54 @@
+From 3d7766701213dbc72d1a866208a7098616d2b542 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Fri, 15 Jun 2012 07:58:11 +0200
+Subject: [PATCH 2/2] JDK7 support
+
+---
+ .../java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java | 5 +++--
+ felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java | 4 ++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java b/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java
+index 961344b..0e9843e 100644
+--- a/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java
++++ b/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java
+@@ -111,7 +111,8 @@ public abstract class AbstractEnvironment implements XEnvironment {
+ log.debugf("Find providers: %s", req);
+ SortedSet<Capability> result = new TreeSet<Capability>(getComparator());
+ for (Resource res : resources) {
+- for (Capability cap : res.getCapabilities(req.getNamespace())) {
++ List<Capability> caps = res.getCapabilities(req.getNamespace());
++ for (Capability cap : caps) {
+ if (req.matches(cap)) {
+ result.add(cap);
+ }
+@@ -192,4 +193,4 @@ public abstract class AbstractEnvironment implements XEnvironment {
+ applyWiring(res, wiring);
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java b/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java
+index 3678d67..be0fe10 100644
+--- a/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java
++++ b/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java
+@@ -53,7 +53,7 @@ public class FelixResolver implements Resolver {
+ private ResolverImpl delegate = new ResolverImpl(new LoggerDelegate());
+
+ @Override
+- public Map<Resource, List<Wire>> resolve(Environment environment, Collection<? extends Resource> mandatory, Collection<? extends Resource> optional) throws ResolutionException {
++ public Map<Resource, List<Wire>> resolve(Environment environment, Collection mandatory, Collection optional) throws ResolutionException {
+ FelixEnvironment env = new EnvironmentDelegate(environment);
+ log.debugf("Resolve: %s, %s", mandatory, optional);
+ Map<Resource, List<Wire>> result = delegate.resolve(env, mandatory, optional);
+@@ -99,4 +99,4 @@ public class FelixResolver implements Resolver {
+ return environment.getWirings();
+ }
+ }
+-}
+\ No newline at end of file
++}
+--
+1.7.10.2
+
diff --git a/jbosgi-resolver.spec b/jbosgi-resolver.spec
new file mode 100644
index 0000000..f164ace
--- /dev/null
+++ b/jbosgi-resolver.spec
@@ -0,0 +1,112 @@
+%global namedreltag .Beta2
+%global namedversion %{version}%{?namedreltag}
+
+Name: jbosgi-resolver
+Version: 2.0.0
+Release: 0.2%{namedreltag}%{?dist}
+Summary: Standalone OSGi Resolver
+Group: Development/Libraries
+License: LGPLv2+
+URL: http://community.jboss.org/wiki/JBossOSGi
+
+# git clone git://github.com/jbosgi/jbosgi-resolver.git
+# cd jbosgi-resolver/ && git archive --format=tar --prefix=jbosgi-resolver-2.0.0.Beta2/ 2.0.0.Beta2 | xz > jbosgi-resolver-2.0.0.Beta2.tar.xz
+Source0: jbosgi-resolver-%{namedversion}.tar.xz
+
+# Shipped osgi.core is outdated, we need to use felix directly
+Patch0: 0001-Use-felix-directly.patch
+# Support for JDK7
+Patch1: 0002-JDK7-support.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: jbosgi-parent
+BuildRequires: mockito
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: felix-osgi-core
+BuildRequires: jboss-logging
+BuildRequires: jboss-modules
+BuildRequires: jboss-logmanager
+BuildRequires: jbosgi-metadata
+BuildRequires: jbosgi-spi
+BuildRequires: jbosgi-vfs
+BuildRequires: felix-osgi-obr-resolver
+BuildRequires: felix-framework
+
+Requires: jpackage-utils
+Requires: java
+Requires: felix-osgi-core
+Requires: jboss-modules
+Requires: jboss-logging
+Requires: jboss-logmanager
+Requires: jbosgi-metadata
+Requires: jbosgi-spi
+Requires: jbosgi-vfs
+Requires: felix-osgi-obr-resolver
+Requires: felix-framework
+
+%description
+This package contains the JBoss OSGi Resolver.
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n jbosgi-resolver-%{namedversion}
+
+%patch0 -p1
+%patch1 -p1
+
+%build
+# No org.jboss.osgi.testing classes available
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+
+%install
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+for m in api felix; do
+ # JAR
+ install -pm 644 ${m}/target/jbosgi-resolver-${m}-v2-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
+ # POM
+ install -pm 644 ${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
+ # DEPMAP
+ %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
+done
+
+# POM
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
+
+# DEPMAP
+%add_maven_depmap JPP.%{name}-%{name}-parent.pom
+
+# APIDOCS
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%files
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/*
+
+%files javadoc
+%{_javadocdir}/%{name}
+
+%changelog
+* Mon Jun 25 2012 Marek Goldmann <mgoldman at redhat.com> 2.0.2-0.2.Beta2
+- Fixed BR/R
+
+* Fri Jun 15 2012 Marek Goldmann <mgoldman at redhat.com> 2.0.2-0.1.Beta2
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..9a82813 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d2ad4666c12b05bcffa92e7d7e5b9ef9 jbosgi-resolver-2.0.0.Beta2.tar.xz
More information about the scm-commits
mailing list