svn commit: r899376 - in /websites/staging/deltaspike/trunk/content: ./ index.html
Author: buildbot Date: Thu Feb 27 09:16:10 2014 New Revision: 899376 Log: Staging update by buildbot for deltaspike Modified: websites/staging/deltaspike/trunk/content/ (props changed) websites/staging/deltaspike/trunk/content/index.html Propchange: websites/staging/deltaspike/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Feb 27 09:16:10 2014 @@ -1 +1 @@ -1570223 +1572478 Modified: websites/staging/deltaspike/trunk/content/index.html == --- websites/staging/deltaspike/trunk/content/index.html (original) +++ websites/staging/deltaspike/trunk/content/index.html Thu Feb 27 09:16:10 2014 @@ -87,7 +87,7 @@ img src=resources/images/deltaspike-3words.png/p/p img src=resources/images/ds-logo.png width=350 height=250/p/p pDeltaSpike consist of a number of portable CDI extensions that provide useful features for Java application developers./p -pWe will also ensure true portability! We are testing DeltaSpike on different CDI implementations like Apache OpenWebBeans and JBoss Weld, and also on different Java EE servers like Apache Tomcat and TomEE, JBoss-AS7, Oracle GlassFish 3.1+, IBM Websphere 8.x, Oracle Weblogic Server 12c, Jetty, and others./p +pWe will also ensure true portability! We are testing DeltaSpike on different CDI implementations like Apache OpenWebBeans and JBoss Weld, and also on different Java EE servers like Apache Tomcat and TomEE, JBoss-AS7, JBoss WildFly8, Oracle GlassFish 3.1+ and 4.x+, IBM Websphere 8.x, Oracle Weblogic Server 12c, Jetty, and others./p !-- pa class=btn btn-primary btn-largeLearn more »/a/p -- /div
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Security-Module Impl #146
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-security-module-impl/changes
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike JSF-Module Impl #146
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-jsf-module-impl/changes
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Scheduler-Module Impl #146
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-scheduler-module-impl/changes
svn commit: r899392 - in /websites/staging/deltaspike/trunk/content: ./ spi.html
Author: buildbot Date: Thu Feb 27 11:11:44 2014 New Revision: 899392 Log: Staging update by buildbot for deltaspike Modified: websites/staging/deltaspike/trunk/content/ (props changed) websites/staging/deltaspike/trunk/content/spi.html Propchange: websites/staging/deltaspike/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Feb 27 11:11:44 2014 @@ -1 +1 @@ -1572478 +1572515 Modified: websites/staging/deltaspike/trunk/content/spi.html == --- websites/staging/deltaspike/trunk/content/spi.html (original) +++ websites/staging/deltaspike/trunk/content/spi.html Thu Feb 27 11:11:44 2014 @@ -124,7 +124,7 @@ DeltaSpike itself doesn't deactivate an pA class-deactivator will be resolved from the environment via the default resolvers or via a custom resolver which allows to use any type of configuration-format. -(see codeorg.apache.deltaspike.core.api.config.ConfigResolver/code). The key is the fully qualified name of the interface (codeorg.apache.deltaspike.core.api.activation.ClassDeactivator/code)./p +(see codeorg.apache.deltaspike.core.api.config.ConfigResolver/code). The key is the fully qualified name of the interface (codeorg.apache.deltaspike.core.spi.activation.ClassDeactivator/code)./p h1 id=configsourceConfigSource/h1 p[TODO]/p h2 id=configsourceproviderConfigSourceProvider/h2
svn commit: r899393 - /websites/production/deltaspike/content/
Author: gpetracek Date: Thu Feb 27 11:16:50 2014 New Revision: 899393 Log: Publishing svnmucc operation to deltaspike site by gpetracek Added: websites/production/deltaspike/content/ - copied from r899392, websites/staging/deltaspike/trunk/content/
git commit: DELTASPIKE-530 deactivatable extensions
Repository: deltaspike
Updated Branches:
refs/heads/master ab5105bd5 - 303507d6b
DELTASPIKE-530 deactivatable extensions
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/303507d6
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/303507d6
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/303507d6
Branch: refs/heads/master
Commit: 303507d6b9bc385699dc926e0ffa5b73737d9f89
Parents: ab5105b
Author: gpetracek gpetra...@apache.org
Authored: Thu Feb 27 12:20:58 2014 +0100
Committer: gpetracek gpetra...@apache.org
Committed: Thu Feb 27 12:21:42 2014 +0100
--
.../impl/scope/DeltaSpikeContextExtension.java | 22 +++-
.../data/impl/RepositoryExtension.java | 22 +++-
2 files changed, 42 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/303507d6/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
--
diff --git
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
index 2e74c0f..536866b 100644
---
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
+++
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
@@ -22,6 +22,7 @@ import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import org.apache.deltaspike.core.api.provider.BeanProvider;
@@ -30,19 +31,33 @@ import
org.apache.deltaspike.core.impl.scope.conversation.GroupedConversationCon
import org.apache.deltaspike.core.impl.scope.window.WindowBeanHolder;
import org.apache.deltaspike.core.impl.scope.window.WindowContextImpl;
import org.apache.deltaspike.core.impl.scope.window.WindowIdHolder;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.util.ClassDeactivationUtils;
/**
* Handle all DeltaSpike WindowContext and ConversationContext
* related features.
*/
-public class DeltaSpikeContextExtension implements Extension
+public class DeltaSpikeContextExtension implements Extension, Deactivatable
{
private WindowContextImpl windowContext;
private GroupedConversationContext conversationContext;
+private Boolean isActivated = true;
+
+protected void init(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
+{
+isActivated = ClassDeactivationUtils.isActivated(getClass());
+}
+
public void registerDeltaSpikeContexts(@Observes AfterBeanDiscovery
afterBeanDiscovery, BeanManager beanManager)
{
+if (!isActivated)
+{
+return;
+}
+
windowContext = new WindowContextImpl(beanManager);
conversationContext = new GroupedConversationContext(beanManager,
windowContext);
afterBeanDiscovery.addContext(windowContext);
@@ -56,6 +71,11 @@ public class DeltaSpikeContextExtension implements Extension
*/
public void initializeDeltaSpikeContexts(@Observes
AfterDeploymentValidation adv, BeanManager beanManager)
{
+if (!isActivated)
+{
+return;
+}
+
WindowBeanHolder windowBeanHolder =
BeanProvider.getContextualReference(beanManager,
WindowBeanHolder.class, false);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/303507d6/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
--
diff --git
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
index ef098fd..7890942 100755
---
a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
+++
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
@@ -32,6 +32,8 @@ import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike BeanValidation-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-bean-validation-module-impl/147/
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Scheduler-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-scheduler-module-impl/147/
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Servlet-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-servlet-module-impl/changes
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Core-Implementation #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.core$deltaspike-core-impl/changes
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Partial-Bean-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-partial-bean-module-impl/147/
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike JSF-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-jsf-module-impl/changes
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Security-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-security-module-impl/147/
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/changes
Jenkins build is still unstable: DeltaSpike_TomEE-SNAPSHOT » Apache DeltaSpike Data-Module Impl #147
See https://builds.apache.org/job/DeltaSpike_TomEE-SNAPSHOT/org.apache.deltaspike.modules$deltaspike-data-module-impl/changes
Jenkins build became unstable: DeltaSpike Weld 1.1.5 » Apache DeltaSpike CDI Weld-ContainerControl #101
See https://builds.apache.org/job/DeltaSpike%20Weld%201.1.5/org.apache.deltaspike.cdictrl$deltaspike-cdictrl-weld/101/changes
Jenkins build became unstable: DeltaSpike OWB 1.1.6 » Apache DeltaSpike CDI OpenEJB-ContainerControl #57
See https://builds.apache.org/job/DeltaSpike%20OWB%201.1.6/org.apache.deltaspike.cdictrl$deltaspike-cdictrl-openejb/57/
Jenkins build became unstable: DeltaSpike OWB 1.1.6 #57
See https://builds.apache.org/job/DeltaSpike%20OWB%201.1.6/57/changes
Jenkins build became unstable: DeltaSpike Weld 2.0.0.SP1 » Apache DeltaSpike CDI Weld-ContainerControl #34
See https://builds.apache.org/job/DeltaSpike%20Weld%202.0.0.SP1/org.apache.deltaspike.cdictrl$deltaspike-cdictrl-weld/34/changes
Jenkins build became unstable: DeltaSpike Weld 2.0.0.SP1 #34
See https://builds.apache.org/job/DeltaSpike%20Weld%202.0.0.SP1/34/changes
[1/2] git commit: DELTASPIKE-487 removed unused logic
Repository: deltaspike
Updated Branches:
refs/heads/master 2983608b2 - 4ff33b15b
DELTASPIKE-487 removed unused logic
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8d23e100
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8d23e100
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8d23e100
Branch: refs/heads/master
Commit: 8d23e100b3603eb31d2d3b77d7bbb9c775b270b9
Parents: 2983608
Author: tommy tommy@tommy-notebook
Authored: Thu Feb 27 23:29:57 2014 +0100
Committer: tommy tommy@tommy-notebook
Committed: Thu Feb 27 23:29:57 2014 +0100
--
.../impl/scope/viewaccess/ViewAccessContext.java | 15 ++-
.../viewaccess/ViewAccessScopedBeanHistory.java | 12
.../listener/request/DeltaSpikeLifecycleWrapper.java | 2 +-
3 files changed, 3 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8d23e100/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
--
diff --git
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
index ba6d90c..701e4d0 100644
---
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
+++
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
@@ -19,8 +19,6 @@
package org.apache.deltaspike.core.impl.scope.viewaccess;
import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.spi.Contextual;
@@ -115,28 +113,19 @@ public class ViewAccessContext extends AbstractContext
destroyExpiredBeans();
// clear list from last request
-ListString lastAccessedBeans =
viewAccessScopedBeanHistory.getLastAccessedBeans();
-lastAccessedBeans.clear();
-
-// move used beans from this request to last request
-
viewAccessScopedBeanHistory.setLastAccessedBeans(viewAccessScopedBeanHistory.getAccessedBeans());
-viewAccessScopedBeanHistory.setAccessedBeans(lastAccessedBeans);
+viewAccessScopedBeanHistory.getAccessedBeans().clear();
}
}
private void destroyExpiredBeans()
{
-ListString usedBeans = new ArrayListString();
-usedBeans.addAll(viewAccessScopedBeanHistory.getAccessedBeans());
-usedBeans.addAll(viewAccessScopedBeanHistory.getLastAccessedBeans());
-
ContextualStorage storage =
viewAccessScopedBeanHolder.getContextualStorage(beanManager,
getCurrentWindowId(), false);
if (storage != null)
{
for (Map.EntryObject, ContextualInstanceInfo? storageEntry :
storage.getStorage().entrySet())
{
-if (!usedBeans.contains((String) storageEntry.getKey()))
+if
(!viewAccessScopedBeanHistory.getAccessedBeans().contains((String)
storageEntry.getKey()))
{
Contextual bean = storage.getBean(storageEntry.getKey());
AbstractContext.destroyBean(bean, storageEntry.getValue());
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8d23e100/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
--
diff --git
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
index b422f07..06ddbe9 100644
---
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
+++
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
@@ -30,13 +30,11 @@ public class ViewAccessScopedBeanHistory implements
Serializable
private static final long serialVersionUID = 3617603930728148927L;
private ListString accessedBeans;
-private ListString lastAccessedBeans;
private String lastView;
public ViewAccessScopedBeanHistory()
{
accessedBeans = new ArrayListString();
-lastAccessedBeans = new ArrayListString();
}
public ListString getAccessedBeans()
@@ -49,16 +47,6 @@ public class
[2/2] git commit: DELTASPIKE-487 removed unused logic
DELTASPIKE-487 removed unused logic
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/4ff33b15
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/4ff33b15
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/4ff33b15
Branch: refs/heads/master
Commit: 4ff33b15b056f76354d8b06ed05f9795094d2f1e
Parents: 8d23e10
Author: tandraschko tandrasc...@apache.org
Authored: Thu Feb 27 23:37:20 2014 +0100
Committer: tandraschko tandrasc...@apache.org
Committed: Thu Feb 27 23:37:20 2014 +0100
--
.../impl/scope/viewaccess/ViewAccessContext.java | 15 +--
.../viewaccess/ViewAccessScopedBeanHistory.java | 12
.../listener/request/DeltaSpikeLifecycleWrapper.java | 2 +-
3 files changed, 26 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4ff33b15/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
--
diff --git
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
index 701e4d0..ba6d90c 100644
---
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
+++
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
@@ -19,6 +19,8 @@
package org.apache.deltaspike.core.impl.scope.viewaccess;
import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.spi.Contextual;
@@ -113,19 +115,28 @@ public class ViewAccessContext extends AbstractContext
destroyExpiredBeans();
// clear list from last request
-viewAccessScopedBeanHistory.getAccessedBeans().clear();
+ListString lastAccessedBeans =
viewAccessScopedBeanHistory.getLastAccessedBeans();
+lastAccessedBeans.clear();
+
+// move used beans from this request to last request
+
viewAccessScopedBeanHistory.setLastAccessedBeans(viewAccessScopedBeanHistory.getAccessedBeans());
+viewAccessScopedBeanHistory.setAccessedBeans(lastAccessedBeans);
}
}
private void destroyExpiredBeans()
{
+ListString usedBeans = new ArrayListString();
+usedBeans.addAll(viewAccessScopedBeanHistory.getAccessedBeans());
+usedBeans.addAll(viewAccessScopedBeanHistory.getLastAccessedBeans());
+
ContextualStorage storage =
viewAccessScopedBeanHolder.getContextualStorage(beanManager,
getCurrentWindowId(), false);
if (storage != null)
{
for (Map.EntryObject, ContextualInstanceInfo? storageEntry :
storage.getStorage().entrySet())
{
-if
(!viewAccessScopedBeanHistory.getAccessedBeans().contains((String)
storageEntry.getKey()))
+if (!usedBeans.contains((String) storageEntry.getKey()))
{
Contextual bean = storage.getBean(storageEntry.getKey());
AbstractContext.destroyBean(bean, storageEntry.getValue());
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4ff33b15/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
--
diff --git
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
index 06ddbe9..b422f07 100644
---
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
+++
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessScopedBeanHistory.java
@@ -30,11 +30,13 @@ public class ViewAccessScopedBeanHistory implements
Serializable
private static final long serialVersionUID = 3617603930728148927L;
private ListString accessedBeans;
+private ListString lastAccessedBeans;
private String lastView;
public ViewAccessScopedBeanHistory()
{
accessedBeans = new ArrayListString();
+lastAccessedBeans = new ArrayListString();
}
public ListString getAccessedBeans()
@@ -47,6 +49,16 @@ public class ViewAccessScopedBeanHistory implements
Serializable
git commit: DELTASPIKE-487 removed unused logic (thanks netbeans for destroying my workspace)
Repository: deltaspike
Updated Branches:
refs/heads/master e0acd5c76 - 9f59afca6
DELTASPIKE-487 removed unused logic (thanks netbeans for destroying my
workspace)
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9f59afca
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9f59afca
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9f59afca
Branch: refs/heads/master
Commit: 9f59afca6df252229c1c7f1bee89f2f44e022750
Parents: e0acd5c
Author: tandraschko tandrasc...@apache.org
Authored: Thu Feb 27 23:51:14 2014 +0100
Committer: tandraschko tandrasc...@apache.org
Committed: Thu Feb 27 23:51:14 2014 +0100
--
.../core/util/ClassDeactivationUtils.java | 207 ++-
.../request/DeltaSpikeLifecycleWrapper.java | 2 +-
2 files changed, 114 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9f59afca/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
--
diff --git
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
index ef8ef57..a69f730 100644
---
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
+++
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
@@ -16,142 +16,161 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.deltaspike.jsf.impl.listener.request;
+package org.apache.deltaspike.core.util;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.spi.scope.window.WindowContext;
-import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import org.apache.deltaspike.jsf.spi.scope.window.ClientWindow;
+import org.apache.deltaspike.core.api.config.ConfigResolver;
+import org.apache.deltaspike.core.spi.activation.ClassDeactivator;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
-import org.apache.deltaspike.core.impl.scope.viewaccess.ViewAccessContext;
+import javax.enterprise.inject.Typed;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
-class DeltaSpikeLifecycleWrapper extends Lifecycle
+/**
+ * Helper methods for {@link ClassDeactivator}
+ */
+@Typed()
+public abstract class ClassDeactivationUtils
{
-private final Lifecycle wrapped;
-
-private JsfRequestBroadcaster jsfRequestBroadcaster;
-
-private ClientWindow clientWindow;
-private WindowContext windowContext;
-private DeltaSpikeContextExtension contextExtension;
+private static final Logger LOG =
Logger.getLogger(ClassDeactivationUtils.class.getName());
-private volatile Boolean initialized;
+/**
+ * This Map holds the ClassLoader as first level to make it possible to
have different configurations per
+ * WebApplication in an EAR or other Multi-ClassLoader scenario.
+ *
+ * The Map then contains a List of {@link ClassDeactivator}s in order of
their configured ordinal.
+ */
+private static MapClassLoader, ListClassDeactivator classDeactivatorMap
+= new ConcurrentHashMapClassLoader, ListClassDeactivator();
-DeltaSpikeLifecycleWrapper(Lifecycle wrapped)
+/**
+ * Cache for the result. It won't contain many classes but it might be
accessed frequently.
+ * Valid entries are only true or false. If an entry isn't available or
null, it gets calculated.
+ */
+private static MapClass? extends Deactivatable, Boolean
activationStatusCache
+= new ConcurrentHashMapClass? extends Deactivatable, Boolean();
+
+private ClassDeactivationUtils()
{
-this.wrapped = wrapped;
+// prevent instantiation
}
-Lifecycle getWrapped()
+/**
+ * Evaluates if the given {@link Deactivatable} is active.
+ *
+ * @param targetClass {@link Deactivatable} under test.
+ * @return codetrue/code if it is active, codefalse/code otherwise
+ */
+public static boolean isActivated(Class? extends Deactivatable
targetClass)
{
-return wrapped;
-}
+Boolean activatedClassCacheEntry =
activationStatusCache.get(targetClass);
-@Override
-public void addPhaseListener(PhaseListener phaseListener)
-{
-
Build failed in Jenkins: DeltaSpike Weld 1.1.18 #1
See https://builds.apache.org/job/DeltaSpike%20Weld%201.1.18/1/ -- Started by timer Building remotely on ubuntu3 in workspace https://builds.apache.org/job/DeltaSpike%20Weld%201.1.18/ws/ Cloning the remote Git repository Cloning repository https://git-wip-us.apache.org/repos/asf/deltaspike.git Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/deltaspike.git Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/deltaspike.git Checking out Revision 9f59afca6df252229c1c7f1bee89f2f44e022750 (origin/master) First time build. Skipping changelog. Parsing POMs Discovered a new module org.apache.deltaspike:deltaspike-project Apache DeltaSpike Discovered a new module org.apache.deltaspike:checkstyle-rules Apache DeltaSpike CheckStyle-rules Discovered a new module org.apache.deltaspike:parent Apache DeltaSpike Parent Discovered a new module org.apache.deltaspike:parent-code Apache DeltaSpike Code Parent Discovered a new module org.apache.deltaspike.test:test-utils Apache DeltaSpike Test-Utils Discovered a new module org.apache.deltaspike.core:core-project Apache DeltaSpike Core Discovered a new module org.apache.deltaspike.core:deltaspike-core-api Apache DeltaSpike Core-API Discovered a new module org.apache.deltaspike.core:deltaspike-core-impl Apache DeltaSpike Core-Implementation Discovered a new module org.apache.deltaspike.cdictrl:cdictrl-project Apache DeltaSpike ContainerControl parent Discovered a new module org.apache.deltaspike.cdictrl:deltaspike-cdictrl-api Apache DeltaSpike CDI ContainerControl API Discovered a new module org.apache.deltaspike.test:deltaspike-cdictrl-tck Apache DeltaSpike CDI ContainerControl TCK Discovered a new module org.apache.deltaspike.cdictrl:deltaspike-cdictrl-owb Apache DeltaSpike CDI OWB-ContainerControl Discovered a new module org.apache.deltaspike.cdictrl:deltaspike-cdictrl-weld Apache DeltaSpike CDI Weld-ContainerControl Discovered a new module org.apache.deltaspike.cdictrl:deltaspike-cdictrl-openejb Apache DeltaSpike CDI OpenEJB-ContainerControl Discovered a new module org.apache.deltaspike.modules:modules-project Apache DeltaSpike Modules Discovered a new module org.apache.deltaspike.modules:security-module-project Apache DeltaSpike Security-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-security-module-api Apache DeltaSpike Security-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-security-module-impl Apache DeltaSpike Security-Module Impl Discovered a new module org.apache.deltaspike.modules:jpa-module-project Apache DeltaSpike JPA-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-jpa-module-api Apache DeltaSpike JPA-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-jpa-module-impl Apache DeltaSpike JPA-Module Impl Discovered a new module org.apache.deltaspike.modules:servlet-module-project Apache DeltaSpike Servlet-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-servlet-module-api Apache DeltaSpike Servlet-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-servlet-module-impl Apache DeltaSpike Servlet-Module Impl Discovered a new module org.apache.deltaspike.modules:jsf-module-project Apache DeltaSpike JSF-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-jsf-module-api Apache DeltaSpike JSF-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-jsf-module-impl Apache DeltaSpike JSF-Module Impl Discovered a new module org.apache.deltaspike.modules:partial-bean-module-project Apache DeltaSpike Partial-Bean-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-partial-bean-module-api Apache DeltaSpike Partial-Bean-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-partial-bean-module-impl Apache DeltaSpike Partial-Bean-Module Impl Discovered a new module org.apache.deltaspike.modules:bean-validation-module-project Apache DeltaSpike BeanValidation-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-bean-validation-module-api Apache DeltaSpike BeanValidation-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-bean-validation-module-impl Apache DeltaSpike BeanValidation-Module Impl Discovered a new module org.apache.deltaspike.modules:data-module-project Apache DeltaSpike Data-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-data-module-api Apache DeltaSpike Data-Module API Discovered a new module org.apache.deltaspike.modules:deltaspike-data-module-impl Apache DeltaSpike Data-Module Impl Discovered a new module org.apache.deltaspike.modules:scheduler-module-project Apache DeltaSpike Scheduler-Module Discovered a new module org.apache.deltaspike.modules:deltaspike-scheduler-module-api Apache DeltaSpike Scheduler-Module API Discovered a new module
Jenkins build became unstable: DeltaSpike OWB 1.1.4 » Apache DeltaSpike CDI OpenEJB-ContainerControl #96
See https://builds.apache.org/job/DeltaSpike%20OWB%201.1.4/org.apache.deltaspike.cdictrl$deltaspike-cdictrl-openejb/96/
Jenkins build became unstable: DeltaSpike OWB 1.1.4 #96
See https://builds.apache.org/job/DeltaSpike%20OWB%201.1.4/96/changes
Jenkins build became unstable: DeltaSpike_TomEE » Apache DeltaSpike Data-Module Impl #297
See https://builds.apache.org/job/DeltaSpike_TomEE/org.apache.deltaspike.modules$deltaspike-data-module-impl/297/changes
Jenkins build became unstable: DeltaSpike_TomEE #297
See https://builds.apache.org/job/DeltaSpike_TomEE/297/changes
Build failed in Jenkins: DeltaSpike Weld 2.0.4 » Apache DeltaSpike Core-Implementation #46
See https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/org.apache.deltaspike.core$deltaspike-core-impl/46/changes Changes: [gpetracek] DELTASPIKE-527 @Named support for type-safe messages (first draft) [gpetracek] DELTASPIKE-530 deactivatable extensions [tandraschko] DELTASPIKE-487 ViewAccessScoped prototype [tommy] DELTASPIKE-487 removed unused logic [tandraschko] DELTASPIKE-487 removed unused logic [tandraschko] DELTASPIKE-487 removed unused logic (thanks netbeans) -- [INFO] [INFO] [INFO] Building Apache DeltaSpike Core-Implementation 0.6-SNAPSHOT [INFO] [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ deltaspike-core-impl --- [INFO] [INFO] --- maven-bundle-plugin:2.3.7:cleanVersions (versions) @ deltaspike-core-impl --- [INFO] [INFO] --- maven-antrun-plugin:1.6:run (javadoc.resources) @ deltaspike-core-impl --- [WARNING] Parameter tasks is deprecated, use target instead [INFO] Executing tasks main: [INFO] Executed tasks [INFO] [INFO] --- maven-remote-resources-plugin:1.3:process (process-remote-resources) @ deltaspike-core-impl --- [INFO] [INFO] --- maven-remote-resources-plugin:1.3:process (default) @ deltaspike-core-impl --- [INFO] [INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ deltaspike-core-impl --- [debug] execute contextualize [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:2.5:compile (default-compile) @ deltaspike-core-impl --- [INFO] Compiling 66 source files to https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/org.apache.deltaspike.core$deltaspike-core-impl/ws/target/classes [INFO] - [ERROR] COMPILATION ERROR : [INFO] - [ERROR] https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/org.apache.deltaspike.core$deltaspike-core-impl/ws/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java:[41,16] error: error while writing JndiUtils: could not create parent directories [INFO] 1 error [INFO] -
Build failed in Jenkins: DeltaSpike Weld 2.0.4 #46
See https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/46/changes Changes: [tandraschko] DELTASPIKE-341 Bridge between JSF and DS Exception Handling [tandraschko] DELTASPIKE-341 cache exception qualifier [gpetracek] DELTASPIKE-515 MockedJsfTestContainerAdapter [gpetracek] DELTASPIKE-524 preserve view-parameters [gpetracek] DELTASPIKE-525 unification of @Initialized and @Destroyed [gpetracek] DELTASPIKE-526 updated pom.xml files [gpetracek] DELTASPIKE-527 @Named support for type-safe messages (first draft) [tandraschko] DELTASPIKE-529 fixed initialization in non-EE environment [gpetracek] DELTASPIKE-528 ContextController#stopApplicationScope fixed [gpetracek] DELTASPIKE-530 deactivatable extensions [Thomas.Hug] DELTASPIKE-420 Repository integration with TransactionStrategy [tommy] DELTASPIKE-529 better lazy init [tandraschko] DELTASPIKE-487 ViewAccessScoped prototype [tommy] DELTASPIKE-487 removed unused logic [tandraschko] DELTASPIKE-487 removed unused logic [tandraschko] DELTASPIKE-487 removed unused logic (thanks netbeans) [tandraschko] DELTASPIKE-487 removed unused logic (thanks netbeans for destroying my workspace) -- [...truncated 473 lines...] [INFO] META-INF/DISCLAIMER already added, skipping [INFO] META-INF/DEPENDENCIES already added, skipping [INFO] META-INF/NOTICE already added, skipping [INFO] META-INF already added, skipping [INFO] META-INF already added, skipping [INFO] META-INF/LICENSE already added, skipping [INFO] META-INF/DISCLAIMER already added, skipping [INFO] META-INF/DEPENDENCIES already added, skipping [INFO] META-INF/NOTICE already added, skipping [INFO] META-INF already added, skipping [INFO] META-INF/LICENSE already added, skipping [INFO] META-INF/DISCLAIMER already added, skipping [INFO] META-INF/DEPENDENCIES already added, skipping [INFO] META-INF/NOTICE already added, skipping [INFO] Building jar: https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/ws/deltaspike/core/api/target/deltaspike-core-api-0.6-SNAPSHOT-sources.jar [INFO] META-INF already added, skipping [INFO] META-INF/LICENSE already added, skipping [INFO] META-INF/DISCLAIMER already added, skipping [INFO] META-INF/DEPENDENCIES already added, skipping [INFO] META-INF/NOTICE already added, skipping [INFO] META-INF already added, skipping [INFO] META-INF already added, skipping [INFO] META-INF/LICENSE already added, skipping [INFO] META-INF/DISCLAIMER already added, skipping [INFO] META-INF/DEPENDENCIES already added, skipping [INFO] META-INF/NOTICE already added, skipping [INFO] META-INF already added, skipping [INFO] META-INF/LICENSE already added, skipping [INFO] META-INF/DISCLAIMER already added, skipping [INFO] META-INF/DEPENDENCIES already added, skipping [INFO] META-INF/NOTICE already added, skipping [INFO] [INFO] --- maven-checkstyle-plugin:2.9.1:check (verify-style) @ deltaspike-core-api --- [INFO] Starting audit... Audit done. [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ deltaspike-core-api --- [INFO] Installing https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/ws/deltaspike/core/api/target/deltaspike-core-api-0.6-SNAPSHOT.jar to /home/jenkins/jenkins-slave/maven-repositories/1/org/apache/deltaspike/core/deltaspike-core-api/0.6-SNAPSHOT/deltaspike-core-api-0.6-SNAPSHOT.jar [INFO] Installing https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/ws/deltaspike/core/api/pom.xml to /home/jenkins/jenkins-slave/maven-repositories/1/org/apache/deltaspike/core/deltaspike-core-api/0.6-SNAPSHOT/deltaspike-core-api-0.6-SNAPSHOT.pom [INFO] Installing https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/ws/deltaspike/core/api/target/deltaspike-core-api-0.6-SNAPSHOT-tests.jar to /home/jenkins/jenkins-slave/maven-repositories/1/org/apache/deltaspike/core/deltaspike-core-api/0.6-SNAPSHOT/deltaspike-core-api-0.6-SNAPSHOT-tests.jar [INFO] Installing https://builds.apache.org/job/DeltaSpike%20Weld%202.0.4/ws/deltaspike/core/api/target/deltaspike-core-api-0.6-SNAPSHOT-sources.jar to /home/jenkins/jenkins-slave/maven-repositories/1/org/apache/deltaspike/core/deltaspike-core-api/0.6-SNAPSHOT/deltaspike-core-api-0.6-SNAPSHOT-sources.jar [INFO] [INFO] --- maven-bundle-plugin:2.3.7:install (default-install) @ deltaspike-core-api --- [WARNING] Exception while updating local OBR: Unable to read repository xml: file:/home/jenkins/jenkins-slave/maven-repositories/1/repository.xml org.apache.maven.plugin.MojoExecutionException: Unable to read repository xml: file:/home/jenkins/jenkins-slave/maven-repositories/1/repository.xml at org.apache.felix.obrplugin.ObrUpdate.parseRepositoryXml(ObrUpdate.java:324) at org.apache.felix.obrplugin.ObrInstall.execute(ObrInstall.java:141) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) at
Jenkins build became unstable: DeltaSpike OWB 1.1.5 » Apache DeltaSpike CDI OpenEJB-ContainerControl #58
See https://builds.apache.org/job/DeltaSpike%20OWB%201.1.5/org.apache.deltaspike.cdictrl$deltaspike-cdictrl-openejb/58/
Jenkins build became unstable: DeltaSpike OWB 1.1.5 #58
See https://builds.apache.org/job/DeltaSpike%20OWB%201.1.5/58/changes
