JBoss Portal SVN: r8697 - branches.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-10-18 12:37:16 -0400 (Thu, 18 Oct 2007)
New Revision: 8697
Added:
branches/JBoss_Portal_2_6_2_SecurityPatch/
Log:
Creating a branch to test porting of security patch
Copied: branches/JBoss_Portal_2_6_2_SecurityPatch (from rev 8696, tags/JBoss_Portal_2_6_2)
16 years, 8 months
JBoss Portal SVN: r8696 - in branches/UIServer: uiserver and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-10-18 12:31:46 -0400 (Thu, 18 Oct 2007)
New Revision: 8696
Modified:
branches/UIServer/core-uiserver/build.xml
branches/UIServer/uiserver/build.xml
Log:
cleaning up build to clear up module dependencies
Modified: branches/UIServer/core-uiserver/build.xml
===================================================================
--- branches/UIServer/core-uiserver/build.xml 2007-10-18 16:02:40 UTC (rev 8695)
+++ branches/UIServer/core-uiserver/build.xml 2007-10-18 16:31:46 UTC (rev 8696)
@@ -96,9 +96,9 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portlet-api.classpath"/>
+ <path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-server.classpath"/>
- <path refid="jboss.portal-web.classpath"/>
+ <path refid="jboss.portal-web.classpath"/>
</path>
<!--+=======================================+-->
Modified: branches/UIServer/uiserver/build.xml
===================================================================
--- branches/UIServer/uiserver/build.xml 2007-10-18 16:02:40 UTC (rev 8695)
+++ branches/UIServer/uiserver/build.xml 2007-10-18 16:31:46 UTC (rev 8696)
@@ -96,13 +96,10 @@
<!-- Configure modules -->
<call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <path refid="jboss.portlet-api.classpath"/>
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-common.classpath"/>
- <path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-server.classpath"/>
- <path refid="jboss.portal-theme.classpath"/>
- <path refid="jboss.portal-web.classpath"/>
+ <path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-core-uiserver.classpath"/>
</path>
16 years, 8 months
JBoss Portal SVN: r8695 - tools and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-18 12:02:40 -0400 (Thu, 18 Oct 2007)
New Revision: 8695
Added:
tools/docbook/
Removed:
docbook/
Log:
Oups
Copied: tools/docbook (from rev 8694, docbook)
16 years, 8 months
JBoss Portal SVN: r8694 - /.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-18 12:02:19 -0400 (Thu, 18 Oct 2007)
New Revision: 8694
Added:
tools/
Log:
Mkdir
16 years, 8 months
JBoss Portal SVN: r8693 - docs/trunk.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-18 11:55:04 -0400 (Thu, 18 Oct 2007)
New Revision: 8693
Removed:
docs/trunk/docbook-support/
Log:
Removing docbook-support from trunk
16 years, 8 months
JBoss Portal SVN: r8691 - in modules/test/trunk: unit/src/main/org/jboss/unit/info/impl and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-10-18 11:34:25 -0400 (Thu, 18 Oct 2007)
New Revision: 8691
Modified:
modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java
modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java
modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java
Log:
improve the remote test driver server by using a more flexible delegation model
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-18 15:09:20 UTC (rev 8690)
+++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-18 15:34:25 UTC (rev 8691)
@@ -22,29 +22,28 @@
******************************************************************************/
package org.jboss.unit.remote.driver;
-import org.jboss.unit.driver.TestDriver;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.annotations.Inject;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.portal.test.framework.deployment.Deployer;
+import org.jboss.portal.test.framework.server.Node;
+import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.test.framework.server.NodeManager;
+import org.jboss.unit.Failure;
+import org.jboss.unit.TestId;
import org.jboss.unit.driver.DriverCommand;
-import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.DriverContext;
import org.jboss.unit.driver.DriverException;
-import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.TestDriver;
import org.jboss.unit.driver.command.StartTestCommand;
+import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.info.TestInfo;
-import org.jboss.unit.info.TestSuiteInfo;
-import org.jboss.unit.info.impl.SimpleTestSuiteInfo;
-import org.jboss.unit.TestId;
-import org.jboss.unit.Failure;
-import org.jboss.portal.test.framework.server.NodeId;
-import org.jboss.portal.test.framework.server.Node;
-import org.jboss.portal.test.framework.server.NodeManager;
-import org.jboss.portal.test.framework.deployment.Deployer;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.annotations.Inject;
+import org.jboss.unit.info.impl.SimpleTestInfo;
import java.net.URL;
@@ -63,7 +62,7 @@
// Services
/** . */
- private SimpleTestSuiteInfo info;
+ private SimpleTestInfo info;
/** . */
private DriverContext context;
@@ -191,7 +190,7 @@
TestDriver server = getServer(node);
//
- info = new SimpleTestSuiteInfo((TestSuiteInfo)server.getInfo());
+ info = SimpleTestInfo.create(server.getInfo());
}
public void destroyDriver()
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java 2007-10-18 15:09:20 UTC (rev 8690)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java 2007-10-18 15:34:25 UTC (rev 8691)
@@ -24,6 +24,8 @@
import org.jboss.unit.info.TestInfo;
import org.jboss.unit.info.ParameterInfo;
+import org.jboss.unit.info.TestSuiteInfo;
+import org.jboss.unit.info.TestCaseInfo;
import java.util.Map;
import java.util.Set;
@@ -118,4 +120,29 @@
}
this.keywords = new HashSet<String>(keywords);
}
+
+ /**
+ * Factory method for cloning the state of an existing test info.
+ *
+ * @param testInfo the inf oto clone
+ * @return the clone
+ * @throws IllegalArgumentException if the test info is null or has an incorrect state
+ */
+ public static SimpleTestInfo create(TestInfo testInfo) throws IllegalArgumentException
+ {
+ if (testInfo == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (testInfo instanceof TestSuiteInfo)
+ {
+ TestSuiteInfo testSuite = (TestSuiteInfo)testInfo;
+ return new SimpleTestSuiteInfo(testSuite);
+ }
+ else
+ {
+ TestCaseInfo testCase = (TestCaseInfo)testInfo;
+ return new SimpleTestCaseInfo(testCase);
+ }
+ }
}
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java 2007-10-18 15:09:20 UTC (rev 8690)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java 2007-10-18 15:34:25 UTC (rev 8691)
@@ -24,7 +24,6 @@
import org.jboss.unit.info.TestSuiteInfo;
import org.jboss.unit.info.TestInfo;
-import org.jboss.unit.info.TestCaseInfo;
import org.jboss.unit.TestId;
import java.util.Map;
@@ -149,20 +148,6 @@
this.parameters = parameters;
}
- private SimpleTestInfo create(TestInfo test)
- {
- if (test instanceof TestSuiteInfo)
- {
- TestSuiteInfo testSuite = (TestSuiteInfo)test;
- return new SimpleTestSuiteInfo(testSuite);
- }
- else
- {
- TestCaseInfo testCase = (TestCaseInfo)test;
- return new SimpleTestCaseInfo(testCase);
- }
- }
-
public String toString()
{
StringBuilder builder = new StringBuilder(getName());
@@ -179,4 +164,5 @@
builder.append(']');
return builder.toString();
}
+
}
16 years, 8 months
JBoss Portal SVN: r8690 - modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-10-18 11:09:20 -0400 (Thu, 18 Oct 2007)
New Revision: 8690
Modified:
modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java
Log:
improve the remote test driver server by using a more flexible delegation model
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-18 15:05:31 UTC (rev 8689)
+++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-18 15:09:20 UTC (rev 8690)
@@ -30,6 +30,7 @@
import org.jboss.unit.driver.DriverContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.DriverCommand;
+import org.jboss.unit.driver.DriverException;
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.remote.RequestContext;
import org.jboss.unit.remote.ResponseContext;
@@ -45,61 +46,63 @@
{
/** . */
- private RemoteTestDriver drivers;
+ private RemoteTestDriver delegate;
- public TestDriver getDrivers()
+ public TestDriver getDelegate()
{
- return drivers;
+ return delegate;
}
- public void setDrivers(RemoteTestDriver drivers)
+ public void setDelegate(RemoteTestDriver delegate)
{
- this.drivers = drivers;
+ this.delegate = delegate;
}
- public void initDriver(DriverContext context)
+ public void initDriver(DriverContext context) throws DriverException
{
+ delegate.initDriver(context);
}
public void destroyDriver()
{
+ delegate.destroyDriver();
}
public TestInfo getInfo()
{
- if (drivers == null)
+ if (delegate == null)
{
return new SimpleTestSuiteInfo("Empty");
}
//
- return drivers.getInfo();
+ return delegate.getInfo();
}
public DriverResponse invoke(TestId id, DriverCommand command)
{
- if (drivers == null)
+ if (delegate == null)
{
return new FailureResponse(Failure.createErrorFailure("No such test with id " + id));
}
//
- return drivers.invoke(id, command);
+ return delegate.invoke(id, command);
}
public void pushContext(TestId testId, RequestContext requestContext)
{
- if (drivers != null)
+ if (delegate != null)
{
- drivers.pushContext(testId, requestContext);
+ delegate.pushContext(testId, requestContext);
}
}
public ResponseContext popContext(TestId testId)
{
- if (drivers != null)
+ if (delegate != null)
{
- return drivers.popContext(testId);
+ return delegate.popContext(testId);
}
//
16 years, 8 months
JBoss Portal SVN: r8689 - modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-10-18 11:05:31 -0400 (Thu, 18 Oct 2007)
New Revision: 8689
Added:
modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/CompositeRemoteTestDriver.java
Modified:
modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java
Log:
improve the remote test driver server by using a more flexible delegation model
Added: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/CompositeRemoteTestDriver.java
===================================================================
--- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/CompositeRemoteTestDriver.java (rev 0)
+++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/CompositeRemoteTestDriver.java 2007-10-18 15:05:31 UTC (rev 8689)
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * 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.remote.driver;
+
+import org.jboss.unit.Failure;
+import org.jboss.unit.TestId;
+import org.jboss.unit.driver.TestDriver;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.driver.impl.composite.CompositeTestDriver;
+import org.jboss.unit.remote.RequestContext;
+import org.jboss.unit.remote.ResponseContext;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class CompositeRemoteTestDriver extends CompositeTestDriver implements RemoteTestDriver
+{
+
+ public void pushContext(TestId testId, RequestContext requestContext)
+ {
+ String name = testId.getName(0);
+
+ //
+ TestDriver driver = drivers.get(name);
+
+ //
+ if (driver instanceof RemoteTestDriver)
+ {
+ RemoteTestDriver remoteDriver = (RemoteTestDriver)driver;
+
+ //
+ remoteDriver.pushContext(testId.range(1), requestContext);
+ }
+ }
+
+ public ResponseContext popContext(TestId testId)
+ {
+ String name = testId.getName(0);
+
+ //
+ TestDriver driver = drivers.get(name);
+
+ //
+ if (driver instanceof RemoteTestDriver)
+ {
+ RemoteTestDriver remoteDriver = (RemoteTestDriver)driver;
+
+ //
+ return remoteDriver.popContext(testId.range(1));
+ }
+
+ //
+ return new ResponseContext(new FailureResponse(Failure.createErrorFailure("No test found for " + testId)), new HashMap<String, Serializable>());
+ }
+}
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-18 10:31:49 UTC (rev 8688)
+++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-18 15:05:31 UTC (rev 8689)
@@ -31,10 +31,12 @@
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.DriverCommand;
import org.jboss.unit.driver.response.FailureResponse;
-import org.jboss.unit.driver.impl.composite.CompositeTestDriver;
import org.jboss.unit.remote.RequestContext;
import org.jboss.unit.remote.ResponseContext;
+import java.io.Serializable;
+import java.util.HashMap;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5636 $
@@ -43,14 +45,14 @@
{
/** . */
- private CompositeTestDriver drivers = new CompositeTestDriver();
+ private RemoteTestDriver drivers;
- public CompositeTestDriver getDrivers()
+ public TestDriver getDrivers()
{
return drivers;
}
- public void setDrivers(CompositeTestDriver drivers)
+ public void setDrivers(RemoteTestDriver drivers)
{
this.drivers = drivers;
}
@@ -89,19 +91,7 @@
{
if (drivers != null)
{
- String name = testId.getName(0);
-
- //
- TestDriver driver = drivers.get(name);
-
- //
- if (driver instanceof RemoteTestDriver)
- {
- RemoteTestDriver remoteDriver = (RemoteTestDriver)driver;
-
- //
- remoteDriver.pushContext(testId.range(1), requestContext);
- }
+ drivers.pushContext(testId, requestContext);
}
}
@@ -109,49 +99,10 @@
{
if (drivers != null)
{
- String name = testId.getName(0);
-
- //
- TestDriver driver = drivers.get(name);
-
- //
- if (driver instanceof RemoteTestDriver)
- {
- RemoteTestDriver remoteDriver = (RemoteTestDriver)driver;
-
- //
- return remoteDriver.popContext(testId.range(1));
- }
+ return drivers.popContext(testId);
}
//
- return null;
+ return new ResponseContext(new FailureResponse(Failure.createErrorFailure("No test found for " + testId)), new HashMap<String, Serializable>());
}
-
-
-// /** . */
-// private String initialPath = "/test";
-//
-// public String getInitialPath()
-// {
-// return initialPath;
-// }
-//
-// public void setInitialPath(String initialPath)
-// {
-// this.initialPath = initialPath;
-// }
-//
-// public void pushContext(String testId, TestContext testContext)
-// {
-// if (testContext instanceof HTTPTestContext)
-// {
-// HTTPTestContext httpTestContext = (HTTPTestContext)testContext;
-// httpTestContext.initialPath = initialPath;
-// }
-//
-// //
-// super.pushContext(testId, testContext);
-// }
-
}
16 years, 8 months
JBoss Portal SVN: r8688 - modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-18 06:31:49 -0400 (Thu, 18 Oct 2007)
New Revision: 8688
Modified:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java
Log:
- fix OpenDS support
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java 2007-10-18 10:10:11 UTC (rev 8687)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java 2007-10-18 10:31:49 UTC (rev 8688)
@@ -30,6 +30,14 @@
public interface OpenDSServiceMBean
{
+ public void create() throws Exception;
+
+ public void start() throws Exception;
+
+ public void stop() throws Exception;
+
+ public void destroy() throws Exception;
+
/*public String printDiagnostics();
public void restart();
16 years, 8 months