diff options
Diffstat (limited to 'dev-java/felix-utils')
-rw-r--r-- | dev-java/felix-utils/Manifest | 7 | ||||
-rw-r--r-- | dev-java/felix-utils/felix-utils-1.2.0.ebuild | 45 | ||||
-rw-r--r-- | dev-java/felix-utils/files/felix-utils-1.2.0-build.xml | 299 | ||||
-rw-r--r-- | dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch | 47 | ||||
-rw-r--r-- | dev-java/felix-utils/metadata.xml | 8 |
5 files changed, 406 insertions, 0 deletions
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest new file mode 100644 index 000000000000..ec4ee26148ee --- /dev/null +++ b/dev-java/felix-utils/Manifest @@ -0,0 +1,7 @@ +AUX felix-utils-1.2.0-build.xml 13825 SHA256 c359ad0d87415327aabb5e94ad303c14e77870905659f3c7f1f4c73478d91387 SHA512 0494ca015f38daf3b96758adaba1de71ec82b7ba811507e8b7acf33ff887484481251d6868d98c0b70535f1a5874941d457bf43fb3f8139d698ce3f5ce4ed1da WHIRLPOOL e046d967685fe844b199acbd4f5b08f901e1eac3634f721de3beec146e58ca7aae00aafe110974ff6b61eba10f1e4ffe4d939fca29b4b89558cf13d4a72cc92d +AUX felix-utils-1.2.0-java-fixes.patch 1673 SHA256 f01604e2312db384cfcfe3efaef37589c2343da88287e78557a936f19ebb3ae2 SHA512 7256b8b9979536d1bc587726f3f4f71d56ec0ed3ba9cbc1229eea2c4d2c0883636bfa4498a59a076b9a06cd21b9fbb2f1ef293425454d3cb3dcb62d9d103cd33 WHIRLPOOL 027ffd91b7d1a85b5ff067611ebfe9080083ca5d5bad42d1413cf82b63aa24af7ea5eb56bda86f2d7d9c5b774ef500d372c6a90e7e3016f13e88fd9dc6cc4f04 +DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 SHA256 281872667d5968875f5f5b12878145c7f184ffb89d3ddf8ad757070e0722105c SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171 WHIRLPOOL a9422c4fda79d1ba32cfff923d911a4e91fab463c8de0b870f43daf683222f86963690834df1d37a67f3cba4849a1f85433f7239abd100abfa1c6ef3a1d6b91c +EBUILD felix-utils-1.2.0.ebuild 1139 SHA256 2aec062b6c2f1b23ed056412b460ccf5719d7bdf23929641c2891f7746be2d2d SHA512 506c46a344dd788740f5d70927c3c5e97bd76ae52a4df47265277c2f40c7df287dc9fb91cbbc48f72a282bb6cdaee9e9f597904f94c25dbfb7b3086cef95ea63 WHIRLPOOL 38f304b63eb2d07d1cf611eb3f429acdc96df63efdbff29aacb1366b18f64ab0e95c53aba34f8d6e494b4fdeac8d5d0a9eb2d2957d17acef2df9fafed6e7ad2c +MISC ChangeLog 2714 SHA256 3748a40a305628fa0aae83f090c040e67ef6acfae5b5643f61a31022503cc641 SHA512 0455174079c8d89edd78effb03311b2c256ba2a5da544b5a91c495f40ef7bee27e5159fd6386009e58a1d14a94a3d7cd51514c3dc6daa4038ef07c65fc1b61bb WHIRLPOOL fe046e00e033a0f94bf68122de730b199b64f67182959047e09bba242ff2a61166e32ae3bbbdef32052d86eec51a3f60a5f6a56ec1dc52e480cf88ce372b4342 +MISC ChangeLog-2015 515 SHA256 9cf1d1857ef162c50c43fedf756d35e39721f1d2c1bd4a3063dbd976990cfd5f SHA512 6ee8455c92e76f2ec5d5582f4aa6f96037f5f263052e4ad70c78d508a1b336155843f5c0d412c7926048ffe2404223dbb9cc089ba20599c4d60d0116255b9f03 WHIRLPOOL 289bbee7dabf817fbdcd49b819685c65c270107ed89621c7dfbc80c90fd3d71335ef90c08a21aed54ce567aefa3606fb8f87da345f2d15352375a78330fb8bf6 +MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac diff --git a/dev-java/felix-utils/felix-utils-1.2.0.ebuild b/dev-java/felix-utils/felix-utils-1.2.0.ebuild new file mode 100644 index 000000000000..67872db2be2c --- /dev/null +++ b/dev-java/felix-utils/felix-utils-1.2.0.ebuild @@ -0,0 +1,45 @@ +# 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 new file mode 100644 index 000000000000..cfe95ef2c6cf --- /dev/null +++ b/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml @@ -0,0 +1,299 @@ +<?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 new file mode 100644 index 000000000000..a973ca56a862 --- /dev/null +++ b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch @@ -0,0 +1,47 @@ +--- 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 new file mode 100644 index 000000000000..2444066aa02b --- /dev/null +++ b/dev-java/felix-utils/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> +</maintainer> +</pkgmetadata> |