[jboss-svn-commits] JBoss Common SVN: r3861 - in arquillian/trunk: impl-base/src/main/java/org/jboss/arquillian/impl/container and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 16 04:11:00 EST 2009
Author: aslak
Date: 2009-12-16 04:11:00 -0500 (Wed, 16 Dec 2009)
New Revision: 3861
Added:
arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java
Removed:
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/DeployableContainers.java
Modified:
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTestBuilder.java
Log:
ARQ-38 Moved to spi util
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTestBuilder.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTestBuilder.java 2009-12-15 22:58:16 UTC (rev 3860)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeployableTestBuilder.java 2009-12-16 09:11:00 UTC (rev 3861)
@@ -19,7 +19,6 @@
import org.jboss.arquillian.impl.container.ContainerController;
import org.jboss.arquillian.impl.container.ContainerDeployer;
import org.jboss.arquillian.impl.container.Controlable;
-import org.jboss.arquillian.impl.container.DeployableContainers;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -27,6 +26,7 @@
import org.jboss.arquillian.spi.TestMethodExecutor;
import org.jboss.arquillian.spi.TestResult;
import org.jboss.arquillian.spi.TestResult.Status;
+import org.jboss.arquillian.spi.util.DeployableContainers;
import org.jboss.arquillian.spi.util.TestEnrichers;
import org.jboss.shrinkwrap.api.Archive;
Deleted: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/DeployableContainers.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/DeployableContainers.java 2009-12-15 22:58:16 UTC (rev 3860)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/DeployableContainers.java 2009-12-16 09:11:00 UTC (rev 3861)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.arquillian.impl.container;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-
-import org.jboss.arquillian.spi.DeployableContainer;
-
-/**
- * DeployableContainers
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public class DeployableContainers
-{
-
- private DeployableContainers() {}
-
- public static DeployableContainer load()
- {
- ServiceLoader<DeployableContainer> containerLoader = ServiceLoader.load(DeployableContainer.class);
- List<DeployableContainer> containers = toList(containerLoader.iterator());
- if(containers.size() == 0)
- {
- throw new RuntimeException("No containers found");
- }
- if(containers.size() > 1)
- {
- throw new RuntimeException("More the one container found, check classpath");
- }
- return containers.get(0);
- }
-
- private static <T> List<T> toList(Iterator<T> iterator)
- {
- List<T> list = new ArrayList<T>();
- while(iterator.hasNext())
- {
- list.add(iterator.next());
- }
- return list;
- }
-}
Copied: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java (from rev 3860, arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/container/DeployableContainers.java)
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java (rev 0)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java 2009-12-16 09:11:00 UTC (rev 3861)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.arquillian.spi.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ServiceLoader;
+
+import org.jboss.arquillian.spi.DeployableContainer;
+
+/**
+ * DeployableContainers
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class DeployableContainers
+{
+
+ private DeployableContainers() {}
+
+ public static DeployableContainer load()
+ {
+ ServiceLoader<DeployableContainer> containerLoader = ServiceLoader.load(DeployableContainer.class);
+ List<DeployableContainer> containers = toList(containerLoader.iterator());
+ if(containers.size() == 0)
+ {
+ throw new RuntimeException("No containers found");
+ }
+ if(containers.size() > 1)
+ {
+ throw new RuntimeException("More the one container found, check classpath");
+ }
+ return containers.get(0);
+ }
+
+ private static <T> List<T> toList(Iterator<T> iterator)
+ {
+ List<T> list = new ArrayList<T>();
+ while(iterator.hasNext())
+ {
+ list.add(iterator.next());
+ }
+ return list;
+ }
+}
More information about the jboss-svn-commits
mailing list