JBoss Portal SVN: r8647 - modules/web/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-15 04:46:34 -0400 (Mon, 15 Oct 2007)
New Revision: 8647
Added:
modules/web/tags/JBP_Web_1_0_0/
Removed:
modules/web/tags/1_0_0/
Log:
Renaming module tags
Copied: modules/web/tags/JBP_Web_1_0_0 (from rev 8646, modules/web/tags/1_0_0)
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8646 - modules/test/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-15 04:46:00 -0400 (Mon, 15 Oct 2007)
New Revision: 8646
Added:
modules/test/tags/JBP_Test_1_0_0/
Removed:
modules/test/tags/1_0_0/
Log:
Renaming module tags
Copied: modules/test/tags/JBP_Test_1_0_0 (from rev 8645, modules/test/tags/1_0_0)
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8645 - modules/portlet/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-15 04:45:38 -0400 (Mon, 15 Oct 2007)
New Revision: 8645
Added:
modules/portlet/tags/JBP_Portlet_1_0_0/
Removed:
modules/portlet/tags/1_0_0/
Log:
Renaming module tags
Copied: modules/portlet/tags/JBP_Portlet_1_0_0 (from rev 8644, modules/portlet/tags/1_0_0)
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8644 - modules/identity/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-15 04:45:03 -0400 (Mon, 15 Oct 2007)
New Revision: 8644
Added:
modules/identity/tags/JBP_Identity_1_0_0/
Removed:
modules/identity/tags/1_0_0/
Log:
Renaming module tags
Copied: modules/identity/tags/JBP_Identity_1_0_0 (from rev 8643, modules/identity/tags/1_0_0)
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8643 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-15 04:42:58 -0400 (Mon, 15 Oct 2007)
New Revision: 8643
Added:
modules/common/tags/JBP_Common_1_0_0/
Removed:
modules/common/tags/1_0_0/
Log:
Renaming modules tags
Copied: modules/common/tags/JBP_Common_1_0_0 (from rev 8642, modules/common/tags/1_0_0)
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8642 - in modules/test/trunk: unit/src/main/org/jboss/test/unit/runner and 13 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-10-14 08:05:55 -0400 (Sun, 14 Oct 2007)
New Revision: 8642
Added:
modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/
modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java
Modified:
modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java
modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java
modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java
modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java
modules/test/trunk/unit/src/main/org/jboss/unit/driver/DriverContext.java
modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/POJOTestSuiteDriver.java
modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/SimpleDriverContext.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/TestSuiteDef.java
modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/generic/GenericTestSuiteDef.java
modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd
modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f2.xml
Log:
add support for property definition at generic test suite level
Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java
===================================================================
--- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -143,7 +143,7 @@
catch (Throwable throwable)
{
throwable.printStackTrace();
- failed = new FailureResponse(Failure.createErrorFailure("Could not startup kernel", throwable));
+ failed = new FailureResponse(Failure.createFailure("Could not startup kernel", throwable));
return;
}
@@ -158,7 +158,7 @@
catch (Throwable throwable)
{
throwable.printStackTrace();
- failed = new FailureResponse(Failure.createErrorFailure("Could not deploy beans", throwable));
+ failed = new FailureResponse(Failure.createFailure("Could not deploy beans", throwable));
}
}
@@ -205,7 +205,7 @@
}
catch (Exception e)
{
- return new FailureResponse(Failure.createErrorFailure(e));
+ return new FailureResponse(Failure.createFailure(e));
}
}
else
Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java
===================================================================
--- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -23,42 +23,33 @@
package org.jboss.unit.remote.driver;
import org.jboss.unit.TestId;
-import org.jboss.unit.Failure;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.driver.DriverCommand;
import org.jboss.unit.driver.TestDriver;
-import org.jboss.unit.driver.AbstractTestDriver;
-import org.jboss.unit.driver.response.FailureResponse;
-import org.jboss.unit.info.TestInfo;
-import org.jboss.unit.info.impl.SimpleTestSuiteInfo;
+import org.jboss.unit.driver.impl.composite.CompositeTestDriver;
import org.jboss.unit.remote.RequestContext;
import org.jboss.unit.remote.ResponseContext;
-import java.util.Map;
-import java.util.HashMap;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5636 $
*/
-public class RemoteTestDriverServer extends AbstractTestDriver implements RemoteTestDriver
+public class RemoteTestDriverServer extends CompositeTestDriver implements RemoteTestDriver
{
- /** . */
- private SimpleTestSuiteInfo info = new SimpleTestSuiteInfo("Main");
-
- /** . */
- private Map<String, RemoteTestDriver> drivers = new HashMap<String, RemoteTestDriver>();
-
public void pushContext(TestId testId, RequestContext requestContext)
{
String name = testId.getName(0);
//
- RemoteTestDriver driver = drivers.get(name);
+ TestDriver driver = drivers.get(name);
//
- driver.pushContext(testId.range(1), requestContext);
+ if (driver instanceof RemoteTestDriver)
+ {
+ RemoteTestDriver remoteDriver = (RemoteTestDriver)driver;
+
+ //
+ remoteDriver.pushContext(testId.range(1), requestContext);
+ }
}
public ResponseContext popContext(TestId testId)
@@ -66,67 +57,24 @@
String name = testId.getName(0);
//
- RemoteTestDriver driver = drivers.get(name);
-
- //
- return driver.popContext(testId.range(1));
- }
-
- public TestInfo getInfo()
- {
- return info;
- }
-
- public DriverResponse invoke(TestId id, DriverCommand command)
- {
- if (id.getLength() == 0)
- {
- return new FailureResponse(Failure.createErrorFailure("No null test id accepted"));
- }
-
- //
- String name = id.getName(0);
-
- //
TestDriver driver = drivers.get(name);
//
- if (driver == null)
- {
- return new FailureResponse(Failure.createErrorFailure("No test driver found for name " + name));
- }
-
//
- TestId driverId = id.range(1);
-
- //
- return driver.invoke(driverId, command);
- }
-
- public void mount(RemoteTestDriver driver)
- {
- synchronized(RemoteTestDriverServer.class)
+ if (driver instanceof RemoteTestDriver)
{
- info.addTest(driver.getInfo());
+ RemoteTestDriver remoteDriver = (RemoteTestDriver)driver;
- String name = driver.getInfo().getName();
-
- drivers.put(name, driver);
+ //
+ return remoteDriver.popContext(testId.range(1));
}
- }
-
- public synchronized void unmount(RemoteTestDriver driver)
- {
- synchronized(RemoteTestDriverServer.class)
+ else
{
- String name = driver.getInfo().getName();
-
- drivers.remove(name);
-
- info.removeTest(name);
+ return null;
}
}
+
// /** . */
// private String initialPath = "/test";
//
Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -32,7 +32,8 @@
import org.jboss.unit.runner.results.TestSuccess;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.DriverCommand;
-import org.jboss.unit.driver.AbstractTestDriver;
+import org.jboss.unit.driver.DriverContext;
+import org.jboss.unit.driver.TestDriver;
import org.jboss.unit.driver.command.StartTestCommand;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.info.TestInfo;
@@ -64,15 +65,67 @@
testTwoTestCases2();
testParametrization();
testParametrizationOverride();
+ testProperties1();
+ testProperties2();
+ testProperties3();
}
+ private static void testProperties1()
+ {
+ Driver1.init();
+ SimpleTestCaseInfo fooInfo = new SimpleTestCaseInfo("foo");
+ Driver1.testSuiteInfo.addTest(fooInfo);
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
+ suite.setProperty("foo_def", "foo_def_value");
+ GenericTestRunner runner = new GenericTestRunner(suite);
+ runner.run(new TestRunnerContextSupport());
+ Map<String, String> expectedProperties = new HashMap<String, String>();
+ expectedProperties.put("foo_def", "foo_def_value");
+ assertEquals(expectedProperties, Driver1.properties);
+ }
+
+ private static void testProperties2()
+ {
+ Driver1.init();
+ SimpleTestCaseInfo fooInfo = new SimpleTestCaseInfo("foo");
+ Driver1.testSuiteInfo.addTest(fooInfo);
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
+ GenericTestRunner runner = new GenericTestRunner(suite);
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put("foo_runner", "foo_runner_value");
+ runner.run(new TestRunnerContextSupport(properties));
+ Map<String, String> expectedProperties = new HashMap<String, String>();
+ expectedProperties.put("foo_runner", "foo_runner_value");
+ assertEquals(expectedProperties, Driver1.properties);
+ }
+
+ private static void testProperties3()
+ {
+ Driver1.init();
+ SimpleTestCaseInfo fooInfo = new SimpleTestCaseInfo("foo");
+ Driver1.testSuiteInfo.addTest(fooInfo);
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
+ suite.setProperty("foo_def", "foo_def_value");
+ suite.setProperty("bar", "bar_def_value");
+ GenericTestRunner runner = new GenericTestRunner(suite);
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put("foo_runner", "foo_runner_value");
+ properties.put("bar", "bar_runner_value");
+ runner.run(new TestRunnerContextSupport(properties));
+ Map<String, String> expectedProperties = new HashMap<String, String>();
+ expectedProperties.put("foo_def", "foo_def_value");
+ expectedProperties.put("foo_runner", "foo_runner_value");
+ expectedProperties.put("bar", "bar_runner_value");
+ assertEquals(expectedProperties, Driver1.properties);
+ }
+
private static void testParametrization()
{
Driver1.init();
SimpleTestCaseInfo fooInfo = new SimpleTestCaseInfo("foo");
fooInfo.addParameter(new SimpleParameterInfo("abc"));
Driver1.testSuiteInfo.addTest(fooInfo);
- GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName());
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
TestDef foo = new TestDef(new TestId("foo"));
suite.addTest(foo);
ParametersDef fooParameters = new ParametersDef();
@@ -102,7 +155,7 @@
SimpleTestCaseInfo fooInfo = new SimpleTestCaseInfo("foo");
fooInfo.addParameter(new SimpleParameterInfo("abc"));
Driver1.testSuiteInfo.addTest(fooInfo);
- GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName());
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
TestDef foo = new TestDef(new TestId("foo"));
suite.addTest(foo);
ParametersDef fooParameters = new ParametersDef();
@@ -127,7 +180,7 @@
private static void testNoTestCase()
{
Driver1.init();
- GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName());
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
EventList events = new EventList();
GenericTestRunner runner = new GenericTestRunner(suite);
runner.run(new TestRunnerContextSupport(events));
@@ -142,7 +195,7 @@
{
Driver1.init();
Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("foo"));
- GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName());
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
suite.addTest(new TestDef(new TestId("foo")));
EventList events = new EventList();
GenericTestRunner runner = new GenericTestRunner(suite);
@@ -161,7 +214,7 @@
Driver1.init();
Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("foo"));
Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("bar"));
- GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName());
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
suite.addTest(new TestDef(new TestId("foo")));
EventList events = new EventList();
GenericTestRunner runner = new GenericTestRunner(suite);
@@ -180,7 +233,7 @@
Driver1.init();
Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("foo"));
Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("bar"));
- GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName());
+ GenericTestSuiteDef suite = new GenericTestSuiteDef("generic", Driver1.class.getName());
EventList events = new EventList();
GenericTestRunner runner = new GenericTestRunner(suite);
runner.run(new TestRunnerContextSupport(events));
@@ -195,20 +248,35 @@
assertEquals(list(new HashMap(), new HashMap()), Driver1.parametrizations);
}
- public static class Driver1 extends AbstractTestDriver
+ public static class Driver1 implements TestDriver
{
static SimpleTestSuiteInfo testSuiteInfo;
static List<TestId> ids;
static List<Map<String,String>> parametrizations;
+ static Map<String, String> properties;
static void init()
{
testSuiteInfo = new SimpleTestSuiteInfo("foo");
ids = new ArrayList<TestId>();
parametrizations = new ArrayList<Map<String,String>>();
+ properties = new HashMap<String, String>();
}
+ public void initDriver(DriverContext context)
+ {
+ for (String name : context.getPropertyNames())
+ {
+ properties.put(name, context.getProperty(name));
+ }
+ }
+
+ public void destroyDriver()
+ {
+
+ }
+
public TestInfo getInfo()
{
return testSuiteInfo;
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/Failure.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -76,24 +76,48 @@
return type;
}
+ public static Failure createFailure(Throwable cause)
+ {
+ if (cause instanceof AssertionError)
+ {
+ return new Failure(cause, FailureType.ASSERTION);
+ }
+ else
+ {
+ return new Failure(cause, FailureType.ERROR);
+ }
+ }
+
+ public static Failure createFailure(String message, Throwable cause)
+ {
+ if (cause instanceof AssertionError)
+ {
+ return new Failure(message, cause, FailureType.ASSERTION);
+ }
+ else
+ {
+ return new Failure(message, cause, FailureType.ERROR);
+ }
+ }
+
public static Failure createErrorFailure(String message)
{
return new Failure(message, FailureType.ERROR);
}
- public static Failure createErrorFailure(String message, Throwable throwable)
+ public static Failure createErrorFailure(String message, Throwable cause)
{
- return new Failure(message, throwable, FailureType.ERROR);
+ return new Failure(message, cause, FailureType.ERROR);
}
- public static Failure createErrorFailure(Throwable throwable)
+ public static Failure createErrorFailure(Throwable cause)
{
- return new Failure(throwable, FailureType.ERROR);
+ return new Failure(cause, FailureType.ERROR);
}
- public static Failure createAssertionFailure(AssertionError throwable)
+ public static Failure createAssertionFailure(Throwable cause)
{
- return new Failure(throwable, FailureType.ASSERTION);
+ return new Failure(cause, FailureType.ASSERTION);
}
public static Failure createAssertionFailure(String message)
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/driver/DriverContext.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/driver/DriverContext.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/driver/DriverContext.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.unit.driver;
+import java.util.Set;
+
/**
* The context in which a driver is placed.
*
@@ -32,10 +34,17 @@
{
/**
- * Return a property of the context.
+ * Returns the set of names available properties.
+ *
+ * @return the set of property names
+ */
+ Set<String> getPropertyNames();
+
+ /**
+ * Return a property of the context or null if it does not exist.
*
- * @param name
- * @return
+ * @param name the property name
+ * @return the property value
*/
String getProperty(String name);
Added: modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java (rev 0)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -0,0 +1,115 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.unit.driver.impl.composite;
+
+import org.jboss.unit.driver.TestDriver;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.DriverCommand;
+import org.jboss.unit.driver.AbstractTestDriver;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.info.impl.SimpleTestSuiteInfo;
+import org.jboss.unit.info.TestInfo;
+import org.jboss.unit.TestId;
+import org.jboss.unit.Failure;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class CompositeTestDriver extends AbstractTestDriver
+{
+
+ /** . */
+ private final SimpleTestSuiteInfo info = new SimpleTestSuiteInfo("Main");
+
+ /** . */
+ protected final Map<String, TestDriver> drivers = new HashMap<String, TestDriver>();
+
+ public TestInfo getInfo()
+ {
+ return info;
+ }
+
+ public DriverResponse invoke(TestId id, DriverCommand command)
+ {
+ if (id.getLength() == 0)
+ {
+ return new FailureResponse(Failure.createErrorFailure("No null test id accepted"));
+ }
+
+ //
+ String name = id.getName(0);
+
+ //
+ TestDriver driver = drivers.get(name);
+
+ //
+ if (driver == null)
+ {
+ return new FailureResponse(Failure.createErrorFailure("No test driver found for name " + name));
+ }
+
+ //
+ TestId driverId = id.range(1);
+
+ //
+ return driver.invoke(driverId, command);
+ }
+
+ public void mount(TestDriver driver)
+ {
+ synchronized(TestDriver.class)
+ {
+ driver.initDriver(getContext());
+
+ //
+ info.addTest(driver.getInfo());
+
+ //
+ String name = driver.getInfo().getName();
+
+ //
+ drivers.put(name, driver);
+ }
+ }
+
+ public synchronized void unmount(TestDriver driver)
+ {
+ synchronized(TestDriver.class)
+ {
+ String name = driver.getInfo().getName();
+
+ //
+ drivers.remove(name);
+
+ //
+ info.removeTest(name);
+
+ //
+ driver.destroyDriver();
+ }
+ }
+}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/POJOTestSuiteDriver.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/POJOTestSuiteDriver.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/POJOTestSuiteDriver.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -28,7 +28,6 @@
import org.jboss.unit.spi.pojo.TestLifeCycle;
import org.jboss.unit.spi.pojo.TestCase;
import org.jboss.unit.spi.pojo.annotations.Provider;
-import org.jboss.unit.driver.TestDriver;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.DriverCommand;
import org.jboss.unit.driver.AbstractTestDriver;
@@ -192,13 +191,6 @@
}
//
- if (t instanceof AssertionError)
- {
- return new FailureResponse(Failure.createAssertionFailure((AssertionError)t));
- }
- else
- {
- return new FailureResponse(Failure.createErrorFailure(t));
- }
+ return new FailureResponse(Failure.createFailure(t));
}
}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/SimpleDriverContext.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/SimpleDriverContext.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/pojo/SimpleDriverContext.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -26,6 +26,8 @@
import java.util.Map;
import java.util.HashMap;
+import java.util.Set;
+import java.util.Collections;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -43,7 +45,7 @@
{
throw new IllegalArgumentException("No null property name accepted");
}
- this.properties = properties;
+ this.properties = Collections.unmodifiableMap(properties);
}
public SimpleDriverContext()
@@ -51,6 +53,11 @@
this(new HashMap<String, String>());
}
+ public Set<String> getPropertyNames()
+ {
+ return properties.keySet();
+ }
+
public String getProperty(String name)
{
if (name == null)
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -60,6 +60,11 @@
this(new HashMap<String, String>(), parametrizations, NullFilter.getInstance(), new TestRunnerEventBroadcaster());
}
+ public TestRunnerContextSupport(Map<String, String> properties)
+ {
+ this(properties, new ParametrizationSet(), NullFilter.getInstance(), new TestRunnerEventBroadcaster());
+ }
+
public TestRunnerContextSupport(ParametrizationSet parametrizations, TestRunnerEventListener eventListener)
{
this(new HashMap<String, String>(), parametrizations, NullFilter.getInstance(), eventListener);
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -104,7 +104,7 @@
}
catch (Exception e)
{
- context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Was not able to start the test driver properly", e)));
+ context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createFailure("Was not able to start the test driver properly", e)));
return;
}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -37,6 +37,8 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
+import java.util.HashMap;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -75,6 +77,10 @@
testDefs = Collections.singleton(new TestDef(new TestId()));
}
+ // Compute properties
+ Map<String, String> properties = new HashMap<String, String>(def.getProperties());
+ properties.putAll(context.getProperties());
+
for (TestDef testDef : testDefs)
{
// Create parametrization
@@ -83,7 +89,7 @@
parametrizations.combine(context.getParametrizations());
//
- TestRunnerContextSupport genericContext = new TestRunnerContextSupport(context.getProperties(), parametrizations, context.getFilter(), filter);
+ TestRunnerContextSupport genericContext = new TestRunnerContextSupport(properties, parametrizations, context.getFilter(), filter);
//
TestDriverRunner runner = new TestDriverRunner(driver, testDef.getRefId());
@@ -94,7 +100,7 @@
}
catch (Exception e)
{
- context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test class " + className,e)));
+ context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createFailure("Cannot execute test class " + className,e)));
}
}
}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -40,6 +40,8 @@
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -49,16 +51,16 @@
{
/** . */
- private final POJOTestSuiteDef suite;
+ private final POJOTestSuiteDef def;
public POJOTestRunner(POJOTestSuiteDef suiteDef)
{
- this.suite = suiteDef;
+ this.def = suiteDef;
}
protected void internalRun(TestRunnerContext context)
{
- for (TestClassDef testClass : suite.getTestClasses())
+ for (TestClassDef testClass : def.getTestClasses())
{
String className = testClass.getName();
@@ -86,12 +88,16 @@
}
// Create parametrization
- ParametrizationSet parametrizations = suite.getParameters().getParametrization().clone();
+ ParametrizationSet parametrizations = def.getParameters().getParametrization().clone();
parametrizations.combine(testClass.getParameters().getParametrization());
parametrizations.combine(context.getParametrizations());
+ // Compute properties
+ Map<String, String> properties = new HashMap<String, String>(def.getProperties());
+ properties.putAll(context.getProperties());
+
//
- TestRunnerContextSupport pojoContext = new TestRunnerContextSupport(context.getProperties(), parametrizations, context.getFilter(), filter);
+ TestRunnerContextSupport pojoContext = new TestRunnerContextSupport(properties, parametrizations, context.getFilter(), filter);
//
TestDriverRunner runner = new TestDriverRunner(driver);
@@ -106,7 +112,7 @@
}
catch (Exception e)
{
- context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test class " + className,e)));
+ context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createFailure("Cannot execute test class " + className,e)));
}
}
}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -50,6 +50,8 @@
import javax.xml.transform.stream.StreamSource;
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
import java.io.IOException;
import java.io.InputStream;
@@ -162,17 +164,23 @@
}
//
- Attr attr = classElt.getAttributeNode("name");
- if (attr == null)
+ Attr nameAttrOfClassElt = classElt.getAttributeNode("name");
+ if (nameAttrOfClassElt == null)
{
throw new IllegalArgumentException();
}
//
- String className = attr.getValue();
- GenericTestSuiteDef suite = new GenericTestSuiteDef(className);
+ Attr nameAttr = suiteElt.getAttributeNode("name");
+ if (nameAttr == null)
+ {
+ throw new IllegalArgumentException();
+ }
//
+ GenericTestSuiteDef suite = new GenericTestSuiteDef(nameAttr.getValue(), nameAttrOfClassElt.getValue());
+
+ //
for (Element testElt : children(suiteElt, "test"))
{
Attr refidAttr = testElt.getAttributeNode("refid");
@@ -198,6 +206,9 @@
}
//
+ suite.setProperties(buildProperties(suiteElt));
+
+ //
suite.setParameters(buildParameters(suiteElt));
//
@@ -246,6 +257,9 @@
}
//
+ suite.setProperties(buildProperties(suiteElt));
+
+ //
suite.setParameters(buildParameters(suiteElt));
//
@@ -256,6 +270,18 @@
private static final int ELEMENT_SOURCE = 1;
private static final int ATTRIBUTE_SOURCE = 2;
+ private Map<String, String> buildProperties(Element propertyEltContainer)
+ {
+ Map<String, String> properties = new HashMap<String, String>();
+ for (Element propertyElt : children(propertyEltContainer, "property"))
+ {
+ String propertyName = propertyElt.getAttribute("name");
+ String propertyValue = propertyElt.getAttribute("value");
+ properties.put(propertyName, propertyValue);
+ }
+ return properties;
+ }
+
private ParametersDef buildParameters(Element parameterEltContainer)
{
ParametersDef parameters = new ParametersDef();
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/TestSuiteDef.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/TestSuiteDef.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/TestSuiteDef.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -27,6 +27,8 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -38,6 +40,9 @@
/** . */
protected ParametersDef parameters = new ParametersDef();
+ /** . */
+ protected Map<String, String> properties = new HashMap<String, String>();
+
public ParametersDef getParameters()
{
return parameters;
@@ -48,6 +53,32 @@
this.parameters = parameters;
}
+ public Map<String, String> getProperties()
+ {
+ return properties;
+ }
+
+ public void setProperties(Map<String, String> properties)
+ {
+ this.properties = properties;
+ }
+
+ public void setProperty(String name, String value)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (value == null)
+ {
+ properties.remove(name);
+ }
+ else
+ {
+ properties.put(name, value);
+ }
+ }
+
public abstract TestRunner createRunner() throws BuilderException;
}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/generic/GenericTestSuiteDef.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/generic/GenericTestSuiteDef.java 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/generic/GenericTestSuiteDef.java 2007-10-14 12:05:55 UTC (rev 8642)
@@ -24,7 +24,6 @@
import org.jboss.unit.runner.model.TestSuiteDef;
import org.jboss.unit.runner.model.BuilderException;
-import org.jboss.unit.runner.model.generic.TestDef;
import org.jboss.unit.runner.TestRunner;
import org.jboss.unit.runner.impl.generic.GenericTestRunner;
@@ -39,16 +38,25 @@
{
/** The tests. */
- private List<TestDef> tests = new ArrayList<TestDef>();
+ private final List<TestDef> tests = new ArrayList<TestDef>();
/** . */
- private String className;
+ private final String name;
- public GenericTestSuiteDef(String className)
+ /** . */
+ private final String className;
+
+ public GenericTestSuiteDef(String name, String className)
{
+ this.name = name;
this.className = className;
}
+ public String getName()
+ {
+ return name;
+ }
+
public String getClassName()
{
return className;
Modified: modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd
===================================================================
--- modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd 2007-10-14 12:05:55 UTC (rev 8642)
@@ -35,20 +35,10 @@
a set of test definitions and a set of tests to execute.</xsd:documentation></xsd:annotation>
<xsd:sequence>
<xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="test-def" type="pojo_testDefType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="test" type="pojo_testType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="pojo_testDefType">
- <xsd:annotation><xsd:documentation>Defines a pojo test with a mandatory id attribute. The id attribute is used by
- test elements which can refer to it.</xsd:documentation></xsd:annotation>
- <xsd:sequence>
- <xsd:element name="class" type="pojo_classType" minOccurs="1" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="id" use="required"/>
- </xsd:complexType>
-
<xsd:complexType name="pojo_classType">
<xsd:annotation><xsd:documentation>Defines a tested class. A tested class can contain any number of case.
If the class element contains no case then all test cases returned by the class meta data will be executed. The
@@ -71,6 +61,7 @@
the test configuration, they override any existing parameter defined at the pojo level.</xsd:documentation></xsd:annotation>
<xsd:sequence>
<xsd:element name="class" type="pojo_classType" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
@@ -84,9 +75,11 @@
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
+ <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="test" type="generic_testType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="generic_testType">
@@ -112,4 +105,10 @@
<xsd:attribute name="value" type="xsd:string"/>
</xsd:complexType>
+ <xsd:complexType name="propertyType">
+ <xsd:annotation><xsd:documentation>A property element.</xsd:documentation></xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="value" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
</xsd:schema>
Modified: modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f2.xml
===================================================================
--- modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f2.xml 2007-10-14 05:44:03 UTC (rev 8641)
+++ modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f2.xml 2007-10-14 12:05:55 UTC (rev 8642)
@@ -3,7 +3,7 @@
xmlns="urn:jboss:jboss-unit:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
- <generic>
+ <generic name="foo_generic">
<class name="foo_generic"/>
<parameter name="red" value="blue"/>
<test refid="foo"/>
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8641 - in docs: trunk/referenceGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-14 01:44:03 -0400 (Sun, 14 Oct 2007)
New Revision: 8641
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml
docs/trunk/referenceGuide/en/modules/security.xml
Log:
- Fixed typos.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2007-10-14 03:23:50 UTC (rev 8640)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2007-10-14 05:44:03 UTC (rev 8641)
@@ -56,7 +56,7 @@
</deployment>
</deployments>]]></programlisting>
</para>
- <para>The based principle of the security mechanism is that everything is restricted unless you grant privileges.
+ <para>The basic principle of the security mechanism is that everything is restricted unless you grant privileges.
You grant privilege on a portal node by adding a security constraint as explained here:
<para>
<programlisting><![CDATA[<security-constraint>
@@ -120,12 +120,12 @@
<xref linkend="desc_example_portal"/>
</para>
</sect1>
-
+
<sect1 id="security.security_cms">
<title>Securing the Content Management System</title>
<para>
The JBoss Portal CMS system consists of a directory structure of Files organized unto their respective Folders. Both Files and Folders are
- considered to be CMS resources that can be secured based on portal Roles and/or Users.
+ considered to be CMS resources that can be secured based on portal Roles and/or Users.
</para>
<para>
The following features are supported by the fine grained security system of Portal CMS:
@@ -155,7 +155,7 @@
<row>
<entry align="center">Permissions</entry>
<entry align="center">Allowed Actions</entry>
- <entry align="center">Implies</entry>
+ <entry align="center">Implies</entry>
</row>
</thead>
<tbody>
@@ -179,10 +179,11 @@
</table>
</para>
<sect2 id="security.security_cms_configuration">
- <title>CMS Security Configuration</title>
- <para>
- The configuration for the CMS Security service is specified in the jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml file. The portion of
- the configuration relevant for securing the CMS service is listed as follows:
+ <title>CMS Security Configuration</title>
+ <para>
+ The configuration for the CMS Security service is specified in the
+ <literal>jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml</literal>
+ file. The portion of the configuration relevant for securing the CMS service is listed as follows:
<programlisting><![CDATA[<!-- interceptor factory where all cms interceptors are registered -->
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
@@ -349,7 +350,7 @@
the Java Authorization Contract for Containers (JACC) which is implemented by J2EE 1.4 Application Servers. This section of
the documentation focuses on defining the framework and its usage and is not an attempt to define what authorization
is or is not because it is out of scope of this context. Instead we will try to straightforwardly describe the
- framework and how it is used. No specific knowledge is expected about JACC although it is a recommanded read.</para>
+ framework and how it is used. No specific knowledge is expected about JACC although it is a recommended read.</para>
<sect2>
<title>The portal permission</title>
<para>The <emphasis>org.jboss.portal.security.PortalPermission</emphasis> object is used to describe a permission for the portal. It extends the <emphasis>java.security.Permission</emphasis>
@@ -389,7 +390,7 @@
</sect2>
<sect2>
<title>Making a programmatic security check</title>
- <para>Making a security check is an easy thing as it consists in created a permission of the appropriate type and
+ <para>Making a security check is an easy thing as it consists in creating a permission of the appropriate type and
make a check against the <emphasis>org.jboss.portal.spi.auth.PortalAuthorizationManager</emphasis> service. That
service is used by the portal to make security checks. It is connected to the different authorization providers
in order to take decisions at runtime based on the type of the permission. Access to that service is done
@@ -408,7 +409,7 @@
</mbean>
...
</server>]]></programlisting>
- <para>It be injected in the servlet context of a war file in the file <emphasis>WEB-INF/jboss-portlet.xml</emphasis></para>
+ <para>It can be injected in the servlet context of a war file in the file <emphasis>WEB-INF/jboss-portlet.xml</emphasis></para>
<programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE portlet-app PUBLIC
"-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
@@ -431,7 +432,7 @@
PortalObjectPermission perm = new PortalObjectPermission(id, PortalObjectPermission.VIEW_MASK);
if (pam.checkPermission(perm) == false)
{
- System.out.println("Current is not authorization to view page " + id);
+ System.out.println("Current user is not authorized to view page " + id);
}</programlisting>
</sect2>
<sect2>
Modified: docs/trunk/referenceGuide/en/modules/security.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/security.xml 2007-10-14 03:23:50 UTC (rev 8640)
+++ docs/trunk/referenceGuide/en/modules/security.xml 2007-10-14 05:44:03 UTC (rev 8641)
@@ -56,7 +56,7 @@
</deployment>
</deployments>]]></programlisting>
</para>
- <para>The based principle of the security mechanism is that everything is restricted unless you grant privileges.
+ <para>The basic principle of the security mechanism is that everything is restricted unless you grant privileges.
You grant privilege on a portal node by adding a security constraint as explained here:
<para>
<programlisting><![CDATA[<security-constraint>
@@ -179,10 +179,11 @@
</table>
</para>
<sect2 id="security.security_cms_configuration">
- <title>CMS Security Configuration</title>
- <para>
- The configuration for the CMS Security service is specified in the jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml file. The portion of
- the configuration relevant for securing the CMS service is listed as follows:
+ <title>CMS Security Configuration</title>
+ <para>
+ The configuration for the CMS Security service is specified in the
+ <literal>jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml</literal>
+ file. The portion of the configuration relevant for securing the CMS service is listed as follows:
<programlisting><![CDATA[<!-- interceptor factory where all cms interceptors are registered -->
<mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
@@ -349,7 +350,7 @@
the Java Authorization Contract for Containers (JACC) which is implemented by J2EE 1.4 Application Servers. This section of
the documentation focuses on defining the framework and its usage and is not an attempt to define what authorization
is or is not because it is out of scope of this context. Instead we will try to straightforwardly describe the
- framework and how it is used. No specific knowledge is expected about JACC although it is a recommanded read.</para>
+ framework and how it is used. No specific knowledge is expected about JACC although it is a recommended read.</para>
<sect2>
<title>The portal permission</title>
<para>The <emphasis>org.jboss.portal.security.PortalPermission</emphasis> object is used to describe a permission for the portal. It extends the <emphasis>java.security.Permission</emphasis>
@@ -389,7 +390,7 @@
</sect2>
<sect2>
<title>Making a programmatic security check</title>
- <para>Making a security check is an easy thing as it consists in created a permission of the appropriate type and
+ <para>Making a security check is an easy thing as it consists in creating a permission of the appropriate type and
make a check against the <emphasis>org.jboss.portal.spi.auth.PortalAuthorizationManager</emphasis> service. That
service is used by the portal to make security checks. It is connected to the different authorization providers
in order to take decisions at runtime based on the type of the permission. Access to that service is done
@@ -408,7 +409,7 @@
</mbean>
...
</server>]]></programlisting>
- <para>It be injected in the servlet context of a war file in the file <emphasis>WEB-INF/jboss-portlet.xml</emphasis></para>
+ <para>It can be injected in the servlet context of a war file in the file <emphasis>WEB-INF/jboss-portlet.xml</emphasis></para>
<programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE portlet-app PUBLIC
"-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
@@ -431,7 +432,7 @@
PortalObjectPermission perm = new PortalObjectPermission(id, PortalObjectPermission.VIEW_MASK);
if (pam.checkPermission(perm) == false)
{
- System.out.println("Current is not authorization to view page " + id);
+ System.out.println("Current user is not authorized to view page " + id);
}</programlisting>
</sect2>
<sect2>
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8640 - in docs: trunk/referenceGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-13 23:23:50 -0400 (Sat, 13 Oct 2007)
New Revision: 8640
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/clustering.xml
docs/trunk/referenceGuide/en/modules/clustering.xml
Log:
- Minor content improvements.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/clustering.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/clustering.xml 2007-10-13 22:06:52 UTC (rev 8639)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/clustering.xml 2007-10-14 03:23:50 UTC (rev 8640)
@@ -163,8 +163,7 @@
</depends>
</mbean>
]]></programlisting>
- More information can be found <ulink
- url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheHibernate">here</ulink>.
+ More information can be found <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheHibernate">here</ulink>.
</para>
</sect2>
@@ -192,7 +191,7 @@
<sect2>
<title>CMS clustering</title>
<para>The CMS backend storage relies on the Apache Jackrabbit project. Jackrabbit does not support clustering out of the box.
- So the portal run the Jackrabbit service on one node of the cluster using the
+ So the portal run the Jackrabbit servicey on one node of the cluster using the
<ulink url="http://www.onjava.com/pub/a/onjava/2003/08/20/jboss_clustering.html">HA-Singleton</ulink> technology.
The file <emphasis>jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml</emphasis> contains the configuration. We will
not reproduce it in this documentation as the changes are quite complex and numerous. Access from all nodes of the cluster
@@ -209,12 +208,11 @@
<title>Setup</title>
<para>We are going to outline how to setup a two node cluster on the same machine in order to test JBoss Portal HA. The only
missing part from the full fledged setup is the addition of a load balancer in front of Tomcat. However a lot of documentation
- exist on the subject. A detailed step by step setup of Apache and mod_jk is available from the <ulink
- url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingMod_jk1.2WithJBoss">JBoss Wiki</ulink>.</para>
+ exist on the subject. A detailed step by step setup of Apache and mod_jk is available from the
+ <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingMod_jk1.2WithJBoss">JBoss Wiki</ulink>.</para>
<para>As we need two application servers running at the same time, we must avoid any conflict. For instance we will
need Tomcat to bind its socket on two different ports otherwise a network conflict will occur. We will leverage
- the service binding manager <ulink
- url="http://docs.jboss.org/jbossas/jboss4guide/r3/html/ch10.html">this chapter</ulink> of
+ the service binding manager <ulink url="http://docs.jboss.org/jbossas/jboss4guide/r3/html/ch10.html">this chapter</ulink> of
the JBoss AS documentation.</para>
<para>The first step is to copy the <emphasis>all</emphasis> configuration of JBoss into two separate
configurations that we name <emphasis>ports-01</emphasis> and <emphasis>ports-02</emphasis> :
@@ -255,21 +253,30 @@
<para>Copy JBoss Portal HA to the deploy directory of the two configurations.</para>
<!-- adding instruction about jboss cache versioning -->
- <para>
- <emphasis>JBoss Cache Configuration Note :</emphasis> To improve CMS performance JBoss Cache is leveraged to cache the content cluster wide.
- We recommend that you use the following version of JBoss Cache for best performance:
- <itemizedlist>
- <listitem><emphasis>JBoss Cache 1.4.0.SP1 and above</emphasis></listitem>
- <listitem><emphasis>JGroups 2.2.7 or 2.2.8</emphasis></listitem>
- </itemizedlist>
- When building from source the following command: {core}/build.xml deploy-ha automatically upgrades your JBoss
- Cache version.
- </para>
- <para>
- <emphasis>Alternative: </emphasis> If upgrading your JBoss Cache version is not an option, the following configuration
- change is needed in the jboss-portal-ha.sar/portal-cms.sar/META-INF/jboss-service.xml.
- Replace the following configuration in the <emphasis>cms.pm.cache:service=TreeCache</emphasis> Mbean:
- <programlisting><![CDATA[
+ <note>
+ <para>
+ To improve CMS performance JBoss Cache is leveraged to cache the content cluster wide.
+ We recommend that you use the following version of JBoss Cache for best performance:
+ <itemizedlist>
+ <listitem>
+ <emphasis>JBoss Cache 1.4.0.SP1 and above</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis>JGroups 2.2.7 or 2.2.8</emphasis>
+ </listitem>
+ </itemizedlist>
+ When building from source the following command:
+ <literal>{core}/build.xml deploy-ha</literal> automatically upgrades your JBoss Cache version.
+ </para>
+ <para>
+ <emphasis>Alternative:</emphasis>
+ If upgrading your JBoss Cache version is not an option, the following configuration
+ change is needed in the
+ <literal>jboss-portal-ha.sar/portal-cms.sar/META-INF/jboss-service.xml</literal>.
+ Replace the following configuration in the
+ <emphasis>cms.pm.cache:service=TreeCache</emphasis>
+ Mbean:
+ <programlisting><![CDATA[
<!--
Configuring the PortalCMSCacheLoader
CacheLoader configuration for 1.4.0
@@ -288,7 +295,7 @@
</cacheloader>
</config>
</attribute>]]>
- </programlisting>
+ </programlisting>
with the following configuration:
<programlisting><![CDATA[
<!--
@@ -305,10 +312,11 @@
<attribute name="CacheLoaderFetchPersistentState">false</attribute>
<attribute name="CacheLoaderAsynchronous">false</attribute> ]]></programlisting>
- </para>
+ </para>
+ </note>
- <para>Finally we can start both servers, open two shells and execute :
+ <para>Finally we can start both servers, open two shells and execute :
<programlisting><![CDATA[
>cd $JBOSS_HOME/bin
>./run.sh -c ports-01
@@ -320,8 +328,6 @@
</para>
</sect1>
-
-
<sect1 id="portlet_session_replication">
<title>Portlet Session Replication</title>
<para>Web containers offer the capability to replicate sessions of web applications. In the context of a portal using portlets the use case is different. The portal itself is a web application
@@ -341,19 +347,20 @@
<listitem>Replicate only the portlet that requires it.</listitem>
<listitem>Portal session replication is just web application replication and is very standard.</listitem>
</itemizedlist>
- <para>There are also some limitation such has you can only replicate portlet scoped attributes of a portlet
- session. It means that any attribute scoped using application scope are not replicated.</para>
+ <para>There are, however, some limitations. For example, you can only replicate portlet-scoped attributes of a portlet
+ session. This means that any application-scoped attribute are not replicated.</para>
<sect2>
<title>JBoss Portal configuration</title>
<para>The mandatory step to make JBoss Portal able to replicate portlet sessions is to configure
- the portal web application to be distributed which is explained in <xref linkend="PortalSessionReplication"/></para>
+ the portal web application to be distributed as explained in <xref linkend="PortalSessionReplication"/></para>
</sect2>
<sect2>
<title>Portlet configuration</title>
- <para>In order to activate portlet session replication you need to</para>
+ <para>In order to activate portlet session replication you need to:</para>
<itemizedlist>
- <listitem>Add a specific listener class to the <emphasis>/WEB-INF/web.xml</emphasis> file of your web application</listitem>
- <listitem>Configure your portlet to be distributed in the <emphasis>/WEB-INF/jboss-portlet.xml</emphasis> file.</listitem>
+ <listitem>Add a Portal-specific listener class to the <literal>/WEB-INF/web.xml</literal> file of your
+ portlet web application</listitem>
+ <listitem>Configure your portlet to be distributed in the <literal>/WEB-INF/jboss-portlet.xml</literal> file</listitem>
</itemizedlist>
<para>
<programlisting><![CDATA[
@@ -397,7 +404,7 @@
is to keep consistency with the session state. If accessing a portlet would trigger replication
of application scoped attribute during the rendering of a page then another portlet on the same
page could use this attribute for generating its markup. Then the state seen by this second portlet
- would not be the same according to the order in which the portlets of this page are rendered.</listitem>
+ would not necessarily be the same depending on the order in which the portlets on this page are rendered.</listitem>
<listitem>Mutable objects need an explicit call to <emphasis>setAttribute(String name, Object value)</emphasis>
on the portlet session object in order to trigger replication by the container.</listitem>
</itemizedlist>
Modified: docs/trunk/referenceGuide/en/modules/clustering.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/clustering.xml 2007-10-13 22:06:52 UTC (rev 8639)
+++ docs/trunk/referenceGuide/en/modules/clustering.xml 2007-10-14 03:23:50 UTC (rev 8640)
@@ -163,8 +163,7 @@
</depends>
</mbean>
]]></programlisting>
- More information can be found <ulink
- url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheHibernate">here</ulink>.
+ More information can be found <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheHibernate">here</ulink>.
</para>
</sect2>
@@ -192,7 +191,7 @@
<sect2>
<title>CMS clustering</title>
<para>The CMS backend storage relies on the Apache Jackrabbit project. Jackrabbit does not support clustering out of the box.
- So the portal run the Jackrabbit service on one node of the cluster using the
+ So the portal run the Jackrabbit servicey on one node of the cluster using the
<ulink url="http://www.onjava.com/pub/a/onjava/2003/08/20/jboss_clustering.html">HA-Singleton</ulink> technology.
The file <emphasis>jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml</emphasis> contains the configuration. We will
not reproduce it in this documentation as the changes are quite complex and numerous. Access from all nodes of the cluster
@@ -209,12 +208,11 @@
<title>Setup</title>
<para>We are going to outline how to setup a two node cluster on the same machine in order to test JBoss Portal HA. The only
missing part from the full fledged setup is the addition of a load balancer in front of Tomcat. However a lot of documentation
- exist on the subject. A detailed step by step setup of Apache and mod_jk is available from the <ulink
- url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingMod_jk1.2WithJBoss">JBoss Wiki</ulink>.</para>
+ exist on the subject. A detailed step by step setup of Apache and mod_jk is available from the
+ <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingMod_jk1.2WithJBoss">JBoss Wiki</ulink>.</para>
<para>As we need two application servers running at the same time, we must avoid any conflict. For instance we will
need Tomcat to bind its socket on two different ports otherwise a network conflict will occur. We will leverage
- the service binding manager <ulink
- url="http://docs.jboss.org/jbossas/jboss4guide/r3/html/ch10.html">this chapter</ulink> of
+ the service binding manager <ulink url="http://docs.jboss.org/jbossas/jboss4guide/r3/html/ch10.html">this chapter</ulink> of
the JBoss AS documentation.</para>
<para>The first step is to copy the <emphasis>all</emphasis> configuration of JBoss into two separate
configurations that we name <emphasis>ports-01</emphasis> and <emphasis>ports-02</emphasis> :
@@ -255,21 +253,30 @@
<para>Copy JBoss Portal HA to the deploy directory of the two configurations.</para>
<!-- adding instruction about jboss cache versioning -->
- <para>
- <emphasis>JBoss Cache Configuration Note :</emphasis> To improve CMS performance JBoss Cache is leveraged to cache the content cluster wide.
- We recommend that you use the following version of JBoss Cache for best performance:
- <itemizedlist>
- <listitem><emphasis>JBoss Cache 1.4.0.SP1 and above</emphasis></listitem>
- <listitem><emphasis>JGroups 2.2.7 or 2.2.8</emphasis></listitem>
- </itemizedlist>
- When building from source the following command: {core}/build.xml deploy-ha automatically upgrades your JBoss
- Cache version.
- </para>
- <para>
- <emphasis>Alternative: </emphasis> If upgrading your JBoss Cache version is not an option, the following configuration
- change is needed in the jboss-portal-ha.sar/portal-cms.sar/META-INF/jboss-service.xml.
- Replace the following configuration in the <emphasis>cms.pm.cache:service=TreeCache</emphasis> Mbean:
- <programlisting><![CDATA[
+ <note>
+ <para>
+ To improve CMS performance JBoss Cache is leveraged to cache the content cluster wide.
+ We recommend that you use the following version of JBoss Cache for best performance:
+ <itemizedlist>
+ <listitem>
+ <emphasis>JBoss Cache 1.4.0.SP1 and above</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis>JGroups 2.2.7 or 2.2.8</emphasis>
+ </listitem>
+ </itemizedlist>
+ When building from source the following command:
+ <literal>{core}/build.xml deploy-ha</literal> automatically upgrades your JBoss Cache version.
+ </para>
+ <para>
+ <emphasis>Alternative:</emphasis>
+ If upgrading your JBoss Cache version is not an option, the following configuration
+ change is needed in the
+ <literal>jboss-portal-ha.sar/portal-cms.sar/META-INF/jboss-service.xml</literal>.
+ Replace the following configuration in the
+ <emphasis>cms.pm.cache:service=TreeCache</emphasis>
+ Mbean:
+ <programlisting><![CDATA[
<!--
Configuring the PortalCMSCacheLoader
CacheLoader configuration for 1.4.0
@@ -288,7 +295,7 @@
</cacheloader>
</config>
</attribute>]]>
- </programlisting>
+ </programlisting>
with the following configuration:
<programlisting><![CDATA[
<!--
@@ -305,10 +312,11 @@
<attribute name="CacheLoaderFetchPersistentState">false</attribute>
<attribute name="CacheLoaderAsynchronous">false</attribute> ]]></programlisting>
- </para>
+ </para>
+ </note>
- <para>Finally we can start both servers, open two shells and execute :
+ <para>Finally we can start both servers, open two shells and execute :
<programlisting><![CDATA[
>cd $JBOSS_HOME/bin
>./run.sh -c ports-01
@@ -320,8 +328,6 @@
</para>
</sect1>
-
-
<sect1 id="portlet_session_replication">
<title>Portlet Session Replication</title>
<para>Web containers offer the capability to replicate sessions of web applications. In the context of a portal using portlets the use case is different. The portal itself is a web application
@@ -341,19 +347,20 @@
<listitem>Replicate only the portlet that requires it.</listitem>
<listitem>Portal session replication is just web application replication and is very standard.</listitem>
</itemizedlist>
- <para>There are also some limitation such has you can only replicate portlet scoped attributes of a portlet
- session. It means that any attribute scoped using application scope are not replicated.</para>
+ <para>There are, however, some limitations. For example, you can only replicate portlet-scoped attributes of a portlet
+ session. This means that any application-scoped attribute are not replicated.</para>
<sect2>
<title>JBoss Portal configuration</title>
<para>The mandatory step to make JBoss Portal able to replicate portlet sessions is to configure
- the portal web application to be distributed which is explained in <xref linkend="PortalSessionReplication"/></para>
+ the portal web application to be distributed as explained in <xref linkend="PortalSessionReplication"/></para>
</sect2>
<sect2>
<title>Portlet configuration</title>
- <para>In order to activate portlet session replication you need to</para>
+ <para>In order to activate portlet session replication you need to:</para>
<itemizedlist>
- <listitem>Add a specific listener class to the <emphasis>/WEB-INF/web.xml</emphasis> file of your web application</listitem>
- <listitem>Configure your portlet to be distributed in the <emphasis>/WEB-INF/jboss-portlet.xml</emphasis> file.</listitem>
+ <listitem>Add a Portal-specific listener class to the <literal>/WEB-INF/web.xml</literal> file of your
+ portlet web application</listitem>
+ <listitem>Configure your portlet to be distributed in the <literal>/WEB-INF/jboss-portlet.xml</literal> file</listitem>
</itemizedlist>
<para>
<programlisting><![CDATA[
@@ -397,7 +404,7 @@
is to keep consistency with the session state. If accessing a portlet would trigger replication
of application scoped attribute during the rendering of a page then another portlet on the same
page could use this attribute for generating its markup. Then the state seen by this second portlet
- would not be the same according to the order in which the portlets of this page are rendered.</listitem>
+ would not necessarily be the same depending on the order in which the portlets on this page are rendered.</listitem>
<listitem>Mutable objects need an explicit call to <emphasis>setAttribute(String name, Object value)</emphasis>
on the portlet session object in order to trigger replication by the container.</listitem>
</itemizedlist>
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8639 - in modules/test/trunk: tooling/src/main/org/jboss/unit/tooling/ant and 2 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-13 18:06:52 -0400 (Sat, 13 Oct 2007)
New Revision: 8639
Modified:
modules/test/trunk/tooling/build.xml
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsType.java
modules/test/trunk/unit/build.xml
modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java
Log:
- enable usage of <sysproperty> in jboss unit tasks
Modified: modules/test/trunk/tooling/build.xml
===================================================================
--- modules/test/trunk/tooling/build.xml 2007-10-13 21:55:45 UTC (rev 8638)
+++ modules/test/trunk/tooling/build.xml 2007-10-13 22:06:52 UTC (rev 8639)
@@ -256,6 +256,8 @@
<html toDir="./output/test-results"/>
</reports>
+ <sysproperty key="toto" value="totoValue"/>
+ <sysproperty key="nono" value="nonoValue"/>
<classpath>
Modified: modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java
===================================================================
--- modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java 2007-10-13 21:55:45 UTC (rev 8638)
+++ modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java 2007-10-13 22:06:52 UTC (rev 8639)
@@ -28,9 +28,12 @@
import org.apache.tools.ant.taskdefs.optional.junit.AggregateTransformer;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Environment;
import java.util.List;
import java.util.LinkedList;
+import java.util.Set;
+import java.util.HashSet;
import java.io.File;
/**
@@ -46,6 +49,8 @@
private Path path;
+ private Set<Environment.Variable> sysproperties = new HashSet<Environment.Variable>();
+
public JBossUnitTask()
{
}
@@ -85,7 +90,13 @@
{
testsType.addConfiguredClasspath(path);
}
-
+
+
+ Set<Environment.Variable> propCopy = new HashSet<Environment.Variable>();
+ propCopy.addAll(sysproperties);
+
+ propCopy.addAll(testsType.getSysproperties());
+ testsType.setSysproperties(propCopy);
testsType.execute();
}
@@ -128,6 +139,11 @@
}
}
+ public void addConfiguredSysproperty(Environment.Variable variable)
+ {
+ sysproperties.add(variable);
+ }
+
// private void generateHTMLReports(XMLResultAggregator reporter) throws Exception
// {
//
Modified: modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsType.java
===================================================================
--- modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsType.java 2007-10-13 21:55:45 UTC (rev 8638)
+++ modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsType.java 2007-10-13 22:06:52 UTC (rev 8639)
@@ -22,7 +22,6 @@
package org.jboss.unit.tooling.ant;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
@@ -67,7 +66,9 @@
private List<PropertyType> properties = new ArrayList<PropertyType>();
+ private Set<Environment.Variable> sysproperties = new HashSet<Environment.Variable>();
+
public TestsType()
{
}
@@ -140,7 +141,15 @@
javaPath.add(getClasspath());
}
- // Set fork
+ // Set system properties
+
+ for (Environment.Variable sysproperty : sysproperties)
+ {
+ javaTask.addSysproperty(sysproperty);
+ }
+
+
+ // Set fork
if (isFork())
{
javaTask.setFork(true);
@@ -394,9 +403,16 @@
return parsedProps;
}
-
+ public Set<Environment.Variable> getSysproperties()
+ {
+ return sysproperties;
+ }
+ public void setSysproperties(Set<Environment.Variable> sysproperties)
+ {
+ this.sysproperties = sysproperties;
+ }
public void addConfiguredInclude(IncludeType include)
{
Modified: modules/test/trunk/unit/build.xml
===================================================================
--- modules/test/trunk/unit/build.xml 2007-10-13 21:55:45 UTC (rev 8638)
+++ modules/test/trunk/unit/build.xml 2007-10-13 22:06:52 UTC (rev 8639)
@@ -190,6 +190,7 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
-->
+
<classpath>
<path location="${build.lib}/jboss-unit-lib.jar"/>
<path location="${build.lib}/jboss-unit-test.jar"/>
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java 2007-10-13 21:55:45 UTC (rev 8638)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java 2007-10-13 22:06:52 UTC (rev 8639)
@@ -153,6 +153,12 @@
System.out.println("TestRunnerContext contains: ");
System.out.println("Properties: " + properties.toString());
+// System.out.println("System properties:");
+// for (Object key : System.getProperties().keySet())
+// {
+//
+// System.out.println(key + "=" + System.getProperty((String)key));
+// }
TestRunnerContextSupport runnerContext = new TestRunnerContextSupport(properties, new ParametrizationSet(), mainFilter, broadcaster);
runner.run(runnerContext);
16 years, 8 months
- 1
- 0
JBoss Portal SVN: r8638 - in modules/portlet/trunk: build/ide/intellij/idea60/modules/portlet and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-10-13 17:55:45 -0400 (Sat, 13 Oct 2007)
New Revision: 8638
Removed:
modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/samples.iml
Modified:
modules/portlet/trunk/jboss-portal-portlet.ipr
Log:
remove an intellij file samples.iml that was along with the portlet.iml
Deleted: modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/samples.iml
===================================================================
--- modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/samples.iml 2007-10-13 21:51:29 UTC (rev 8637)
+++ modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/samples.iml 2007-10-13 21:55:45 UTC (rev 8638)
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../../../../../samples/output/idea50/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$/../../../../../../samples">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../samples/src/main" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/../../../../../../samples/output" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="api" />
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="portlet" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
- <component name="VcsManagerConfiguration">
- <option name="ACTIVE_VCS_NAME" value="svn" />
- <option name="USE_PROJECT_VCS" value="false" />
- </component>
- <component name="copyright">
- <Base>
- <setting name="state" value="1" />
- </Base>
- <LanguageOptions name="$TEMPLATE$">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="true" />
- <option name="separateAfter" value="true" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="true" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, Red Hat Middleware, LLC, and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="4" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="CSS">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="HTML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JAVA">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JSP">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JavaScript">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="Properties">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="XML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- </component>
-</module>
-
Modified: modules/portlet/trunk/jboss-portal-portlet.ipr
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.ipr 2007-10-13 21:51:29 UTC (rev 8637)
+++ modules/portlet/trunk/jboss-portal-portlet.ipr 2007-10-13 21:55:45 UTC (rev 8638)
@@ -61,7 +61,6 @@
<option name="OUTPUT_DIRECTORY" />
</component>
<component name="GUI Designer component loader factory" />
- <component name="IdProvider" IDEtalkID="E2A438D8B6AE84F43587A2210E562521" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
@@ -88,6 +87,36 @@
<option name="myVal" value="100" />
</server>
</used_levels>
+ <inspection_tool class="JavaDoc" level="WARNING" enabled="false">
+ <option name="TOP_LEVEL_CLASS_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+ <option name="REQUIRED_TAGS" value="" />
+ </value>
+ </option>
+ <option name="INNER_CLASS_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+ <option name="REQUIRED_TAGS" value="" />
+ </value>
+ </option>
+ <option name="METHOD_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+ <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+ </value>
+ </option>
+ <option name="FIELD_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+ <option name="REQUIRED_TAGS" value="" />
+ </value>
+ </option>
+ <option name="IGNORE_DEPRECATED" value="false" />
+ <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+ <option name="myAdditionalJavadocTags" value="" />
+ </inspection_tool>
+ <inspection_tool class="DuplicateThrows" level="WARNING" enabled="false" />
</profile>
</profiles>
</component>
@@ -284,13 +313,10 @@
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/management/management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/management/management.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" />
- <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" />
- <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" />
- <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/output" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/classes" />
</component>
<component name="ProjectRunConfigurationManager" />
<component name="RmicSettings">
@@ -300,10 +326,6 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
- <component name="StarteamVcsAdapter" />
- <component name="VssVcs">
- <SourceSafePersistencyRemovedFolder>$PROJECT_DIR$/wsrp/src/resources/test</SourceSafePersistencyRemovedFolder>
- </component>
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
@@ -311,179 +333,6 @@
</value>
</option>
</component>
- <component name="copyright">
- <Base>
- <setting name="state" value="1" />
- </Base>
- <LanguageOptions name="$TEMPLATE$">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="true" />
- <option name="separateAfter" value="true" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="true" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, Red Hat Middleware, LLC, and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="4" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="CSS">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="1" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="HTML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="1" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JAVA">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JSP">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="1" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JavaScript">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="1" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="Properties">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="1" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="XML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- </component>
<component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
16 years, 8 months
- 1
- 0