You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/12/25 16:09:27 UTC

[1/2] git commit: Revert "DELTASPIKE-479 workaround for old versions of weld"

Updated Branches:
  refs/heads/master 4a9effa8f -> 9c946f4a1


Revert "DELTASPIKE-479 workaround for old versions of weld"

This reverts commit 4a9effa8f6c7f7a300ac4a7e0c5b92c3fe34e052.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/92cc355e
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/92cc355e
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/92cc355e

Branch: refs/heads/master
Commit: 92cc355e88d227470e1ebc70589477b366132d50
Parents: 4a9effa
Author: gpetracek <gp...@apache.org>
Authored: Wed Dec 25 15:53:25 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Wed Dec 25 15:53:25 2013 +0100

----------------------------------------------------------------------
 .../test/scheduler/custom/CustomSchedulerTest.java      | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/92cc355e/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
index b8a0692..489c2cf 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
@@ -19,27 +19,21 @@
 package org.apache.deltaspike.test.scheduler.custom;
 
 import junit.framework.Assert;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
 import org.apache.deltaspike.scheduler.spi.Scheduler;
-import org.junit.Before;
 import org.junit.Test;
 
+import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
 
+@Typed()
 public abstract class CustomSchedulerTest
 {
-    //don't use @Inject here - due to an issue with old versions of weld
+    @Inject
     private Scheduler<CustomJob> scheduler;
 
     @Inject
     private TestJobManager testJobManager;
 
-    @Before
-    public void init()
-    {
-        this.scheduler = BeanProvider.getContextualReference(Scheduler.class);
-    }
-
     @Test
     public void checkAutoRegisteredSchedulerJob()
     {


[2/2] git commit: DELTASPIKE-479 workaround for weld

Posted by gp...@apache.org.
DELTASPIKE-479 workaround for weld


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9c946f4a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9c946f4a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9c946f4a

Branch: refs/heads/master
Commit: 9c946f4a13363de9003693a635746bd30ba40d42
Parents: 92cc355
Author: gpetracek <gp...@apache.org>
Authored: Wed Dec 25 15:54:28 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Wed Dec 25 15:54:28 2013 +0100

----------------------------------------------------------------------
 .../deltaspike/test/scheduler/custom/CustomSchedulerTest.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9c946f4a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
index 489c2cf..02989da 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
@@ -22,14 +22,12 @@ import junit.framework.Assert;
 import org.apache.deltaspike.scheduler.spi.Scheduler;
 import org.junit.Test;
 
-import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
 
-@Typed()
 public abstract class CustomSchedulerTest
 {
     @Inject
-    private Scheduler<CustomJob> scheduler;
+    private Scheduler scheduler;
 
     @Inject
     private TestJobManager testJobManager;