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/01/17 13:08:22 UTC
git commit: DELTASPIKE-35 intermediate fix for the new approach
Updated Branches:
refs/heads/master cc349ce9c -> 80cad55dc
DELTASPIKE-35 intermediate fix for the new approach
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/80cad55d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/80cad55d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/80cad55d
Branch: refs/heads/master
Commit: 80cad55dc453510e0cbc06eb0cc45ac1afec1f78
Parents: cc349ce
Author: gpetracek <gp...@apache.org>
Authored: Tue Jan 17 13:06:43 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Tue Jan 17 13:07:26 2012 +0100
----------------------------------------------------------------------
.../test/category/FullProfileCategory.java | 27 +++++++++++++++
.../deltaspike/test/category/SeCategory.java | 27 +++++++++++++++
.../test/category/WebProfileCategory.java | 27 +++++++++++++++
deltaspike/core/integration-test/pom.xml | 1 +
.../integration/category/FullProfileCategory.java | 27 ---------------
.../integration/category/SeCategory.java | 27 ---------------
.../integration/category/WebProfileCategory.java | 27 ---------------
.../core/api/exclude/ExcludeIntegrationTest.java | 2 +-
deltaspike/parent/it/pom.xml | 12 +++---
9 files changed, 89 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/FullProfileCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/FullProfileCategory.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/FullProfileCategory.java
new file mode 100644
index 0000000..85fa586
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/FullProfileCategory.java
@@ -0,0 +1,27 @@
+/*
+ * 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.test.category;
+
+/**
+ * Category marker interface. Tests which are Full profile minimum.
+ */
+public interface FullProfileCategory
+{
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/SeCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/SeCategory.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/SeCategory.java
new file mode 100644
index 0000000..1cf75ae
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/SeCategory.java
@@ -0,0 +1,27 @@
+/*
+ * 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.test.category;
+
+/**
+ * Category marker interface. Tests which are SE bare minimum.
+ */
+public interface SeCategory
+{
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/WebProfileCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/WebProfileCategory.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/WebProfileCategory.java
new file mode 100644
index 0000000..4d5ab8b
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/category/WebProfileCategory.java
@@ -0,0 +1,27 @@
+/*
+ * 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.test.category;
+
+/**
+ * Category marker interface. Tests which are Web profile minimum.
+ */
+public interface WebProfileCategory
+{
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/pom.xml b/deltaspike/core/integration-test/pom.xml
index 9037674..de753fe 100644
--- a/deltaspike/core/integration-test/pom.xml
+++ b/deltaspike/core/integration-test/pom.xml
@@ -139,6 +139,7 @@
</goals>
<configuration>
<includes>**/*Test.class</includes>
+ <excludes>org.apache.deltaspike.test.core.api.projectstage.*</excludes>
<artifactItems>
<artifactItem>
<groupId>org.apache.deltaspike.core</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/FullProfileCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/FullProfileCategory.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/FullProfileCategory.java
deleted file mode 100644
index c997a6c..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/FullProfileCategory.java
+++ /dev/null
@@ -1,27 +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.category;
-
-/**
- * Category marker interface. Tests which are Full profile minimum.
- */
-public interface FullProfileCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/SeCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/SeCategory.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/SeCategory.java
deleted file mode 100644
index 428e9b9..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/SeCategory.java
+++ /dev/null
@@ -1,27 +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.category;
-
-/**
- * Category marker interface. Tests which are SE bare minimum.
- */
-public interface SeCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/WebProfileCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/WebProfileCategory.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/WebProfileCategory.java
deleted file mode 100644
index bfda1cf..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/category/WebProfileCategory.java
+++ /dev/null
@@ -1,27 +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.category;
-
-/**
- * Category marker interface. Tests which are Web profile minimum.
- */
-public interface WebProfileCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/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 4fbce76..c63a9ba 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
@@ -22,7 +22,7 @@ package org.apache.deltaspike.integration.core.api.exclude;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
-import org.apache.deltaspike.integration.category.SeCategory;
+import org.apache.deltaspike.test.category.SeCategory;
import org.apache.deltaspike.integration.core.api.projectstage.IntegrationTestProjectStageProducer;
import org.apache.deltaspike.test.core.api.exclude.AlwaysActiveBean;
import org.apache.deltaspike.test.core.api.exclude.CustomExpressionBasedBean;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/80cad55d/deltaspike/parent/it/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/it/pom.xml b/deltaspike/parent/it/pom.xml
index c050ab5..3fc86cd 100644
--- a/deltaspike/parent/it/pom.xml
+++ b/deltaspike/parent/it/pom.xml
@@ -189,9 +189,9 @@
</systemProperties>
<!-- Groups need to be setup for each profile -->
<groups>
- org.apache.deltaspike.integration.category.FullProfileCategory,
- org.apache.deltaspike.integration.category.WebProfileCategory,
- org.apache.deltaspike.integration.category.SeCategory
+ org.apache.deltaspike.test.category.FullProfileCategory,
+ org.apache.deltaspike.test.category.WebProfileCategory,
+ org.apache.deltaspike.test.category.SeCategory
</groups>
</configuration>
</plugin>
@@ -232,9 +232,9 @@
</systemProperties>
<!-- Groups need to be setup for each profile -->
<groups>
- org.apache.deltaspike.integration.category.FullProfileCategory,
- org.apache.deltaspike.integration.category.WebProfileCategory,
- org.apache.deltaspike.integration.category.SeCategory
+ org.apache.deltaspike.test.category.FullProfileCategory,
+ org.apache.deltaspike.test.category.WebProfileCategory,
+ org.apache.deltaspike.test.category.SeCategory
</groups>
</configuration>
</plugin>