From 5712567264276244adbb2035279c2b464c0d5b86 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Jul 2014 17:22:08 -0400 Subject: Add sisu-inject --- conf/dependencies.mk | 6 +++++ conf/sources.mk | 1 + rules/sisu-inject-bootstrap/delete.list | 2 ++ rules/sisu-inject-bootstrap/no-jsr299.patch | 39 ++++++++++++++++++++++++++++ rules/sisu-inject-bootstrap/subdir-deps.mk | 5 ++++ rules/sisu-inject-bootstrap/valid-java.patch | 12 +++++++++ rules/testng/delete.list | 4 +++ 7 files changed, 69 insertions(+) create mode 100644 rules/sisu-inject-bootstrap/delete.list create mode 100644 rules/sisu-inject-bootstrap/no-jsr299.patch create mode 100644 rules/sisu-inject-bootstrap/subdir-deps.mk create mode 100644 rules/sisu-inject-bootstrap/valid-java.patch create mode 100644 rules/testng/delete.list diff --git a/conf/dependencies.mk b/conf/dependencies.mk index d515f4d..c2c7e37 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -218,6 +218,12 @@ build/packages/eclipselink-persistence20: \ build/packages/osgi50-core # any version would probably work build/packages/eclipselink-persistence21: \ build/packages/osgi50-core # any version would probably work +build/packages/sisu-inject-bootstrap: \ + $(dep-junit) \ + $(dep-servlet25) \ + build/packages/guice-bootstrap \ + build/packages/osgi50-core \ + build/packages/slf4j-api # JDOM/Jaxen build/packages/jdom1: \ diff --git a/conf/sources.mk b/conf/sources.mk index 0915014..015ab3d 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -94,6 +94,7 @@ wagon = tar|$(_apache_mirror)/maven/wagon eclispelink-persistence20 = tar|http://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.0.6.v201308211412.tar.gz eclipselink-persistence21 = tar|http://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.1.0.v201304241213.tar.gz +sisu-inject-bootstrap = tar|https://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/0.2.1.tar.gz|0.2.1 # Misc Git aether-core-bootstrap = git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518 diff --git a/rules/sisu-inject-bootstrap/delete.list b/rules/sisu-inject-bootstrap/delete.list new file mode 100644 index 0000000..6b5f115 --- /dev/null +++ b/rules/sisu-inject-bootstrap/delete.list @@ -0,0 +1,2 @@ +org.eclipse.sisu.inject/src/org/eclipse/sisu/launch/InjectedTest.java +org.eclipse.sisu.inject/src/org/eclipse/sisu/bean/ diff --git a/rules/sisu-inject-bootstrap/no-jsr299.patch b/rules/sisu-inject-bootstrap/no-jsr299.patch new file mode 100644 index 0000000..ec1afb0 --- /dev/null +++ b/rules/sisu-inject-bootstrap/no-jsr299.patch @@ -0,0 +1,39 @@ +diff -ru sisu-inject-bootstrap.orig/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/QualifiedTypeBinder.java sisu-inject-bootstrap/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/QualifiedTypeBinder.java +--- sisu-inject-bootstrap.orig/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/QualifiedTypeBinder.java 2014-07-23 10:43:37.244436085 -0400 ++++ sisu-inject-bootstrap/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/QualifiedTypeBinder.java 2014-07-23 10:44:14.743708560 -0400 +@@ -44,16 +44,7 @@ + + static + { +- boolean hasTyped; +- try +- { +- hasTyped = javax.enterprise.inject.Typed.class.isAnnotation(); +- } +- catch ( final LinkageError e ) +- { +- hasTyped = false; +- } +- HAS_TYPED = hasTyped; ++ HAS_TYPED = false; + } + + // ---------------------------------------------------------------------- +@@ -364,17 +355,6 @@ + + private static Class[] getBindingTypes( final Class clazz ) + { +- if ( HAS_TYPED ) +- { +- for ( Class c = clazz; c != Object.class; c = c.getSuperclass() ) +- { +- final javax.enterprise.inject.Typed typed = c.getAnnotation( javax.enterprise.inject.Typed.class ); +- if ( null != typed ) +- { +- return typed.value().length > 0 ? typed.value() : c.getInterfaces(); +- } +- } +- } + return null; + } + diff --git a/rules/sisu-inject-bootstrap/subdir-deps.mk b/rules/sisu-inject-bootstrap/subdir-deps.mk new file mode 100644 index 0000000..e853c7b --- /dev/null +++ b/rules/sisu-inject-bootstrap/subdir-deps.mk @@ -0,0 +1,5 @@ +org.eclipse.sisu.inject.extender_deps = org.eclipse.sisu.inject +org.eclipse.sisu.inject.site_deps = org.eclipse.sisu.inject +org.eclipse.sisu.inject.tests_deps = org.eclipse.sisu.inject + +subdirs := $(filter-out org.eclipse.sisu.inject.tests,$(subdirs)) diff --git a/rules/sisu-inject-bootstrap/valid-java.patch b/rules/sisu-inject-bootstrap/valid-java.patch new file mode 100644 index 0000000..dacb731 --- /dev/null +++ b/rules/sisu-inject-bootstrap/valid-java.patch @@ -0,0 +1,12 @@ +diff -ru sisu-inject-bootstrap.orig/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java sisu-inject-bootstrap/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java +--- sisu-inject-bootstrap.orig/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java 2014-07-22 20:36:53.226714168 -0400 ++++ sisu-inject-bootstrap/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java 2014-07-23 17:19:26.662898754 -0400 +@@ -195,7 +195,7 @@ + private void publishBindings( final TypeLiteral searchType, final BindingSubscriber subscriber, + final TypeLiteral superType ) + { +- for ( final Binding binding : injector. findBindingsByType( searchType ) ) ++ for ( final Binding binding : injector. findBindingsByType( (TypeLiteral) searchType ) ) + { + if ( isVisible( binding ) && ( null == superType || isAssignableFrom( superType, binding ) ) ) + { diff --git a/rules/testng/delete.list b/rules/testng/delete.list new file mode 100644 index 0000000..6adac26 --- /dev/null +++ b/rules/testng/delete.list @@ -0,0 +1,4 @@ +ivy-*.jar +lib-supplied/*.jar +3rdparty/ +*/3rdparty/ -- cgit v1.2.3