You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2013/04/13 12:00:18 UTC

[1/5] git commit: DELTASPIKE-273 fix JavaDoc

Updated Branches:
  refs/heads/master 055131e8e -> 34d6a1696


DELTASPIKE-273 fix JavaDoc


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

Branch: refs/heads/master
Commit: 183a92087fbe62f57cda2450a1c603eeaa398776
Parents: 9720bec
Author: Mark Struberg <st...@apache.org>
Authored: Wed Apr 3 13:18:34 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Apr 3 13:18:34 2013 +0200

----------------------------------------------------------------------
 .../deltaspike/core/impl/util/JndiUtils.java       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/183a9208/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
index 1fcecc1..14579f5 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
@@ -168,7 +168,7 @@ public abstract class JndiUtils
      * Resolves an instances for the given naming context.
      *
      * @param name       context name
-     * @param targetType target type
+     * @param type target type
      * @param <T>        type
      * @return the found instances, null otherwise
      */


[5/5] git commit: DELTASPIKE-229 improve WindowContext handling

Posted by st...@apache.org.
DELTASPIKE-229 improve WindowContext handling


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

Branch: refs/heads/master
Commit: 34d6a1696206e011e698fd74c2b75bc968c9384d
Parents: 19cb8aa
Author: Mark Struberg <st...@apache.org>
Authored: Sat Apr 13 11:57:47 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Apr 13 11:57:47 2013 +0200

----------------------------------------------------------------------
 .../impl/scope/window/DefaultWindowContext.java    |    4 +---
 .../core/impl/scope/window/WindowBeanHolder.java   |    2 +-
 .../core/impl/scope/window/WindowIdHolder.java     |    3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/34d6a169/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
index bdd6cfd..1d63b2b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
@@ -19,7 +19,6 @@
 package org.apache.deltaspike.core.impl.scope.window;
 
 import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
@@ -33,9 +32,8 @@ import org.apache.deltaspike.core.util.context.AbstractContext;
 import org.apache.deltaspike.core.util.context.ContextualStorage;
 
 /**
- *
+ * Context to handle &#064;{@link WindowScoped} beans.
  */
-@SessionScoped
 public class DefaultWindowContext extends AbstractContext implements WindowContext
 {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/34d6a169/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
index fbdd27b..d51342f 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
@@ -28,7 +28,7 @@ import org.apache.deltaspike.core.util.context.ContextualStorage;
 
 /**
  * This holder will store the window Ids and it's beans for the current
- * Session. We use standard SessionScoped bean to not need
+ * HTTP Session. We use standard SessionScoped bean to not need
  * to treat async-supported and similar headache.
  */
 @SessionScoped

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/34d6a169/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
index dc61184..f318c1b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
@@ -18,9 +18,12 @@
  */
 package org.apache.deltaspike.core.impl.scope.window;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * Simple class which just provides a @RequestScoped windowId.
  */
+@RequestScoped
 public class WindowIdHolder
 {
     private String windowId;


[3/5] git commit: update javadoc

Posted by st...@apache.org.
update javadoc


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

Branch: refs/heads/master
Commit: 4cfe0112b339e227fb89d55ea870eed39c009f9e
Parents: f9fdb6d
Author: Mark Struberg <st...@apache.org>
Authored: Sat Apr 13 11:21:07 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Apr 13 11:21:07 2013 +0200

----------------------------------------------------------------------
 .../core/impl/scope/window/WindowBeanHolder.java   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4cfe0112/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
index fbdd27b..d51342f 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
@@ -28,7 +28,7 @@ import org.apache.deltaspike.core.util.context.ContextualStorage;
 
 /**
  * This holder will store the window Ids and it's beans for the current
- * Session. We use standard SessionScoped bean to not need
+ * HTTP Session. We use standard SessionScoped bean to not need
  * to treat async-supported and similar headache.
  */
 @SessionScoped


[2/5] git commit: DELTASPIKE-330 adjust scoping for Window infrastructure classes

Posted by st...@apache.org.
DELTASPIKE-330 adjust scoping for Window infrastructure classes


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

Branch: refs/heads/master
Commit: f9fdb6db4945ccf20ce056399ccfa07a8d46e14b
Parents: 183a920
Author: Mark Struberg <st...@apache.org>
Authored: Wed Apr 3 13:39:22 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Apr 3 13:39:22 2013 +0200

----------------------------------------------------------------------
 .../impl/scope/window/DefaultWindowContext.java    |    4 +---
 .../core/impl/scope/window/WindowIdHolder.java     |    3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f9fdb6db/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
index bdd6cfd..1d63b2b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContext.java
@@ -19,7 +19,6 @@
 package org.apache.deltaspike.core.impl.scope.window;
 
 import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 
@@ -33,9 +32,8 @@ import org.apache.deltaspike.core.util.context.AbstractContext;
 import org.apache.deltaspike.core.util.context.ContextualStorage;
 
 /**
- *
+ * Context to handle &#064;{@link WindowScoped} beans.
  */
-@SessionScoped
 public class DefaultWindowContext extends AbstractContext implements WindowContext
 {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/f9fdb6db/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
index dc61184..f318c1b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
@@ -18,9 +18,12 @@
  */
 package org.apache.deltaspike.core.impl.scope.window;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * Simple class which just provides a @RequestScoped windowId.
  */
+@RequestScoped
 public class WindowIdHolder
 {
     private String windowId;


[4/5] git commit: DELTASPIKE-339 re-apply jndi name in exception

Posted by st...@apache.org.
DELTASPIKE-339 re-apply jndi name in exception

we need this info for detecting issues


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

Branch: refs/heads/master
Commit: 19cb8aa1cd8c12078dc462eb7769928837c2a966
Parents: 055131e 4cfe011
Author: Mark Struberg <st...@apache.org>
Authored: Sat Apr 13 11:56:45 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Apr 13 11:56:45 2013 +0200

----------------------------------------------------------------------
 .../deltaspike/core/impl/util/JndiUtils.java       |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/19cb8aa1/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
----------------------------------------------------------------------
diff --cc deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
index 85fa77b,14579f5..650b90e
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
@@@ -168,9 -167,9 +167,9 @@@ public abstract class JndiUtil
      /**
       * Resolves an instances for the given naming context.
       *
--     * @param name       context name
-      * @param type       target type
-      * @param <T>        type
++     * @param name context name
+      * @param type target type
 -     * @param <T>        type
++     * @param <T>  type
       * @return the found instances, null otherwise
       */
      public static <T> Map<String, T> list(String name, Class<T> type)