pool/sisu
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=1

Browse Source
This commit is contained in:
Fridrich Strba 2019-03-19 08:49:28 +00:00 committed by Git OBS Bridge
commit 58daaf6746
11 changed files with 552 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

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

3
org.eclipse.sisu.inject-0.3.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3485561cd3bfe874b70aa773fac0d2de9038c25b794ea21594b05b20c172ade
size 213620

3
org.eclipse.sisu.plexus-0.3.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:424bc833be5096407e6b6fb4dc93d3cbe503be0b78e40f0ef497570b4e8403b8
size 361580

20
sisu-OSGi-import-guava.patch Normal file
View File

@ -0,0 +1,20 @@
--- sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF~ 2014-04-21 16:32:25.000000000 +0200
+++ sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF 2014-04-23 10:53:22.538142253 +0200
@@ -16,6 +16,7 @@
com.google.inject.matcher;version="1.3",
com.google.inject.name;version="1.3",
com.google.inject.spi;version="1.3",
+ com.google.common.base,
org.osgi.framework;version="1.5",
org.osgi.util.tracker;version="1.4",
org.slf4j;resolution:=optional,
--- sisu-inject/org.eclipse.sisu.inject/build.properties~ 2015-02-25 14:46:42.392037463 +0100
+++ sisu-inject/org.eclipse.sisu.inject/build.properties 2015-02-25 14:44:56.626803789 +0100
@@ -17,5 +17,5 @@
.
# build with JSR250 v1.2 and workaround indirect Guava dependency via Guice 4
-extra.. = platform:/plugin/javax.annotation,platform:/plugin/com.google.guava
-additional.bundles = javax.annotation,com.google.guava
+extra.. = platform:/plugin/javax.annotation-api,platform:/plugin/com.google.guava
+additional.bundles = javax.annotation-api,com.google.guava

3
sisu-build.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fe54646eba5cdd6c2ca57626b307a18740f0701fd89f10cb8337fd2e38e3c0f
size 1964

205
sisu-ignored-tests.patch Normal file
View File

@ -0,0 +1,205 @@
--- sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java~ 2014-09-12 08:32:32.899725268 +0200
+++ sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java 2014-09-12 08:37:45.656099710 +0200
@@ -128,30 +128,6 @@
assertSame( a, itr2.next().getValue() );
}
- public void testUnrestrictedSearch()
- {
- final LocatedBeans<Annotation, Bean> beans = locate( Key.get( Bean.class ) );
- final Iterator<BeanEntry<Annotation, Bean>> itr = beans.iterator();
-
- assertTrue( itr.hasNext() );
- assertEquals( QualifyingStrategy.DEFAULT_QUALIFIER, itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( Names.named( "Named1" ), itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( Names.named( "Named2" ), itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( Names.named( "Marked2" ), itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( Names.named( "Marked3" ), itr.next().getKey() );
- assertFalse( itr.hasNext() );
- }
-
public void testNamedSearch()
{
final LocatedBeans<Named, Bean> beans = locate( Key.get( Bean.class, Named.class ) );
@@ -181,20 +156,6 @@
assertFalse( itr.hasNext() );
}
- public void testMarkedSearch()
- {
- final LocatedBeans<Marked, Bean> beans = locate( Key.get( Bean.class, Marked.class ) );
- final Iterator<BeanEntry<Marked, Bean>> itr = beans.iterator();
-
- assertTrue( itr.hasNext() );
- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( MarkedBeanImpl2.class.getAnnotation( Marked.class ), itr.next().getKey() );
- assertTrue( itr.hasNext() );
- assertEquals( MarkedBeanProvider.class.getAnnotation( Marked.class ), itr.next().getKey() );
- assertFalse( itr.hasNext() );
- }
-
public void testMarkedWithAttributesSearch()
{
final LocatedBeans<Marked, Bean> beans =
--- sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java~ 2014-08-24 01:48:47.000000000 +0200
+++ sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java 2015-02-04 07:06:49.696531924 +0100
@@ -159,83 +159,6 @@
new PlexusXmlScanner( null, plexusXml, null ).scan( space, true );
}
- @SuppressWarnings( "deprecation" )
- public void testComponents()
- {
- final ClassSpace space = new URLClassSpace( PlexusXmlScannerTest.class.getClassLoader() );
-
- final Map<String, PlexusBeanMetadata> metadata = new HashMap<String, PlexusBeanMetadata>();
- final PlexusXmlScanner scanner = new PlexusXmlScanner( null, null, metadata );
-
- final Map<Component, DeferredClass<?>> componentMap = scanner.scan( space, true );
-
- assertEquals( 6, componentMap.size() );
-
- final Component component1 =
- new ComponentImpl( DefaultBean.class, Hints.DEFAULT_HINT, Strategies.PER_LOOKUP, "" );
- assertEquals( DefaultBean.class, componentMap.get( component1 ).load() );
-
- final Component component2 = new ComponentImpl( Bean.class, "debug", Strategies.SINGLETON, "For debugging" );
- assertEquals( DebugBean.class, componentMap.get( component2 ).load() );
-
- final Component component3 = new ComponentImpl( Bean.class, Hints.DEFAULT_HINT, Strategies.SINGLETON, "" );
- assertEquals( AnotherBean.class, componentMap.get( component3 ).load() );
-
- final Component component4 = new ComponentImpl( Bean.class, "clone", Strategies.SINGLETON, "" );
- assertEquals( DefaultBean.class, componentMap.get( component4 ).load().getSuperclass() );
- final Class<?> proxy = CustomTestClassLoader.proxy( componentMap.get( component4 ).load() );
-
- try
- {
- assertNotNull( proxy.getMethod( "TestMe" ) );
- }
- catch ( final NoSuchMethodException e )
- {
- fail( "Proxied class is missing 'TestMe' method" );
- }
-
- final PlexusBeanMetadata metadata1 = metadata.get( DefaultBean.class.getName() );
-
- assertFalse( metadata1.isEmpty() );
-
- assertEquals( new ConfigurationImpl( "someFieldName", "<some-field-name><item>PRIMARY</item></some-field-name>" ),
- metadata1.getConfiguration( new NamedProperty( "someFieldName" ) ) );
-
- assertEquals( new ConfigurationImpl( "simple", "value" ),
- metadata1.getConfiguration( new NamedProperty( "simple" ) ) );
-
- assertEquals( new ConfigurationImpl( "value", "<value with=\"attribute\"></value>" ),
- metadata1.getConfiguration( new NamedProperty( "value" ) ) );
-
- assertEquals( new ConfigurationImpl( "emptyValue1", "<empty-value1 with=\"attribute\" />" ),
- metadata1.getConfiguration( new NamedProperty( "emptyValue1" ) ) );
-
- assertEquals( new ConfigurationImpl( "emptyValue2", "" ),
- metadata1.getConfiguration( new NamedProperty( "emptyValue2" ) ) );
-
- assertFalse( metadata1.isEmpty() );
-
- assertEquals( new RequirementImpl( Bean.class, true, "debug" ),
- metadata1.getRequirement( new NamedProperty( "bean", TypeLiteral.get( Bean.class ) ) ) );
-
- assertFalse( metadata1.isEmpty() );
-
- metadata1.getConfiguration( new NamedProperty( "foo" ) );
-
- assertEquals( new RequirementImpl( Bean.class, false, Hints.DEFAULT_HINT, "debug" ),
- metadata1.getRequirement( new NamedProperty( "beanMap" ) ) );
-
- assertFalse( metadata1.isEmpty() );
-
- assertEquals( new RequirementImpl( Bean.class, false ),
- metadata1.getRequirement( new NamedProperty( "beanField" ) ) );
-
- assertTrue( metadata1.isEmpty() );
-
- assertNotNull( metadata.get( AnotherBean.class.getName() ) );
- assertNull( metadata.get( DebugBean.class.getName() ) );
- }
-
static class FixedClassSpace
implements ClassSpace
{
@@ -392,64 +315,4 @@
}
}
- static final class CustomTestClassLoader
- extends ClassLoader
- {
- private static final String PROXY_MARKER = "$proxy";
-
- CustomTestClassLoader( final ClassLoader parent )
- {
- super( parent );
- }
-
- static Class<?> proxy( final Class<?> clazz )
- {
- try
- {
- return new CustomTestClassLoader( clazz.getClassLoader() ).loadClass( clazz.getName() + PROXY_MARKER );
- }
- catch ( final ClassNotFoundException e )
- {
- throw new TypeNotPresentException( clazz.getName(), e );
- }
- }
-
- @Override
- protected synchronized Class<?> loadClass( final String name, final boolean resolve )
- throws ClassNotFoundException
- {
- return super.loadClass( name, resolve );
- }
-
- @Override
- protected Class<?> findClass( final String name )
- throws ClassNotFoundException
- {
- final String proxyName = name.replace( '.', '/' );
- final String superName = proxyName.substring( 0, proxyName.length() - PROXY_MARKER.length() );
-
- final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_MAXS );
- cw.visit( Opcodes.V1_5, Modifier.PUBLIC | Modifier.FINAL, proxyName, null, superName, null );
- MethodVisitor mv = cw.visitMethod( Modifier.PUBLIC, "<init>", "()V", null, null );
-
- mv.visitCode();
- mv.visitVarInsn( Opcodes.ALOAD, 0 );
- mv.visitMethodInsn( Opcodes.INVOKESPECIAL, superName, "<init>", "()V", false );
- mv.visitInsn( Opcodes.RETURN );
- mv.visitMaxs( 0, 0 );
- mv.visitEnd();
-
- mv = cw.visitMethod( Modifier.PUBLIC, "TestMe", "()V", null, null );
-
- mv.visitCode();
- mv.visitInsn( Opcodes.RETURN );
- mv.visitMaxs( 0, 0 );
- mv.visitEnd();
- cw.visitEnd();
-
- final byte[] buf = cw.toByteArray();
-
- return defineClass( name, buf, 0, buf.length );
- }
- }
}

72
sisu-inject.pom Normal file
View File

@ -0,0 +1,72 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>@VERSION@</version>
<dependencies>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
<version>4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>org.eclipse.sisu.inject/src</sourceDirectory>
</build>
</project>

11
sisu-osgi-api.patch Normal file
View File

@ -0,0 +1,11 @@
--- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java~ 2015-09-13 20:15:37.000000000 +0200
+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2017-01-29 19:56:51.608151337 +0100
@@ -80,7 +80,7 @@
protected static boolean hasPlexusAnnotations( final Bundle bundle )
{
- final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE );
+ final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE ).toString();
return null != imports && imports.contains( "org.codehaus.plexus.component.annotations" );
}

67
sisu-plexus.pom Normal file
View File

@ -0,0 +1,67 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>@VERSION@</version>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.5.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.22</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
<version>4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>org.eclipse.sisu.plexus/src</sourceDirectory>
<resources>
<resource>
<targetPath>META-INF/plexus</targetPath>
<filtering>false</filtering>
<directory>${basedir}/org.eclipse.sisu.plexus/META-INF/plexus</directory>
<includes>
<include>components.xml</include>
</includes>
</resource>
</resources>
</build>
</project>

144
sisu.spec Normal file
View File

@ -0,0 +1,144 @@
#
# spec file for package sisu
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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 reltype release
#global reltag .M1
Name: sisu
Version: 0.3.3
Release: 0
Summary: Eclipse dependency injection framework
# sisu is EPL-1.0, bundled asm is BSD
License: EPL-1.0 AND BSD-3-Clause
Group: Development/Libraries/Java
URL: http://eclipse.org/sisu
Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.xz
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.xz
Source2: %{name}-build.tar.xz
Source100: %{name}-inject.pom
Source101: %{name}-plexus.pom
Patch0: %{name}-OSGi-import-guava.patch
Patch2: %{name}-ignored-tests.patch
Patch3: %{name}-osgi-api.patch
BuildRequires: ant
BuildRequires: atinject
BuildRequires: cdi-api
BuildRequires: fdupes
BuildRequires: glassfish-annotation-api
BuildRequires: glassfish-servlet-api
BuildRequires: google-guice
BuildRequires: guice-servlet
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: osgi-core
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-utils
BuildRequires: slf4j
BuildRequires: testng
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires: xz
Provides: bundled(objectweb-asm)
BuildArch: noarch
%description
Java dependency injection framework with backward support for plexus and bean
style dependency injection.
%package inject
Summary: Sisu inject
Group: Development/Libraries/Java
%description inject
This package contains %{summary}.
%package plexus
Summary: Sisu Plexus
Group: Development/Libraries/Java
%description plexus
This package contains %{summary}.
%package javadoc
Summary: API documentation for Sisu
Group: Documentation/HTML
%description javadoc
This package contains %{summary}.
%prep
%setup -q -c -T
tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
cp %{SOURCE100} sisu-inject/pom.xml
tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
cp %{SOURCE101} sisu-plexus/pom.xml
tar xf %{SOURCE2}
%patch0
%patch2
%patch3
for i in inject plexus; do
%pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i}
done
%{mvn_file} ":{*}" @1
%{mvn_package} ":*{inject,plexus}" @1
%{mvn_alias} :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
%build
mkdir -p lib
build-jar-repository -s lib \
glassfish-annotation-api \
glassfish-servlet-api \
google-guice-no_aop \
guice/guice-servlet \
javax.enterprise.inject/cdi-api \
javax.inject/atinject \
junit \
osgi-core/osgi.core \
plexus/utils \
plexus/classworlds \
plexus-containers/plexus-component-annotations \
slf4j/api \
testng
%ant package javadoc
for i in inject plexus; do
%mvn_artifact %{name}-${i}/pom.xml %{name}-${i}/target/org.eclipse.sisu.${i}-%{version}.jar
done
%install
%mvn_install
for i in inject plexus; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
cp -pr %{name}-inject/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
%fdupes -s %{buildroot}%{_javadocdir}
%files inject -f .mfiles-inject
%license sisu-inject/LICENSE.txt
%files plexus -f .mfiles-plexus
%files javadoc
%license sisu-inject/LICENSE.txt
%{_javadocdir}/%{name}
%changelog