Updated Branches: refs/heads/master 3a839caf3 -> 1174e704a
Fix missing references in IDEA for imports in javax.enterprise after gradle idea Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1174e704 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1174e704 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1174e704 Branch: refs/heads/master Commit: 1174e704a5baf67f99fdbe56bfcf921f5fb13117 Parents: 3a839ca Author: ffacon <[email protected]> Authored: Sat Feb 8 14:10:07 2014 +0100 Committer: ffacon <[email protected]> Committed: Sat Feb 8 14:10:07 2014 +0100 ---------------------------------------------------------------------- tapestry-cdi/build.gradle | 12 ++++++++++++ .../main/java/org/apache/tapestry5/cdi/BeanHelper.java | 1 - .../org/apache/tapestry5/cdi/CDIInjectionProvider.java | 5 +---- .../org/apache/tapestry5/cdi/CDIObjectProvider.java | 2 +- .../tapestry5/cdi/internal/utils/InternalUtils.java | 2 +- .../tapestry5/cdi/test/beans/StatefulEJBBeanImpl.java | 3 --- .../tapestry5/cdi/test/beans/StatelessEJBBeanImpl.java | 1 - .../cdi/test/beans/ws/HelloWorldServiceImpl.java | 2 -- 8 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-cdi/build.gradle b/tapestry-cdi/build.gradle index e105a73..2e51bd9 100644 --- a/tapestry-cdi/build.gradle +++ b/tapestry-cdi/build.gradle @@ -71,6 +71,18 @@ sourceSets { } } +idea { + module { + scopes.PROVIDED.plus += configurations.compileOnly + } + } + +eclipse { + classpath { + plusConfigurations += configurations.compileOnly + } +} + task resolveJBoss(type: Copy) { destinationDir = file('target') from { zipTree(configurations.jboss.singleFile) } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/BeanHelper.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/BeanHelper.java b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/BeanHelper.java index 88cf481..f855a38 100644 --- a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/BeanHelper.java +++ b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/BeanHelper.java @@ -124,7 +124,6 @@ public final class BeanHelper { final Set<Bean<?>> beans = beanManager.getBeans(clazz, new Annotation[]{ new Any() { - @Override public Class<? extends Annotation> annotationType() { return Any.class; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIInjectionProvider.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIInjectionProvider.java b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIInjectionProvider.java index 577e866..6d9a826 100644 --- a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIInjectionProvider.java +++ b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIInjectionProvider.java @@ -62,14 +62,13 @@ public final class CDIInjectionProvider implements InjectionProvider2 { * @see org.apache.tapestry5.services.transform.InjectionProvider2#provideInjection(org.apache.tapestry5.plastic.PlasticField, org.apache.tapestry5.ioc.ObjectLocator, org.apache.tapestry5.model.MutableComponentModel) */ @SuppressWarnings("rawtypes") - @Override public boolean provideInjection(final PlasticField field, final ObjectLocator locator, final MutableComponentModel componentModel) { Class type = cache.forName(field.getTypeName()); if(InternalUtils.isManagedByTapestry( type, new AnnotationProvider(){ - @Override + public <T extends Annotation> T getAnnotation( Class<T> annotationClass) { return field.getAnnotation(annotationClass); @@ -84,7 +83,6 @@ public final class CDIInjectionProvider implements InjectionProvider2 { final Annotation[] qualifiers = InternalUtils.getFieldQualifiers(type, new AnnotationProvider(){ - @Override public <T extends Annotation> T getAnnotation( Class<T> annotationClass) { return field.getAnnotation(annotationClass); @@ -138,7 +136,6 @@ public final class CDIInjectionProvider implements InjectionProvider2 { releasables = instancesToRelease; } - @Override public void run() { synchronized (releasables) { // should be useless but just to be sure for (BeanInstance instance : releasables) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIObjectProvider.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIObjectProvider.java b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIObjectProvider.java index 19fd7d2..74b82d0 100644 --- a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIObjectProvider.java +++ b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/CDIObjectProvider.java @@ -37,7 +37,7 @@ public class CDIObjectProvider implements ObjectProvider { /* (non-Javadoc) * @see org.apache.tapestry5.ioc.ObjectProvider#provide(java.lang.Class, org.apache.tapestry5.ioc.AnnotationProvider, org.apache.tapestry5.ioc.ObjectLocator) */ - @Override + public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/internal/utils/InternalUtils.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/internal/utils/InternalUtils.java b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/internal/utils/InternalUtils.java index 8b6ed7e..de9fbad 100644 --- a/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/internal/utils/InternalUtils.java +++ b/tapestry-cdi/src/main/java/org/apache/tapestry5/cdi/internal/utils/InternalUtils.java @@ -92,7 +92,7 @@ public final class InternalUtils { private static <T extends Annotation> boolean isAnnotation(AnnotationProvider annotationProvider, final Class<T> annotation) { return annotationProvider.getAnnotation( new Annotation(){ - @Override + public Class<? extends Annotation> annotationType() { return annotation; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatefulEJBBeanImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatefulEJBBeanImpl.java b/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatefulEJBBeanImpl.java index fb67fdf..50f6f0d 100644 --- a/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatefulEJBBeanImpl.java +++ b/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatefulEJBBeanImpl.java @@ -20,16 +20,13 @@ public class StatefulEJBBeanImpl implements StatefulEJBBean{ private int num = 0; - @Override public int num() { return num; } - @Override public int inc(){ return ++num; } - @Override public int reset(){ return (num = 0); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatelessEJBBeanImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatelessEJBBeanImpl.java b/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatelessEJBBeanImpl.java index cdd1d48..fb5b5f2 100644 --- a/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatelessEJBBeanImpl.java +++ b/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/StatelessEJBBeanImpl.java @@ -18,7 +18,6 @@ import javax.ejb.Stateless; @Stateless public class StatelessEJBBeanImpl implements StatelessEJBBean{ - @Override public String helloStatelessEJB() { return "Hello Stateless EJB"; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1174e704/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/ws/HelloWorldServiceImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/ws/HelloWorldServiceImpl.java b/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/ws/HelloWorldServiceImpl.java index 6f105a3..659fc77 100644 --- a/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/ws/HelloWorldServiceImpl.java +++ b/tapestry-cdi/src/test/java/org/apache/tapestry5/cdi/test/beans/ws/HelloWorldServiceImpl.java @@ -24,12 +24,10 @@ import javax.jws.WebService; targetNamespace = "https://github.com/apache/tapestry-5/";) public class HelloWorldServiceImpl implements HelloWorldService { - @Override public String sayHello() { return "Hello World!"; } - @Override public String sayHelloToName(final String name) { return "Hello "+name; }
