6:37 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-04-07 19:37:11 -0400 (Tue, 07 Apr 2009)
New Revision: 2338
Added:
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties
ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties
ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties
Removed:
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties
ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties
Modified:
ri/trunk/jboss-as/build.properties
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/tests/pom.xml
ri/trunk/version-matrix/pom.xml
Log:
updates for harness changes
Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java
===================================================================
---
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java 2009-04-07
23:36:17 UTC (rev 2337)
+++
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java 2009-04-07
23:37:11 UTC (rev 2338)
@@ -1,175 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.webbeans.util;
-
-import static org.jboss.webbeans.util.Strings.split;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.resources.spi.ResourceLoadingException;
-
-/**
- * Utility class to load deployment properties
- *
- * @author Pete Muir
- */
-public class DeploymentProperties
-{
- // The resource bundle used to control Web Beans RI deployment
- public static final String RESOURCE_BUNDLE =
"META-INF/web-beans-ri.properties";
-
- private static LogProvider log = Logging.getLogProvider(DeploymentProperties.class);
-
- // The class to work from
- private ResourceLoader resourceLoader;
-
- /**
- * Constructor
- *
- * @param classLoader The classloader to work on
- */
- public DeploymentProperties(ResourceLoader classLoader)
- {
- this.resourceLoader = classLoader;
- }
-
- /**
- * Get a list of possible values for a given key.
- *
- * First, System properties are tried, followed by the specified resource
- * bundle (first in classpath only).
- *
- * Colon (:) deliminated lists are split out.
- *
- * @param key The key to search for
- * @return A list of possible values. An empty list is returned if there are
- * no matches.
- */
- public List<String> getPropertyValues(String key)
- {
- List<String> values = new ArrayList<String>();
- addPropertiesFromSystem(key, values);
- addPropertiesFromResourceBundle(key, values);
- return values;
- }
-
- /**
- * Adds matches from system properties
- *
- * @param key The key to match
- * @param values The currently found values
- */
- private void addPropertiesFromSystem(String key, List<String> values)
- {
- addProperty(key, System.getProperty(key), values);
- }
-
- /**
- * Adds matches from detected resource bundles
- *
- * @param key The key to match
- * @param values The currently found values
- */
- private void addPropertiesFromResourceBundle(String key, List<String> values)
- {
- try
- {
- for (URL url : resourceLoader.getResources(RESOURCE_BUNDLE))
- {
- Properties properties = new Properties();
- InputStream propertyStream = url.openStream();
- try
- {
- properties.load(propertyStream);
- addProperty(key, properties.getProperty(key), values);
- }
- finally
- {
- if (propertyStream != null)
- {
- propertyStream.close();
- }
- }
- }
- }
- catch (IOException e)
- {
- // No - op, file is optional
- }
- }
-
- /**
- * Add the property to the set of properties only if it hasn't already been
- * added
- *
- * @param key The key searched for
- * @param value The value of the property
- * @param values The currently found values
- */
- private void addProperty(String key, String value, List<String> values)
- {
- if (value != null)
- {
- String[] properties = split(value, ":");
- for (String property : properties)
- {
- values.add(property);
- }
-
- }
- }
-
- /**
- * Gets the possible implementation class for a given property for which the
- * values are classanames
- *
- * @param deploymentProperties The deployment properties object to use
- * @param resourceLoader The resource laoder to use to attempt
- * @param propertyName The name of the property to load
- * @return A set of classes specified
- */
- public static <T> Set<Class<? extends T>>
getClasses(DeploymentProperties deploymentProperties, ResourceLoader resourceLoader,
String propertyName, Class<T> expectedType)
- {
- Set<Class<? extends T>> classes = new HashSet<Class<? extends
T>>();
- for (String className : deploymentProperties.getPropertyValues(propertyName))
- {
- try
- {
- @SuppressWarnings("unchecked")
- Class<? extends T> classForName = (Class<? extends T>)
resourceLoader.classForName(className);
- classes.add(classForName);
- }
- catch (ResourceLoadingException e)
- {
- log.debug("Unable to load class " + className + " for property
" + propertyName, e);
- }
- }
- return classes;
- }
-
-}
Modified: ri/trunk/jboss-as/build.properties
===================================================================
--- ri/trunk/jboss-as/build.properties 2009-04-07 23:36:17 UTC (rev 2337)
+++ ri/trunk/jboss-as/build.properties 2009-04-07 23:37:11 UTC (rev 2338)
@@ -1,9 +1,9 @@
# Container a number of properties associated with installing Web Beans into JBoss AS and
running the TCK in JBoss AS
#jboss.home=/Applications/jboss-5.0.1.GA
-java.opts=-Xms128m -Xmx384m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true
-Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+org.jboss.testharness.container.javaOpts=-Xms128m -Xmx384m -XX:MaxPermSize=128m
-Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000
-Dsun.rmi.dgc.server.gcInterval=3600000
# time to allow before attempting to restart JBoss AS
-# jboss.shutdown.delay=15000
+# org.jboss.testharness.container.shutdownDelay=15000
# maximum number of TCK tests to deploy before restarting JBoss AS
# jboss.deployments.restart = 25
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-04-07 23:36:17 UTC (rev 2337)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-04-07 23:37:11 UTC (rev 2338)
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-5</artifactId>
+ <artifactId>jboss-test-harness-jboss-as-50</artifactId>
</dependency>
@@ -139,11 +139,11 @@
<value>false</value>
</property>
<property>
- <name>jboss-as.dir</name>
+
<name>org.jboss.testharness.container.extraConfigurationDir</name>
<value>../jboss-as</value>
</property>
<property>
- <name>jboss.force.restart</name>
+
<name>org.jboss.testharness.container.forceRestart</name>
<value>false</value>
</property>
<property>
@@ -182,7 +182,7 @@
<value>false</value>
</property>
<property>
- <name>jboss-as.dir</name>
+
<name>org.jboss.testharness.container.extraConfigurationDir</name>
<value>../jboss-as</value>
</property>
<property>
Copied:
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties (from
rev 2333, ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties)
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties
(rev 0)
+++
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -0,0 +1 @@
+org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
\ No newline at end of file
Property changes on:
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
---
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-04-07
23:36:17 UTC (rev 2337)
+++
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -1 +0,0 @@
-org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
\ No newline at end of file
Copied:
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
(from rev 2333,
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties)
===================================================================
---
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
(rev 0)
+++
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -0,0 +1,7 @@
+# Configuration for running incontainer tests from your IDE
+# Alter the path webbeans accordingly (relative from the tck/impl dir)
+org.jboss.testharness.standalone=false
+org.jboss.testharness.container.extraConfigurationDir=../../webbeans/jboss-as
+org.jboss.testharness.container.forceRestart=false
+org.jboss.testharness.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib
+org.jboss.testharness.runIntegrationTests=true
\ No newline at end of file
Deleted:
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
===================================================================
---
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-04-07
23:36:17 UTC (rev 2337)
+++
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -1,7 +0,0 @@
-# Configuration for running incontainer tests from your IDE
-# Alter the path webbeans accordingly (relative from the tck/impl dir)
-org.jboss.testharness.standalone=false
-jboss-as.dir=../../webbeans/jboss-as
-jboss.force.restart=false
-org.jboss.testharness.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib
-org.jboss.testharness.runIntegrationTests=true
\ No newline at end of file
Copied: ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties
(from rev 2333,
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties)
===================================================================
--- ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties
(rev 0)
+++
ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -0,0 +1,5 @@
+org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl
+org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl
+org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl
+org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl
+org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl
\ No newline at end of file
Deleted: ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
---
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-04-07
23:36:17 UTC (rev 2337)
+++
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -1,5 +0,0 @@
-org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl
-org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl
-org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl
-org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl
-org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl
\ No newline at end of file
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-04-07 23:36:17 UTC (rev 2337)
+++ ri/trunk/tests/pom.xml 2009-04-07 23:37:11 UTC (rev 2338)
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-5</artifactId>
+ <artifactId>jboss-test-harness-jboss-as-50</artifactId>
<scope>test</scope>
</dependency>
@@ -169,11 +169,11 @@
<value>false</value>
</property>
<property>
- <name>jboss-as.dir</name>
+
<name>org.jboss.testharness.container.extraConfigurationDir</name>
<value>../jboss-as</value>
</property>
<property>
- <name>jboss.force.restart</name>
+
<name>org.jboss.testharness.container.forceRestart</name>
<value>true</value>
</property>
<property>
Copied: ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties (from rev
2334, ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties)
===================================================================
--- ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties
(rev 0)
+++ ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -0,0 +1,2 @@
+org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.StandaloneContainersImpl
+org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
Deleted: ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties 2009-04-07
23:36:17 UTC (rev 2337)
+++ ri/trunk/tests/src/main/resources/META-INF/web-beans-tck.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -1,2 +0,0 @@
-org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.StandaloneContainersImpl
-org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
Copied: ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties (from rev
2334, ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties)
===================================================================
--- ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties
(rev 0)
+++ ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -0,0 +1 @@
+org.jboss.testharness.testPackage=org.jboss.webbeans.test
Deleted: ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties 2009-04-07
23:36:17 UTC (rev 2337)
+++ ri/trunk/tests/src/test/resources/META-INF/web-beans-tck.properties 2009-04-07
23:37:11 UTC (rev 2338)
@@ -1 +0,0 @@
-org.jboss.testharness.testPackage=org.jboss.webbeans.test
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-04-07 23:36:17 UTC (rev 2337)
+++ ri/trunk/version-matrix/pom.xml 2009-04-07 23:37:11 UTC (rev 2338)
@@ -296,7 +296,7 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-5</artifactId>
+ <artifactId>jboss-test-harness-jboss-as-50</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>