packages/felix-osgi-compendium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 Package init

Browse Source 
Merge pull request !2 from lyn/master
This commit is contained in:
openeuler-ci-bot 2020-08-24 19:48:18 +08:00 committed by Gitee
commit 8da25cdcf5
8 changed files with 213 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Fix-servlet-api-dependency.patch Normal file
View File

@ -0,0 +1,27 @@
From 3a7cfc3cf5cadca0e25854ccb85c65f46fd15737 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 2 Feb 2011 14:17:20 +0100
Subject: [PATCH 1/2] Fix servlet api dependency
---
pom.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d53eaa9..f45d162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
<version>1.4.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>javax.servlet</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
--
1.7.3.5

32
0002-Fix-compile-target.patch Normal file
View File

@ -0,0 +1,32 @@
From 5b80abcb5b2dbead332e1c77fa615d6f93fe2218 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 2 Feb 2011 14:50:17 +0100
Subject: [PATCH 2/2] Fix compile target
---
pom.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index f45d162..2c1a7a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,15 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
--
1.7.3.5

37
0003-Add-CM_LOCATION_CHANGED-property-to-ConfigurationEve.patch Normal file
View File

@ -0,0 +1,37 @@
From ec6885545fb6889ed9a5522647b9780a53c6fd93 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Fri, 15 Jun 2012 11:25:12 +0200
Subject: [PATCH 3/3] Add CM_LOCATION_CHANGED property to ConfigurationEvent.
---
.../java/org/osgi/service/cm/ConfigurationEvent.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/main/java/org/osgi/service/cm/ConfigurationEvent.java b/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
index f17007f..e98f3ac 100644
--- a/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
+++ b/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
@@ -79,6 +79,20 @@ public class ConfigurationEvent {
*/
public static final int CM_DELETED = 2;
/**
+ * The location of a {@code Configuration} has been changed.
+ *
+ * <p>
+ * This {@code ConfigurationEvent} type that indicates that the location of
+ * a {@code Configuration} object has been changed.
+ *
+ * An event is fired when a call to
+ * {@link Configuration#setBundleLocation(String)} successfully changes the
+ * location.
+ *
+ * @since 1.4
+ */
+ public static final int CM_LOCATION_CHANGED = 3;
+ /**
* Type of this event.
*
* @see #getType
--
1.7.10.2

31
0004-Add-TARGET-property-to-ConfigurationPermission.patch Normal file
View File

@ -0,0 +1,31 @@
From 88616a67fcdcf3bbc201ed1736b31a61da7f609e Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Fri, 15 Jun 2012 11:32:27 +0200
Subject: [PATCH 4/4] Add TARGET property to ConfigurationPermission
---
src/main/java/org/osgi/service/cm/ConfigurationPermission.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/osgi/service/cm/ConfigurationPermission.java b/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
index 3af9088..7b8f3e3 100644
--- a/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
+++ b/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
@@ -40,6 +40,14 @@ public final class ConfigurationPermission extends BasicPermission {
public final static String CONFIGURE = "configure";
/**
+ * The permission to be updated, that is, act as a Managed Service or
+ * Managed Service Factory. The action string {@value #TARGET}.
+ *
+ * @since 1.4
+ */
+ public final static String TARGET = "target";
+
+ /**
* Create a new ConfigurationPermission.
*
* @param name Name must be &quot;*&quot;.
--
1.7.10.2

28
0005-Add-getResourceURL-method-to-make-jbosgi-framework-h.patch Normal file
View File

@ -0,0 +1,28 @@
From d9df4679129efdc654b44213fb33abd7ac042e81 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Tue, 3 Jul 2012 18:43:17 +0200
Subject: [PATCH 5/5] Add getResourceURL method to make jbosgi-framework
happy...
---
src/main/java/org/osgi/util/xml/XMLParserActivator.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/java/org/osgi/util/xml/XMLParserActivator.java b/src/main/java/org/osgi/util/xml/XMLParserActivator.java
index 963c092..85f9f56 100644
--- a/src/main/java/org/osgi/util/xml/XMLParserActivator.java
+++ b/src/main/java/org/osgi/util/xml/XMLParserActivator.java
@@ -165,6 +165,10 @@ public class XMLParserActivator implements BundleActivator, ServiceFactory {
.getResource(DOMCLASSFILE)));
}
+ protected URL getResourceURL(Bundle parserBundle, String resname) {
+ return parserBundle.getResource(resname);
+ }
+
/**
* This method has nothing to do as all active service registrations will
* automatically get unregistered when the bundle stops.
--
1.7.10.4

53
felix-osgi-compendium.spec Normal file
View File

@ -0,0 +1,53 @@
%global bundle org.osgi.compendium
Name: felix-osgi-compendium
Version: 1.4.0
Release: 1
Summary: Felix OSGi R4 Compendium Bundle
License: ASL 2.0
URL: http://felix.apache.org
BuildArch: noarch
Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
Patch0: 0001-Fix-servlet-api-dependency.patch
Patch1: 0002-Fix-compile-target.patch
Patch2: 0003-Add-CM_LOCATION_CHANGED-property-to-ConfigurationEve.patch
Patch3: 0004-Add-TARGET-property-to-ConfigurationPermission.patch
Patch4: 0005-Add-getResourceURL-method-to-make-jbosgi-framework-h.patch
BuildRequires: maven-local mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) mvn(org.apache.felix:org.osgi.core)
BuildRequires: mvn(org.apache.felix:org.osgi.foundation)
%description
OSGi Service Platform Release 4 Compendium Interfaces and Classes.
%package help
Summary: API documentation for %{name}
Provides: %{name}-javadoc = %{version}-%{release}
Obsoletes: %{name}-javadoc < %{version}-%{release}
%description help
This package contains API documentation for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%mvn_file :%{bundle} "felix/%{bundle}"
%mvn_alias "org.apache.felix:%{bundle}" "org.osgi:%{bundle}"
%build
%mvn_build -- -Drat.numUnapprovedLicenses=100
%install
%mvn_install
%files -f .mfiles
%license LICENSE NOTICE
%files help -f .mfiles-javadoc
%license LICENSE NOTICE
%changelog
* Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 1.4.0-1
- package init

5
felix-osgi-compendium.yaml Normal file
View File

@ -0,0 +1,5 @@
git_url: https://github.com/apache/felix-dev.git
version_control: github
src_repo: apache/felix-dev
tag_prefix: "org.osgi.compendium-"
seperator: "."

BIN
org.osgi.compendium-1.4.0-project.tar.gz Normal file
View File

Binary file not shown.