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/03/27 07:30:43 UTC
git commit: DELTASPIKE-130 updated test config
Updated Branches:
refs/heads/master ab75c8d45 -> a8d3e552c
DELTASPIKE-130 updated test config
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/a8d3e552
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/a8d3e552
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/a8d3e552
Branch: refs/heads/master
Commit: a8d3e552c809156b610214490ce6b230051859f0
Parents: ab75c8d
Author: gpetracek <gp...@apache.org>
Authored: Tue Mar 27 07:28:15 2012 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Tue Mar 27 07:28:15 2012 +0200
----------------------------------------------------------------------
.../core/api/exclude/ExcludeIntegrationTest.java | 2 -
.../IntegrationTestProjectStageProducer.java | 40 ---------------
.../META-INF/apache-deltaspike.properties | 2 +-
3 files changed, 1 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/a8d3e552/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
index 1bc82b6..49b18dd 100644
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java
@@ -23,7 +23,6 @@ import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.integration.core.api.projectstage.IntegrationTestProjectStageProducer;
import org.apache.deltaspike.test.category.WebProfileCategory;
import org.apache.deltaspike.test.core.api.exclude.AlwaysActiveBean;
import org.apache.deltaspike.test.core.api.exclude.CustomExpressionBasedBean;
@@ -83,7 +82,6 @@ public class ExcludeIntegrationTest
return ShrinkWrap.create(WebArchive.class, "excludeIntegration.war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
.addAsLibraries(testJar)
- .addClass(IntegrationTestProjectStageProducer.class)
.addAsResource(FileUtils.getFileForURL(deltaSpikeConfig.toString()),
"META-INF/apache-deltaspike.properties")
.addAsResource(FileUtils.getFileForURL(testExtensionsFileUrl.toString()),
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/a8d3e552/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/projectstage/IntegrationTestProjectStageProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/projectstage/IntegrationTestProjectStageProducer.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/projectstage/IntegrationTestProjectStageProducer.java
deleted file mode 100644
index 8bccbfc..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/projectstage/IntegrationTestProjectStageProducer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* 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.integration.core.api.projectstage;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-
-import javax.enterprise.inject.Typed;
-
-/**
- * Custom {@link org.apache.deltaspike.core.util.ProjectStageProducer} which sets the project-stage to integration-test as soon as it gets used.
- * It's configured in apache-deltaspike.properties and e.g. used by ExcludeIntegrationTest
- */
-@Typed()
-public class IntegrationTestProjectStageProducer extends ProjectStageProducer
-{
- /**
- * {@inheritDoc}
- */
- public IntegrationTestProjectStageProducer()
- {
- setProjectStage(ProjectStage.IntegrationTest);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/a8d3e552/deltaspike/core/integration-test/src/test/resources/META-INF/apache-deltaspike.properties
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/resources/META-INF/apache-deltaspike.properties b/deltaspike/core/integration-test/src/test/resources/META-INF/apache-deltaspike.properties
index 2c3c1c0..1957890 100644
--- a/deltaspike/core/integration-test/src/test/resources/META-INF/apache-deltaspike.properties
+++ b/deltaspike/core/integration-test/src/test/resources/META-INF/apache-deltaspike.properties
@@ -17,6 +17,6 @@
deltaspike_ordinal=1001
-org.apache.deltaspike.core.util.ProjectStageProducer=org.apache.deltaspike.integration.core.api.projectstage.IntegrationTestProjectStageProducer
+org.apache.deltaspike.ProjectStage=IntegrationTest
db=itDb