SLFO-pool/felix-utils
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main felix-utils revision b1f5a7a126d04952f5eb801823760667

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 12:28:06 +02:00
commit fd3a14570f
6 changed files with 507 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

123
0000-Port-to-osgi-cmpn.patch Normal file
View File

@ -0,0 +1,123 @@
From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 5 Nov 2018 09:59:04 +0100
Subject: [PATCH] Port to osgi-cmpn
---
.../utils/repository/AggregateRepository.java | 20 +++++++++++++++++++
.../utils/repository/BaseRepository.java | 19 ++++++++++++++++++
.../utils/properties/MockBundleContext.java | 10 ++++++++++
3 files changed, 49 insertions(+)
diff --git a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
index 50dceaf..4da3141 100644
--- a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
+++ b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
@@ -25,7 +25,12 @@ import java.util.Map;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
+import org.osgi.resource.Resource;
+import org.osgi.service.repository.ExpressionCombiner;
import org.osgi.service.repository.Repository;
+import org.osgi.service.repository.RequirementBuilder;
+import org.osgi.service.repository.RequirementExpression;
+import org.osgi.util.promise.Promise;
public class AggregateRepository implements Repository {
@@ -52,4 +57,19 @@ public class AggregateRepository implements Repository {
}
return result;
}
+
+ @Override
+ public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ExpressionCombiner getExpressionCombiner() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public RequirementBuilder newRequirementBuilder(String namespace) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
index 95adadd..0998ab0 100644
--- a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
+++ b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
@@ -30,7 +30,11 @@ import org.osgi.framework.Constants;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
import org.osgi.resource.Resource;
+import org.osgi.service.repository.ExpressionCombiner;
import org.osgi.service.repository.Repository;
+import org.osgi.service.repository.RequirementBuilder;
+import org.osgi.service.repository.RequirementExpression;
+import org.osgi.util.promise.Promise;
/**
*/
@@ -90,4 +94,19 @@ public class BaseRepository implements Repository {
}
return result;
}
+
+ @Override
+ public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ExpressionCombiner getExpressionCombiner() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public RequirementBuilder newRequirementBuilder(String namespace) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
index 3eab444..df94a6c 100644
--- a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
+++ b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
@@ -25,7 +25,9 @@ import org.osgi.framework.BundleListener;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -105,6 +107,10 @@ public class MockBundleContext implements BundleContext {
throw new UnsupportedOperationException();
}
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
+ throw new UnsupportedOperationException();
+ }
+
public ServiceReference[] getServiceReferences(String s, String s1) throws InvalidSyntaxException {
throw new UnsupportedOperationException();
}
@@ -125,6 +131,10 @@ public class MockBundleContext implements BundleContext {
throw new UnsupportedOperationException();
}
+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+ throw new UnsupportedOperationException();
+ }
+
public File getDataFile(String s) {
throw new UnsupportedOperationException();
}
--
2.17.2

242
felix-utils-build.xml Normal file
View File

@ -0,0 +1,242 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.apache.felix.utils" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="build.properties"/>
<property name="project.groupId" value="org.apache.felix"/>
<property name="project.name" value="Apache Felix Utils"/>
<property name="project.version" value="1.11.4"/>
<property name="spec.version" value="1.11"/>
<property name="project.artifactId" value="org.apache.felix.utils"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="."/>
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
<property name="build.testDir" value="src/test/java"/>
<property name="build.testResourceDir" value="src/test/resources"/>
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<fileset dir="lib">
<!-- org.osgi.core org.osgi.compendium -->
<include name="**/*"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
<!-- org.osgi.core org.osgi.compendium -->
<!-- junit hamcrest-core mockito-all -->
<include name="**/*"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<mkdir dir="${build.outputDir}/META-INF"/>
<copy todir="${build.outputDir}/META-INF">
<fileset dir="${build.resourceDir}">
<include name="LICENSE*"/>
<include name="NOTICE*"/>
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
<javac destdir="${build.testOutputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.testDir}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
<copy todir="${build.testOutputDir}">
<fileset dir="${build.testResourceDir}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
<pathelement location="${build.testOutputDir}"/>
</classpath>
<batchtest todir="${test.reports}" unless="test">
<fileset dir="${build.testDir}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${test.reports}" if="test">
<fileset dir="${build.testDir}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
source="${compiler.source}"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
linksource="false"
breakiterator="false">
<classpath refid="build.classpath"/>
</javadoc>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Implementation-Title" value="${project.name}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
<attribute name="JavaPackages-Version" value="${project.version}"/>
<attribute name="Specification-Title" value="${project.name}"/>
<attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
<attribute name="Specification-Version" value="${spec.version}"/>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
</project>

24
felix-utils.changes Normal file
View File

@ -0,0 +1,24 @@
-------------------------------------------------------------------
Wed Oct 25 15:11:28 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
-------------------------------------------------------------------
Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Update to upstream release 1.11.4
- Added patch:
* 0000-Port-to-osgi-cmpn.patch
+ Migrate away from the old felix-osgi implementation
-------------------------------------------------------------------
Tue Apr 9 15:34:31 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove reference to the parent pom since we are not building
using Maven.
-------------------------------------------------------------------
Fri Mar 1 06:30:12 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of felix-utils 1.10.4
- Generated and customized ant build file

92
felix-utils.spec Normal file
View File

@ -0,0 +1,92 @@
#
# spec file for package felix-utils
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global bundle org.apache.felix.utils
%bcond_with tests
Name: felix-utils
Version: 1.11.4
Release: 0
Summary: Utility classes for OSGi
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://felix.apache.org
Source0: https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz
Source1: %{name}-build.xml
Patch0: 0000-Port-to-osgi-cmpn.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildRequires: osgi-compendium
BuildRequires: osgi-core
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: hamcrest-core
BuildRequires: mockito
%endif
%description
Utility classes for OSGi
%package javadoc
Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
%patch0 -p1
cp -p %{SOURCE1} build.xml
mkdir -p lib
build-jar-repository -s lib osgi-core osgi-compendium
%if %{with tests}
build-jar-repository -s lib junit hamcrest/core mockito
%endif
%build
%{ant} \
%if %{without tests}
-Dtest.skip=true \
%endif
package javadoc
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}/felix
install -pm 0644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{bundle}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/felix
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
%add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%license LICENSE NOTICE
%doc DEPENDENCIES
%files javadoc
%license LICENSE NOTICE
%{_javadocdir}/%{name}
%changelog

BIN
org.apache.felix.utils-1.11.4-source-release.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.