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 2012/04/14 01:48:52 UTC
git commit: DELTASPIKE-67 easier implementation
Updated Branches:
refs/heads/master 1ced97b6d -> 63088617d
DELTASPIKE-67 easier implementation
of custom project-stages
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/63088617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/63088617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/63088617
Branch: refs/heads/master
Commit: 63088617d0e51db92a423e49ef8de8cbf2e9212e
Parents: 1ced97b
Author: gpetracek <gp...@apache.org>
Authored: Sat Apr 14 01:31:20 2012 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Sat Apr 14 01:43:11 2012 +0200
----------------------------------------------------------------------
.../impl/exclude/CustomProjectStageBeanFilter.java | 28 +++++++++++++++
.../impl/exclude/extension/ExcludeExtension.java | 27 +++++++++++++-
.../core/api/projectstage/TestProjectStages.java | 1 -
3 files changed, 53 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/63088617/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/CustomProjectStageBeanFilter.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/CustomProjectStageBeanFilter.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/CustomProjectStageBeanFilter.java
new file mode 100644
index 0000000..a996a56
--- /dev/null
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/CustomProjectStageBeanFilter.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.core.impl.exclude;
+
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+
+/**
+ * Allows to deactivate the autom. filtering of custom project-stages -> @Typed() needs to be used manually
+ */
+public interface CustomProjectStageBeanFilter extends Deactivatable
+{
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/63088617/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index b132c22..c285b38 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -21,6 +21,7 @@ package org.apache.deltaspike.core.impl.exclude.extension;
import org.apache.deltaspike.core.api.config.ConfigResolver;
import org.apache.deltaspike.core.api.exclude.annotation.Exclude;
import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
+import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.api.interpreter.ExpressionInterpreter;
@@ -61,6 +62,7 @@ public class ExcludeExtension implements Extension, Deactivatable
private Boolean isActivated = null;
private Boolean isGlobalAlternativeActivated = null;
+ private Boolean isCustomProjectStageBeanFilterActivated = null;
/**
* triggers initialization in any case
@@ -96,6 +98,11 @@ public class ExcludeExtension implements Extension, Deactivatable
}
}
+ if (this.isCustomProjectStageBeanFilterActivated)
+ {
+ vetoCustomProjectStageBeans(processAnnotatedType);
+ }
+
if (!this.isActivated)
{
return;
@@ -131,6 +138,16 @@ public class ExcludeExtension implements Extension, Deactivatable
evalExcludeWithExpression(processAnnotatedType, exclude);
}
+ protected void vetoCustomProjectStageBeans(ProcessAnnotatedType<Object> processAnnotatedType)
+ {
+ //currently there is a veto for all project-stage implementations,
+ //but we still need @Typed() for the provided implementations in case of the deactivation of this behaviour
+ if (ProjectStage.class.isAssignableFrom(processAnnotatedType.getAnnotatedType().getJavaClass()))
+ {
+ processAnnotatedType.veto();
+ }
+ }
+
private void activateGlobalAlternativesWeld(ProcessAnnotatedType<Object> processAnnotatedType,
BeanManager beanManager)
{
@@ -495,8 +512,14 @@ public class ExcludeExtension implements Extension, Deactivatable
{
if (isActivated == null)
{
- isActivated = ClassDeactivationUtils.isActivated(getClass());
- isGlobalAlternativeActivated = ClassDeactivationUtils.isActivated(GlobalAlternative.class);
+ isActivated =
+ ClassDeactivationUtils.isActivated(getClass());
+
+ isGlobalAlternativeActivated =
+ ClassDeactivationUtils.isActivated(GlobalAlternative.class);
+
+ isCustomProjectStageBeanFilterActivated =
+ ClassDeactivationUtils.isActivated(CustomProjectStageBeanFilter.class);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/63088617/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/TestProjectStages.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/TestProjectStages.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/TestProjectStages.java
index 4f0f37d..81d604b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/TestProjectStages.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/TestProjectStages.java
@@ -34,7 +34,6 @@ import javax.enterprise.inject.Typed;
*/
public class TestProjectStages implements ProjectStageHolder
{
- @Typed()
public static final class CustomProjectStage extends ProjectStage
{
private static final long serialVersionUID = 1029095387976167179L;