summaryrefslogtreecommitdiff
path: root/dev-java/felix-utils
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/felix-utils')
-rw-r--r--dev-java/felix-utils/Manifest5
-rw-r--r--dev-java/felix-utils/felix-utils-1.2.0.ebuild45
-rw-r--r--dev-java/felix-utils/files/felix-utils-1.2.0-build.xml299
-rw-r--r--dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch47
-rw-r--r--dev-java/felix-utils/metadata.xml8
5 files changed, 0 insertions, 404 deletions
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
deleted file mode 100644
index c08ff38f1a8d..000000000000
--- a/dev-java/felix-utils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX felix-utils-1.2.0-build.xml 13825 BLAKE2B 2a3e33af5ecc743605ea5b23bc28c64a235c1d7bc090a321731eda1c4c61b1430ba21fabeb6124220998f9412330b3897dd673e902bc513a9ef79e4befff227c SHA512 0494ca015f38daf3b96758adaba1de71ec82b7ba811507e8b7acf33ff887484481251d6868d98c0b70535f1a5874941d457bf43fb3f8139d698ce3f5ce4ed1da
-AUX felix-utils-1.2.0-java-fixes.patch 1673 BLAKE2B 74f07e3238cc36f1982fed225cde1e9ea26419cd5e0f20ab357857ffa5580b8aa30eee4e945b52723ec54505bfe7d32c02a8c507ec6ab4d2518f3073e2e961cc SHA512 7256b8b9979536d1bc587726f3f4f71d56ec0ed3ba9cbc1229eea2c4d2c0883636bfa4498a59a076b9a06cd21b9fbb2f1ef293425454d3cb3dcb62d9d103cd33
-DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 BLAKE2B 5c7032986ce2e859236fcf9c9d4eefeb03c7bd8bad579c6e37423434f9095f8817d980cb5ddaaa2056632fe4ce9469f2fd955233fdbac7d48cd0fe0502b04904 SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171
-EBUILD felix-utils-1.2.0.ebuild 1139 BLAKE2B fd9a0395b6c3235360303cc28ca487cac9a151e0b853e851e5c6be40b959a1320f7268fcb7bc58bd059d7baa22c7510cfc6707d3162b304591e2974c783e0470 SHA512 506c46a344dd788740f5d70927c3c5e97bd76ae52a4df47265277c2f40c7df287dc9fb91cbbc48f72a282bb6cdaee9e9f597904f94c25dbfb7b3086cef95ea63
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/felix-utils/felix-utils-1.2.0.ebuild b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
deleted file mode 100644
index 67872db2be2c..000000000000
--- a/dev-java/felix-utils/felix-utils-1.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Utils"
-HOMEPAGE="http://felix.apache.org/"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.utils"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND=">=virtual/jdk-1.6
- dev-java/felix-gogo-runtime:0
- dev-java/osgi-compendium:0
- dev-java/osgi-core-api:0"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- epatch "${FILESDIR}"/${P}-java-fixes.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar)"
-
- java-pkg-2_src_compile
-}
-
-src_install() {
- mv "${S}"/target/{${MY_P},${PN}}.jar || die
-
- java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml b/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml
deleted file mode 100644
index cfe95ef2c6cf..000000000000
--- a/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 5/13/13 2:09 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.utils-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="org.apache.felix.utils-1.2.0"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.resourceDir.1" value="."/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
- <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
- <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- encoding="UTF-8"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="jsr14"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <mkdir dir="${maven.build.outputDir}/META-INF"/>
- <copy todir="${maven.build.outputDir}/META-INF">
- <fileset dir="${maven.build.resourceDir.1}">
- <include name="changelog.txt"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- encoding="UTF-8"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="jsr14"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.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="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <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"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.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 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="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- 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"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html">
- </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"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
- <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0"/>
- <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
- <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar"
- dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar"
- dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
- <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
- dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
- dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
- <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch
deleted file mode 100644
index a973ca56a862..000000000000
--- a/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2012-06-12 08:56:50.000000000 +0200
-+++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2013-05-13 14:25:58.601527069 +0200
-@@ -25,6 +25,7 @@
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.util.*;
-+import java.util.Map.Entry;
-
- import org.apache.felix.utils.version.VersionTable;
- import org.osgi.framework.Filter;
-@@ -111,6 +111,19 @@
- converted = conv;
- }
-
-+ @Override
-+ public boolean matches(Map<String, ?> map)
-+ {
-+ Map nonGenericMap = new HashMap();
-+
-+ for(Entry<String, ?> entry : map.entrySet())
-+ {
-+ nonGenericMap.put(entry.getKey(), entry.getValue());
-+ }
-+
-+ return match0(nonGenericMap);
-+ }
-+
-
- /**
- * Filter using a service's properties.
-@@ -575,13 +587,13 @@
- switch (operation) {
- case APPROX :
- case EQUAL : {
-- return ((Version) value1).compareTo(converted) == 0;
-+ return ((Version) value1).compareTo((Version) converted) == 0;
- }
- case GREATER: {
-- return ((Version) value1).compareTo(converted) >= 0;
-+ return ((Version) value1).compareTo((Version) converted) >= 0;
- }
- case LESS: {
-- return ((Version) value1).compareTo(converted) <= 0;
-+ return ((Version) value1).compareTo((Version) converted) <= 0;
- }
- }
- } else {
diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/felix-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 21:34:06 +0000