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 2012/07/12 00:54:26 UTC
git commit: DELTASPIKE-235 add categories to @Deployment in any case
Updated Branches:
refs/heads/master 351e384eb -> 390efbd3c
DELTASPIKE-235 add categories to @Deployment in any case
We had too many broken @Deployment which missed the SeCategory
for example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/390efbd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/390efbd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/390efbd3
Branch: refs/heads/master
Commit: 390efbd3ce7eb0a02e016dc6fa4136057e12ecff
Parents: 351e384
Author: Mark Struberg <st...@apache.org>
Authored: Thu Jul 12 00:53:16 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Jul 12 00:53:16 2012 +0200
----------------------------------------------------------------------
.../alternative/global/GlobalAlternativeTest.java | 1 -
.../api/alternative/local/BdaAlternativeTest.java | 1 -
.../injectable/InjectableConfigPropertyTest.java | 1 -
.../PropertyConfigSourceTest.java | 1 -
.../test/core/api/exclude/ExcludeTest.java | 1 -
.../test/core/api/message/MinimalMessagesTest.java | 1 -
.../test/core/impl/util/JndiUtilsTest.java | 1 -
.../apache/deltaspike/test/util/ArchiveUtils.java | 3 ++-
8 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
index 5d995b0..63ba281 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
@@ -70,7 +70,6 @@ public class GlobalAlternativeTest
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeIntegrationTest.jar")
.addPackage(GlobalAlternativeTest.class.getPackage())
.addPackage(QualifierA.class.getPackage())
- .addPackage(SeCategory.class.getPackage())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
return ShrinkWrap.create(WebArchive.class, "globalAlternative.war")
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
index d56ced6..3ec1200 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
@@ -54,7 +54,6 @@ public class BdaAlternativeTest
public static WebArchive deploy()
{
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "securedAnnotationTest.jar")
- .addPackage(SeCategory.class.getPackage())
.addPackage(BdaAlternativeTest.class.getPackage())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
index 7907393..4e67f78 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
@@ -54,7 +54,6 @@ public class InjectableConfigPropertyTest
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "injectableConfigPropertyTest.jar")
.addPackage(SettingsBean.class.getPackage())
.addPackage(NumberConfiguredBean.class.getPackage())
- .addPackage(SeCategory.class.getPackage())
.addAsManifestResource(FileUtils.getFileForURL(fileUrl.toString()))
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java
index f09f533..cfbcfda 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java
@@ -45,7 +45,6 @@ public class PropertyConfigSourceTest
public static WebArchive deploy()
{
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "PropertyConfigSourceTest.jar")
- .addPackage(SeCategory.class.getPackage())
.addPackage(PropertyConfigSourceTest.class.getPackage())
.addAsResource(CONFIG_FILE_NAME)
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
index fe25671..f618aef 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java
@@ -58,7 +58,6 @@ public class ExcludeTest
.getResource("META-INF/apache-deltaspike.properties");
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeTest.jar")
- .addPackage(SeCategory.class.getPackage())
.addPackage(ExcludeTest.class.getPackage())
.addPackage(TestClassDeactivator.class.getPackage())
.addAsManifestResource(FileUtils.getFileForURL(fileUrl.toString()))
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
index 4807c44..f089370 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
@@ -66,7 +66,6 @@ public class MinimalMessagesTest
.addAsLibraries(testJar)
.addAsResource("customMinimalMessage_en.properties")
.addAsResource("org/apache/deltaspike/test/core/api/message/MinimalMessages_en.properties")
- .addPackage(SeCategory.class.getPackage())
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsServiceProvider(Extension.class,
MessageBundleExtension.class);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
index 69cd5bb..b7205ef 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
@@ -44,7 +44,6 @@ public class JndiUtilsTest
public static WebArchive deploy()
{
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "jndiTest.jar")
- .addPackage(SeCategory.class.getPackage())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
return ShrinkWrap.create(WebArchive.class, "jndiUtils.war")
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/390efbd3/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
index 83163fa..a16c1dc 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
@@ -35,6 +35,7 @@ public class ArchiveUtils
{
return ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[]{"org.apache.deltaspike.core"}, excludedPackagesOrFiles);
+ new String[]{"org.apache.deltaspike.core", "org.apache.deltaspike.test.category"},
+ excludedPackagesOrFiles);
}
}