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/10 12:33:51 UTC
git commit: DELTASPIKE-35 added beans.xml and cleanup
Updated Branches:
refs/heads/master c26a4285d -> 4362ba541
DELTASPIKE-35 added beans.xml and cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/4362ba54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/4362ba54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/4362ba54
Branch: refs/heads/master
Commit: 4362ba54143e3fbcae5da662aa18df8c725fcbd5
Parents: c26a428
Author: gpetracek <gp...@apache.org>
Authored: Tue Jan 10 12:30:47 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Tue Jan 10 12:32:10 2012 +0100
----------------------------------------------------------------------
.../integration/FullProfileCategory.java | 27 ---------------
.../apache/deltaspike/integration/SeCategory.java | 27 ---------------
.../deltaspike/integration/WebProfileCategory.java | 27 ---------------
.../integration/category/FullProfileCategory.java | 27 +++++++++++++++
.../integration/category/SeCategory.java | 27 +++++++++++++++
.../integration/category/WebProfileCategory.java | 27 +++++++++++++++
.../core/api/provider/BeanManagerProviderTest.java | 12 +++----
.../impl/activation/TestClassDeactivation.java | 12 +++----
.../src/test/resources/META-INF/beans.xml | 23 ++++++++++++
deltaspike/parent/it/pom.xml | 12 +++---
10 files changed, 120 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/FullProfileCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/FullProfileCategory.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/FullProfileCategory.java
deleted file mode 100644
index e47c679..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/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 marker interface. Tests which are Full profile minimum.
- */
-public interface FullProfileCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/SeCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/SeCategory.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/SeCategory.java
deleted file mode 100644
index 2a845c8..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/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 marker interface. Tests which are SE bare minimum.
- */
-public interface SeCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/WebProfileCategory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/WebProfileCategory.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/WebProfileCategory.java
deleted file mode 100644
index 51ffc48..0000000
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/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 marker interface. Tests which are Web profile minimum.
- */
-public interface WebProfileCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/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
new file mode 100644
index 0000000..c997a6c
--- /dev/null
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/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.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/4362ba54/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
new file mode 100644
index 0000000..428e9b9
--- /dev/null
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/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.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/4362ba54/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
new file mode 100644
index 0000000..bfda1cf
--- /dev/null
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/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.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/4362ba54/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
index 5682325..8104c24 100644
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/provider/BeanManagerProviderTest.java
@@ -21,9 +21,7 @@ package org.apache.deltaspike.integration.core.api.provider;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.integration.FullProfileCategory;
-import org.apache.deltaspike.integration.SeCategory;
-import org.apache.deltaspike.integration.WebProfileCategory;
+import org.apache.deltaspike.integration.category.SeCategory;
import org.apache.deltaspike.integration.util.ShrinkWrapArchiveUtil;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
@@ -50,11 +48,11 @@ public class BeanManagerProviderTest
return ShrinkWrap.create(WebArchive.class)
.addAsLibraries(ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[]{"org.apache.deltaspike.core"},
+ new String[]{"org.apache.deltaspike.core",
+ "org.apache.deltaspike.integration.category",
+ "org.apache.deltaspike.integration.util",
+ "org.apache.deltaspike.integration.core.api.provider"},
null))
- .addClass(TestBean.class)
- // Must add the categories to the archive
- .addClasses(SeCategory.class, WebProfileCategory.class, FullProfileCategory.class)
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
index baa0f64..f37ba01 100644
--- a/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
+++ b/deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/impl/activation/TestClassDeactivation.java
@@ -19,9 +19,7 @@
package org.apache.deltaspike.integration.core.impl.activation;
import org.apache.deltaspike.core.impl.util.ClassDeactivation;
-import org.apache.deltaspike.integration.FullProfileCategory;
-import org.apache.deltaspike.integration.SeCategory;
-import org.apache.deltaspike.integration.WebProfileCategory;
+import org.apache.deltaspike.integration.category.SeCategory;
import org.apache.deltaspike.integration.util.FileUtils;
import org.apache.deltaspike.integration.util.ShrinkWrapArchiveUtil;
import org.jboss.arquillian.container.test.api.Deployment;
@@ -55,12 +53,12 @@ public class TestClassDeactivation
return ShrinkWrap.create(WebArchive.class)
.addAsLibraries(ShrinkWrapArchiveUtil.getArchives(null,
"META-INF/beans.xml",
- new String[]{"org.apache.deltaspike.core"},
+ new String[]{"org.apache.deltaspike.core",
+ "org.apache.deltaspike.integration.category",
+ "org.apache.deltaspike.integration.util",
+ "org.apache.deltaspike.integration.core.impl.activation"},
null))
.addAsResource(FileUtils.getFileForURL(fileUrl.toString()))
- .addClasses(ActivatedClass.class, DeactivatedClass.class, TestClassDeactivator.class)
- // Must add the categories to the archive
- .addClasses(SeCategory.class, WebProfileCategory.class, FullProfileCategory.class)
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/deltaspike/core/integration-test/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/resources/META-INF/beans.xml b/deltaspike/core/integration-test/src/test/resources/META-INF/beans.xml
new file mode 100644
index 0000000..4070730
--- /dev/null
+++ b/deltaspike/core/integration-test/src/test/resources/META-INF/beans.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4362ba54/deltaspike/parent/it/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/it/pom.xml b/deltaspike/parent/it/pom.xml
index 452f015..9cd1d5c 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.FullProfileCategory,
- org.apache.deltaspike.integration.WebProfileCategory,
- org.apache.deltaspike.integration.SeCategory
+ org.apache.deltaspike.integration.category.FullProfileCategory,
+ org.apache.deltaspike.integration.category.WebProfileCategory,
+ org.apache.deltaspike.integration.category.SeCategory
</groups>
</configuration>
</plugin>
@@ -232,9 +232,9 @@
</systemProperties>
<!-- Groups need to be setup for each profile -->
<groups>
- org.apache.deltaspike.integration.FullProfileCategory,
- org.apache.deltaspike.integration.WebProfileCategory,
- org.apache.deltaspike.integration.SeCategory
+ org.apache.deltaspike.integration.category.FullProfileCategory,
+ org.apache.deltaspike.integration.category.WebProfileCategory,
+ org.apache.deltaspike.integration.category.SeCategory
</groups>
</configuration>
</plugin>