[portal-commits] JBoss Portal SVN: r8025 - in modules/test/trunk/test: src/main/org/jboss/portal/test/framework and 34 other directories.

Author: julien(a)jboss.com Date: 2007-08-22 10:08:45 -0400 (Wed, 22 Aug 2007) New Revision: 8025 Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/agent/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/agent/GenericTestAgent.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/DirectServiceLookup.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceExporter.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceLookup.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgent.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgentMBean.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/server/ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/server/JBossServiceLookup.java modules/test/trunk/test/src/resources/generic/ modules/test/trunk/test/src/resources/generic/portal-test-jar/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml modules/test/trunk/test/src/resources/jboss/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml Removed: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/agent/jboss/ Modified: modules/test/trunk/test/build.xml modules/test/trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/AbstractTestDriverServer.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/ServiceLookup.java modules/test/trunk/test/src/resources/portal-test-agent-sar/META-INF/jboss-service.xml modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml Log: test framework improvments with introduction of generic agent Modified: modules/test/trunk/test/build.xml =================================================================== --- modules/test/trunk/test/build.xml 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/build.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -97,6 +97,8 @@ <path refid="apache.logging.classpath"/> <path refid="junit.junit.classpath"/> <path refid="sun.servlet.classpath"/> + <path refid="jboss.remoting.classpath"/> + <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/> <path location="selenium-java-client-driver-backport.jar"/> <!--<path refid="sun.opends.classpath"/>--> </path> @@ -227,25 +229,34 @@ <!-- --> <jar jarfile="${build.lib}/portal-test-lib.jar" manifest="${build.etc}/portal-test-lib-jar.mf"> <fileset dir="${build.classes}"> -<!-- - <exclude name="org/jboss/portal/test/framework/agent/**"/> ---> + <exclude name="org/jboss/portal/test/framework/impl/**"/> + <exclude name="org/jboss/test/**"/> </fileset> - <fileset dir="${build.resources}/portal-test-jar"/> </jar> <!-- --> - <jar jarfile="${build.lib}/portal-test-agent-lib.jar" manifest="${build.etc}/portal-test-lib-jar.mf"> + <jar jarfile="${build.lib}/portal-test-jboss-lib.jar" manifest="${build.etc}/portal-test-lib-jar.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/portal/test/framework/agent/**"/> + <include name="org/jboss/portal/test/framework/impl/jboss/**"/> <include name="org/jboss/portal/test/framework/embedded/opends/**"/> </fileset> + <fileset dir="${build.resources}/jboss/portal-test-jar"/> </jar> <!-- --> + <jar jarfile="${build.lib}/portal-test-generic-lib.jar" manifest="${build.etc}/portal-test-lib-jar.mf"> + <fileset dir="${build.classes}"> + <include name="org/jboss/portal/test/framework/impl/generic/**"/> + </fileset> + <fileset dir="${build.resources}/generic/portal-test-jar"/> + </jar> + + <!-- --> <jar jarfile="${build.lib}/portal-test-agent.sar"> <fileset dir="${build.resources}/portal-test-agent-sar"/> - <fileset dir="${build.lib}" includes="portal-test-agent-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> + <fileset dir="${build.lib}" includes="portal-test-lib.jar"/> + <fileset dir="${build.lib}" includes="portal-test-jboss-lib.jar"/> </jar> <!-- What we put in the repository --> Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -23,9 +23,7 @@ package org.jboss.portal.test.framework.deployment; -import junit.framework.AssertionFailedError; import org.apache.log4j.Logger; -import org.jboss.deployment.DeploymentException; import org.jboss.portal.test.framework.agent.TestAgent; import org.jboss.portal.test.framework.server.Node; @@ -83,28 +81,12 @@ } // - try + for (int i = 0;i < nodes.length;i++) { - for (int i = 0;i < nodes.length;i++) - { - Node node = nodes[i]; - TestAgent agent = (TestAgent)node.lookupService(TestAgent.SERVICE_ID); - agent.deploy(url); - } + Node node = nodes[i]; + TestAgent agent = (TestAgent)node.lookupService(TestAgent.SERVICE_ID); + agent.deploy(url); } - catch (Exception e) - { - if (e instanceof DeploymentException) - { - throw(DeploymentException)e; - } - else - { - AssertionFailedError error = new AssertionFailedError(); - error.initCause(e); - throw error; - } - } // deployed = true; Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/AbstractTestDriverServer.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/AbstractTestDriverServer.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/AbstractTestDriverServer.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -24,7 +24,6 @@ import org.jboss.portal.test.framework.agent.TestAgent; import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver; -import org.jboss.system.ServiceMBeanSupport; /** * Just put here low level details such as the agent connection and the detyped invocation stuff. @@ -32,7 +31,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public abstract class AbstractTestDriverServer extends ServiceMBeanSupport implements RemoteTestDriver +public abstract class AbstractTestDriverServer /*extends ServiceMBeanSupport*/ implements RemoteTestDriver { /** . */ Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -38,13 +38,10 @@ { /** . */ - protected final RemoteTestSuite suite; + private static final RemoteTestSuite suite = new RemoteTestSuite("Main"); - - public RemoteTestDriverServer() { - suite = new RemoteTestSuite("Main"); } public void pushContext(String testId, TestContext testContext) @@ -60,14 +57,20 @@ return suite.popContext(testId); } - public synchronized void addDriver(TestDriver driver) + public void addDriver(TestDriver driver) { - suite.addDriver(driver); + synchronized(RemoteTestDriverServer.class) + { + suite.addDriver(driver); + } } public synchronized void removeDriver(TestDriver driver) { - suite.removeDriver(driver); + synchronized(RemoteTestDriverServer.class) + { + suite.removeDriver(driver); + } } public TestDriver getDriver(String testId) Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/agent/GenericTestAgent.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/agent/GenericTestAgent.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/agent/GenericTestAgent.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,118 @@ +/****************************************************************************** + * 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.portal.test.framework.impl.generic.agent; + +import org.jboss.portal.test.framework.agent.TestAgent; +import org.codehaus.cargo.container.deployer.Deployer; +import org.codehaus.cargo.container.deployer.DeployerType; +import org.codehaus.cargo.container.deployable.Deployable; +import org.codehaus.cargo.container.deployable.WAR; +import org.codehaus.cargo.container.configuration.Configuration; +import org.codehaus.cargo.container.configuration.ConfigurationType; +import org.codehaus.cargo.container.property.GeneralPropertySet; +import org.codehaus.cargo.container.property.ServletPropertySet; +import org.codehaus.cargo.container.property.RemotePropertySet; +import org.codehaus.cargo.container.ContainerType; +import org.codehaus.cargo.container.Container; +import org.codehaus.cargo.generic.configuration.ConfigurationFactory; +import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory; +import org.codehaus.cargo.generic.ContainerFactory; +import org.codehaus.cargo.generic.DefaultContainerFactory; +import org.codehaus.cargo.generic.deployer.DeployerFactory; +import org.codehaus.cargo.generic.deployer.DefaultDeployerFactory; + +import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; +import java.io.File; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class GenericTestAgent implements TestAgent +{ + + /** . */ + private Deployer cargoDeployer; + + public void start() + { + +// String name = "jboss4x"; +// String protocol = "http"; +// String host = "localhost"; +// String port = "8080"; + + ContainerType containerType = ContainerType.REMOTE; + DeployerType deployerType = DeployerType.REMOTE; + String name = "tomcat5x"; + String protocol = "http"; + String host = "localhost"; + String port = "8080"; + String username = "admin"; + String password = "admin"; + + ConfigurationFactory cfgFactory = new DefaultConfigurationFactory(); + Configuration cfg = cfgFactory.createConfiguration(name, ConfigurationType.RUNTIME); + cfg.setProperty(GeneralPropertySet.PROTOCOL, protocol); + cfg.setProperty(GeneralPropertySet.HOSTNAME, host); + cfg.setProperty(ServletPropertySet.PORT, port); + cfg.setProperty(RemotePropertySet.USERNAME, username); + cfg.setProperty(RemotePropertySet.PASSWORD, password); + + ContainerFactory containerFactory = new DefaultContainerFactory(); + Container container = containerFactory.createContainer(name, containerType, cfg); + + DeployerFactory deployerFactory = new DefaultDeployerFactory(); + cargoDeployer = deployerFactory.createDeployer(container, deployerType); + } + + public void deploy(URL url) throws Exception + { + Deployable deployable = createDeployable(url); + cargoDeployer.deploy(deployable); + } + + public void undeploy(URL url) throws Exception + { + Deployable deployable = createDeployable(url); + cargoDeployer.undeploy(deployable); + } + + private Deployable createDeployable(URL url) throws URISyntaxException, IllegalArgumentException + { + if (url != null) + { + if ("file".equals(url.getProtocol())) + { + File f = new File(url.toURI()); + if (f.getName().endsWith(".war")) + { + return new WAR(f.getAbsolutePath()); + } + } + } + throw new IllegalArgumentException("Illegal URL " + url); + } +} Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/DirectServiceLookup.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/DirectServiceLookup.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/DirectServiceLookup.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,51 @@ +/****************************************************************************** + * 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.portal.test.framework.impl.generic.server; + +import org.jboss.portal.test.framework.server.ServiceLookup; +import org.jboss.portal.test.framework.server.ServiceLookupFailedException; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class DirectServiceLookup implements ServiceLookup +{ + + /** . */ + private Object service; + + public DirectServiceLookup(Object service) + { + this.service = service; + } + + public Object lookupService() throws ServiceLookupFailedException + { + if (service == null) + { + throw new ServiceLookupFailedException(); + } + return service; + } +} Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceExporter.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceExporter.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceExporter.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,62 @@ +/****************************************************************************** + * 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.portal.test.framework.impl.generic.server; + +import org.jboss.remoting.transporter.TransporterServer; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class GenericServiceExporter +{ + + /** . */ + private String locatorURI; + + /** . */ + private String serviceInterface; + + /** . */ + private Object service; + + /** . */ + private TransporterServer server; + + public GenericServiceExporter(String locatorURI, Object service, String serviceInterface) + { + this.locatorURI = locatorURI; + this.service = service; + this.serviceInterface = serviceInterface; + } + + public void start() throws Exception + { + server = TransporterServer.createTransporterServer(locatorURI, service, serviceInterface); + } + + public void stop() + { + server.stop(); + } +} Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceLookup.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceLookup.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/server/GenericServiceLookup.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,64 @@ +/****************************************************************************** + * 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.portal.test.framework.impl.generic.server; + +import org.jboss.portal.test.framework.server.ServiceLookup; +import org.jboss.portal.test.framework.server.ServiceLookupFailedException; +import org.jboss.remoting.transporter.TransporterClient; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class GenericServiceLookup implements ServiceLookup +{ + + /** . */ + private final String locatorURI; + + /** . */ + private final String serviceInterface; + + public GenericServiceLookup(String locatorURI, String serviceInterface) + { + this.locatorURI = locatorURI; + this.serviceInterface = serviceInterface; + } + + public Object lookupService() throws ServiceLookupFailedException + { + try + { + Class proxyInterface = Thread.currentThread().getContextClassLoader().loadClass(serviceInterface); + return TransporterClient.createTransporterClient(locatorURI, proxyInterface); + } + catch (ClassNotFoundException e) + { + throw new ServiceLookupFailedException(e); + } + catch (Exception e) + { + throw new ServiceLookupFailedException(e); + } + } +} Copied: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgent.java (from rev 7989, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/agent/jboss/JBossTestAgent.java) =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgent.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgent.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -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.portal.test.framework.impl.jboss.agent; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.system.ServiceMBeanSupport; + +import java.net.URL; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5669 $ + */ +public class JBossTestAgent extends ServiceMBeanSupport implements JBossTestAgentMBean +{ + + /** Keep a thread local of sessions. */ + private static final ThreadLocal local = new ThreadLocal(); + + /** + * Record the exception that will be reused later by the same agent to be aware of the recorded exception. + * + * @param e the deployment exception to log. + */ + public static void record(DeploymentException e) + { + Session session = (Session)local.get(); + + // Record the exception only if we have a session otherwise we may leek the exception in the thread local. + if (session != null && session.e == null) + { + session.e = e; + } + } + + /** The main deployer delegate. */ + private MainDeployerMBean mainDeployer; + + public MainDeployerMBean getMainDeployer() + { + return mainDeployer; + } + + public void setMainDeployer(MainDeployerMBean mainDeployer) + { + this.mainDeployer = mainDeployer; + } + + public void deploy(URL url) throws Exception + { + perform(url, true); + } + + public void undeploy(URL url) throws Exception + { + perform(url, false); + } + + private void perform(URL url, boolean deploy) throws DeploymentException + { + try + { + Session session = new Session(); + local.set(session); + + // The main deployer could throw an exception but that will be an exception not related to jboss portal + if (deploy) + { + mainDeployer.deploy(url); + } + else + { + mainDeployer.undeploy(url); + } + + // If e is not null that means an exception was thrown into jboss portal layer and we rethrow it + // to the client + if (session.e != null) + { + throw session.e; + } + } + finally + { + local.set(null); + } + } + + /** Just a place holder for the deployment exception. */ + private static class Session + { + private DeploymentException e; + } +} Property changes on: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgent.java ___________________________________________________________________ Name: svn:executable + Copied: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgentMBean.java (from rev 7989, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/agent/jboss/JBossTestAgentMBean.java) =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgentMBean.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/agent/JBossTestAgentMBean.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,38 @@ +/****************************************************************************** + * 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.portal.test.framework.impl.jboss.agent; + +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.system.ServiceMBean; +import org.jboss.portal.test.framework.agent.TestAgent; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface JBossTestAgentMBean extends TestAgent, ServiceMBean +{ + MainDeployerMBean getMainDeployer(); + + void setMainDeployer(MainDeployerMBean mainDeployer); +} Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/server/JBossServiceLookup.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/server/JBossServiceLookup.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/server/JBossServiceLookup.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,82 @@ +/****************************************************************************** + * 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.portal.test.framework.impl.jboss.server; + +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.portal.test.framework.server.ServiceLookup; +import org.jboss.portal.test.framework.server.ServiceLookupFailedException; + +import javax.management.ObjectName; +import javax.management.MBeanServer; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class JBossServiceLookup implements ServiceLookup +{ + + /** . */ + private final MBeanServer mbeanServer; + + /** . */ + private final ObjectName objectName; + + /** . */ + private final String serviceInterface; + + public JBossServiceLookup(MBeanServer mbeanServer, ObjectName objectName, String serviceInterface) + { + this.mbeanServer = mbeanServer; + this.objectName = objectName; + this.serviceInterface = serviceInterface; + } + + public ObjectName getObjectName() + { + return objectName; + } + + public String getServiceInterface() + { + return serviceInterface; + } + + public Object lookupService() throws ServiceLookupFailedException + { + try + { + Class proxyInterface = Thread.currentThread().getContextClassLoader().loadClass(serviceInterface); + return MBeanProxy.get(proxyInterface, objectName, mbeanServer); + } + catch (ClassNotFoundException e) + { + throw new ServiceLookupFailedException(e); + } + catch (MBeanProxyCreationException e) + { + throw new ServiceLookupFailedException(e); + } + } +} Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -89,14 +89,9 @@ } catch (final Exception e) { - TestCase tc = new TestCase() - { - public void runBare() throws Throwable - { - throw e; - } - }; - tc.run(result); + AssertionFailedError afe = new AssertionFailedError(); + afe.initCause(e); + throw afe; } } Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -30,12 +30,16 @@ 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.kernel.spi.dependency.KernelControllerContext; import java.net.URL; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Iterator; +import junit.framework.AssertionFailedError; + /** * The test context offered to the test. * @@ -142,7 +146,32 @@ } catch (Throwable throwable) { -// log.error("Got a throwable", throwable); + if (deployment != null) + { + // This may be MC saying that something went wrong + if (throwable instanceof IllegalStateException) + { + log.error("Test runtime context startup failed", throwable); + for (Iterator i = deployment.getInstalledContexts().iterator();i.hasNext();) + { + KernelControllerContext kcc = (KernelControllerContext)i.next(); + Throwable t = kcc.getError(); + if (t != null) + { + throwable = t; + break; + } + } + } + + // Undeploy all beans + if (deployment != null) + { + beanDeployer.undeploy(deployment); + } + } + + // if (throwable instanceof Error) { throw(Error)throwable; Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -37,6 +37,7 @@ import junit.framework.Test; import junit.framework.TestResult; import junit.framework.TestCase; +import junit.framework.AssertionFailedError; import java.net.URL; @@ -231,23 +232,21 @@ { startIfNeeded(); adapter.run(testResult); - stopIfNeeded(); } catch (Exception e) { this.e = e; } + finally + { + stopIfNeeded(); + } } if (e != null) { - TestCase tc = new TestCase() - { - public void runBare() throws Throwable - { - throw e; - } - }; - tc.run(testResult); + AssertionFailedError afe = new AssertionFailedError(); + afe.initCause(e); + throw afe; } } Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -23,13 +23,14 @@ package org.jboss.portal.test.framework.runner; import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.portal.test.framework.TestParametrization; import org.jboss.portal.test.framework.junit.JUnitAdapter; -import org.jboss.portal.test.framework.TestParametrization; -import junit.framework.AssertionFailedError; import java.io.File; import java.net.MalformedURLException; +import junit.framework.AssertionFailedError; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -43,33 +44,33 @@ /** . */ private String archiveName; - public HTTPTestRunner() + public HTTPTestRunner(String beanDescriptorLocation) { - super(JBOSS_BEANS_LOCATION); + super(beanDescriptorLocation); // init(null); } - public HTTPTestRunner(NodeId[] nodeIds) + public HTTPTestRunner(String beanDescriptorLocation, NodeId[] nodeIds) { - super(JBOSS_BEANS_LOCATION, nodeIds); + super(beanDescriptorLocation, nodeIds); // init(null); } - protected HTTPTestRunner(String archiveName) + protected HTTPTestRunner(String beanDescriptorLocation, String archiveName) { - super(JBOSS_BEANS_LOCATION); + super(beanDescriptorLocation); // init(archiveName); } - public HTTPTestRunner(String archiveName, NodeId[] nodeIds) + public HTTPTestRunner(String beanDescriptorLocation, String archiveName, NodeId[] nodeIds) { - super(JBOSS_BEANS_LOCATION, nodeIds); + super(beanDescriptorLocation, nodeIds); // init(archiveName); Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -23,14 +23,6 @@ package org.jboss.portal.test.framework.server; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; - -import javax.management.MBeanServer; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.naming.Context; -import java.util.Properties; import java.util.Map; /** @@ -44,19 +36,11 @@ private final NodeId id; /** . */ - private final MBeanServer mbeanServer; - - /** . */ - private final Properties jndiEnv; - - /** . */ final Map serviceLookups; - public Node(String id, MBeanServer mBeanServer, Properties jndiEnv, Map serviceLookups) + public Node(String id, Map serviceLookups) { this.id = new NodeId(id); - this.mbeanServer = mBeanServer; - this.jndiEnv = jndiEnv; this.serviceLookups = serviceLookups; } @@ -77,46 +61,13 @@ // if (lookup == null) { - return null; + throw new ServiceLookupFailedException("No service lookup bound under the service id " + serviceId); } // - try - { - Class proxyInterface = Thread.currentThread().getContextClassLoader().loadClass(lookup.getServiceInterface()); - return MBeanProxy.get(proxyInterface, lookup.getObjectName(), mbeanServer); - } - catch (ClassNotFoundException e) - { - throw new ServiceLookupFailedException(e); - } - catch (MBeanProxyCreationException e) - { - throw new ServiceLookupFailedException(e); - } + return lookup.lookupService(); } - /** - * Returns the MBeanServer of the node. - * - * @return the mbean server - */ - public MBeanServer getMBeanServer() - { - return mbeanServer; - } - - /** - * Returns the naming context that resolves to the node. - * - * @return the naming context - * @throws NamingException - */ - public Context getNamingContext() throws NamingException - { - return new InitialContext(jndiEnv); - } - public String toString() { return "Node[" + id + "]"; Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/ServiceLookup.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/ServiceLookup.java 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server/ServiceLookup.java 2007-08-22 14:08:45 UTC (rev 8025) @@ -22,32 +22,19 @@ ******************************************************************************/ package org.jboss.portal.test.framework.server; -import javax.management.ObjectName; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class ServiceLookup +public interface ServiceLookup { - private final ObjectName objectName; + /** + * Returns a proxy for the underlying service. + * + * @return the service proxy + * @throws ServiceLookupFailedException + */ + Object lookupService() throws ServiceLookupFailedException; - private final String serviceInterface; - - public ServiceLookup(ObjectName objectName, String serviceInterface) - { - this.objectName = objectName; - this.serviceInterface = serviceInterface; - } - - public ObjectName getObjectName() - { - return objectName; - } - - public String getServiceInterface() - { - return serviceInterface; - } } Added: modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml =================================================================== --- modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml (rev 0) +++ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,181 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> + + <bean name="TestAgent0" class="org.jboss.portal.test.framework.impl.generic.agent.GenericTestAgent"> + </bean> + <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.impl.generic.server.DirectServiceLookup"> + <constructor> + <parameter><inject bean="TestAgent0"/></parameter> + </constructor> + </bean> + <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceLookup"> + <constructor> + <parameter>socket://localhost:5400</parameter> + <parameter>org.jboss.portal.test.framework.driver.http.HttpTestDriver</parameter> + </constructor> + </bean> + + <!-- + <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + --> + + <bean name="Node0" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>default</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.generic.server.DirectServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup0"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup0"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + +<!-- + <bean name="Node1" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>ports-01</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup1"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup1"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="Node2" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>ports-02</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup2"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup2"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> +--> + + <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.http.HttpTestDriverClient"> + <constructor> + </constructor> + </bean> + + <bean name="NodeManager" class="org.jboss.portal.test.framework.server.NodeManager"> + <constructor> + <parameter> + <list> + <inject bean="Node0"/> +<!-- + <inject bean="Node1"/> + <inject bean="Node2"/> +--> + </list> + </parameter> + </constructor> + </bean> + + <bean name="Deployer" class="org.jboss.portal.test.framework.deployment.Deployer"> + </bean> + + <bean name="TestBean" class="org.jboss.portal.test.framework.runner.BaseRunner"> + <constructor factoryMethod="getBean"> + <factory bean="BeanFactory"/> + <parameter>TestBean</parameter> + </constructor> + <property name="deployer"><inject bean="Deployer"/></property> + <property name="nodeManager"><inject bean="NodeManager"/></property> + <property name="testDriverClient"><inject bean="TestDriverClient"/></property> + </bean> +</deployment> Added: modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml =================================================================== --- modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml (rev 0) +++ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,218 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> + + <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory"> + <property name="env"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>java.naming.factory.initial</key> + <value>org.jnp.interfaces.NamingContextFactory</value> + </entry> + <entry> + <key>java.naming.provider.url</key> + <value>jnp://localhost:1099</value> + </entry> + <entry> + <key>java.naming.factory.url.pkgs</key> + <value>org.jboss.naming</value> + </entry> + </map> + </property> + </bean> + + <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory"> + <property name="env"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>java.naming.factory.initial</key> + <value>org.jnp.interfaces.NamingContextFactory</value> + </entry> + <entry> + <key>java.naming.provider.url</key> + <value>jnp://localhost:1199</value> + </entry> + <entry> + <key>java.naming.factory.url.pkgs</key> + <value>org.jboss.naming</value> + </entry> + </map> + </property> + </bean> + + <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory"> + <property name="env"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>java.naming.factory.initial</key> + <value>org.jnp.interfaces.NamingContextFactory</value> + </entry> + <entry> + <key>java.naming.provider.url</key> + <value>jnp://localhost:1299</value> + </entry> + <entry> + <key>java.naming.factory.url.pkgs</key> + <value>org.jboss.naming</value> + </entry> + </map> + </property> + </bean> + + <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="Node0" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>default</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup0"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup0"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="Node1" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>ports-01</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup1"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup1"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="Node2" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>ports-02</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup2"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup2"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.http.HttpTestDriverClient"> + <constructor> + </constructor> + </bean> + + <bean name="NodeManager" class="org.jboss.portal.test.framework.server.NodeManager"> + <constructor> + <parameter> + <list> + <inject bean="Node0"/> + <inject bean="Node1"/> + <inject bean="Node2"/> + </list> + </parameter> + </constructor> + </bean> + + <bean name="Deployer" class="org.jboss.portal.test.framework.deployment.Deployer"> + </bean> + + <bean name="TestBean" class="org.jboss.portal.test.framework.runner.BaseRunner"> + <constructor factoryMethod="getBean"> + <factory bean="BeanFactory"/> + <parameter>TestBean</parameter> + </constructor> + <property name="deployer"><inject bean="Deployer"/></property> + <property name="nodeManager"><inject bean="NodeManager"/></property> + <property name="testDriverClient"><inject bean="TestDriverClient"/></property> + </bean> +</deployment> Added: modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml =================================================================== --- modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml (rev 0) +++ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -0,0 +1,218 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> + + <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory"> + <property name="env"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>java.naming.factory.initial</key> + <value>org.jnp.interfaces.NamingContextFactory</value> + </entry> + <entry> + <key>java.naming.provider.url</key> + <value>jnp://localhost:1099</value> + </entry> + <entry> + <key>java.naming.factory.url.pkgs</key> + <value>org.jboss.naming</value> + </entry> + </map> + </property> + </bean> + + <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory"> + <property name="env"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>java.naming.factory.initial</key> + <value>org.jnp.interfaces.NamingContextFactory</value> + </entry> + <entry> + <key>java.naming.provider.url</key> + <value>jnp://localhost:1199</value> + </entry> + <entry> + <key>java.naming.factory.url.pkgs</key> + <value>org.jboss.naming</value> + </entry> + </map> + </property> + </bean> + + <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory"> + <property name="env"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>java.naming.factory.initial</key> + <value>org.jnp.interfaces.NamingContextFactory</value> + </entry> + <entry> + <key>java.naming.provider.url</key> + <value>jnp://localhost:1299</value> + </entry> + <entry> + <key>java.naming.factory.url.pkgs</key> + <value>org.jboss.naming</value> + </entry> + </map> + </property> + </bean> + + <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=TestDriverServer</value></parameter> + <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> + </constructor> + </bean> + + <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><value>portal.test:service=Agent</value></parameter> + <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> + </constructor> + </bean> + + <bean name="Node0" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>default</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup0"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup0"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="Node1" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>ports-01</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup1"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup1"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="Node2" class="org.jboss.portal.test.framework.server.Node"> + <constructor> + <parameter><value>ports-02</value></parameter> + <parameter> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> + <entry> + <key>TestDriverServer</key> + <value><inject bean="TestDriverServerLookup2"/></value> + </entry> + <entry> + <key>TestAgent</key> + <value><inject bean="TestAgentLookup2"/></value> + </entry> + </map> + </parameter> + </constructor> + </bean> + + <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.web.WebTestDriverClient"> + <constructor> + </constructor> + </bean> + + <bean name="NodeManager" class="org.jboss.portal.test.framework.server.NodeManager"> + <constructor> + <parameter> + <list> + <inject bean="Node0"/> + <inject bean="Node1"/> + <inject bean="Node2"/> + </list> + </parameter> + </constructor> + </bean> + + <bean name="Deployer" class="org.jboss.portal.test.framework.deployment.Deployer"> + </bean> + + <bean name="TestBean" class="org.jboss.portal.test.framework.runner.BaseRunner"> + <constructor factoryMethod="getBean"> + <factory bean="BeanFactory"/> + <parameter>TestBean</parameter> + </constructor> + <property name="deployer"><inject bean="Deployer"/></property> + <property name="nodeManager"><inject bean="NodeManager"/></property> + <property name="testDriverClient"><inject bean="TestDriverClient"/></property> + </bean> +</deployment> Modified: modules/test/trunk/test/src/resources/portal-test-agent-sar/META-INF/jboss-service.xml =================================================================== --- modules/test/trunk/test/src/resources/portal-test-agent-sar/META-INF/jboss-service.xml 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/resources/portal-test-agent-sar/META-INF/jboss-service.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -25,7 +25,7 @@ <!-- The test agent. --> <mbean - code="org.jboss.portal.test.framework.agent.jboss.JBossTestAgent" + code="org.jboss.portal.test.framework.impl.jboss.agent.JBossTestAgent" name="portal.test:service=Agent"> <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends> </mbean> Modified: modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml =================================================================== --- modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -46,15 +46,17 @@ </property> </bean> - <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=TestDriverServer</value></parameter> <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=Agent</value></parameter> <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> </constructor> @@ -79,15 +81,17 @@ </property> </bean> - <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=TestDriverServer</value></parameter> <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=Agent</value></parameter> <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> </constructor> @@ -112,15 +116,17 @@ </property> </bean> - <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=TestDriverServer</value></parameter> <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=Agent</value></parameter> <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> </constructor> @@ -129,25 +135,8 @@ <bean name="Node0" class="org.jboss.portal.test.framework.server.Node"> <constructor> <parameter><value>default</value></parameter> - <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> - <parameter name="jndiEnv"> - <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>java.naming.factory.initial</key> - <value>org.jnp.interfaces.NamingContextFactory</value> - </entry> - <entry> - <key>java.naming.provider.url</key> - <value>jnp://localhost:1099</value> - </entry> - <entry> - <key>java.naming.factory.url.pkgs</key> - <value>org.jboss.naming</value> - </entry> - </map> - </parameter> <parameter> - <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.server.ServiceLookup"> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <entry> <key>TestDriverServer</key> <value><inject bean="TestDriverServerLookup0"/></value> @@ -164,25 +153,8 @@ <bean name="Node1" class="org.jboss.portal.test.framework.server.Node"> <constructor> <parameter><value>ports-01</value></parameter> - <parameter><inject bean="MBeanServerFactory1" property="server"/></parameter> - <parameter name="jndiEnv"> - <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>java.naming.factory.initial</key> - <value>org.jnp.interfaces.NamingContextFactory</value> - </entry> - <entry> - <key>java.naming.provider.url</key> - <value>jnp://localhost:1199</value> - </entry> - <entry> - <key>java.naming.factory.url.pkgs</key> - <value>org.jboss.naming</value> - </entry> - </map> - </parameter> <parameter> - <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.server.ServiceLookup"> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <entry> <key>TestDriverServer</key> <value><inject bean="TestDriverServerLookup1"/></value> @@ -199,25 +171,8 @@ <bean name="Node2" class="org.jboss.portal.test.framework.server.Node"> <constructor> <parameter><value>ports-02</value></parameter> - <parameter><inject bean="MBeanServerFactory2" property="server"/></parameter> - <parameter name="jndiEnv"> - <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>java.naming.factory.initial</key> - <value>org.jnp.interfaces.NamingContextFactory</value> - </entry> - <entry> - <key>java.naming.provider.url</key> - <value>jnp://localhost:1299</value> - </entry> - <entry> - <key>java.naming.factory.url.pkgs</key> - <value>org.jboss.naming</value> - </entry> - </map> - </parameter> <parameter> - <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.server.ServiceLookup"> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <entry> <key>TestDriverServer</key> <value><inject bean="TestDriverServerLookup2"/></value> Modified: modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml =================================================================== --- modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-21 22:04:11 UTC (rev 8024) +++ modules/test/trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-22 14:08:45 UTC (rev 8025) @@ -46,15 +46,17 @@ </property> </bean> - <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=TestDriverServer</value></parameter> <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestAgentLookup0" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=Agent</value></parameter> <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> </constructor> @@ -79,15 +81,17 @@ </property> </bean> - <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestDriverServerLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=TestDriverServer</value></parameter> <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestAgentLookup1" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=Agent</value></parameter> <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> </constructor> @@ -112,15 +116,17 @@ </property> </bean> - <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestDriverServerLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=TestDriverServer</value></parameter> <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.server.ServiceLookup"> + <bean name="TestAgentLookup2" class="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <constructor> + <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> <parameter><value>portal.test:service=Agent</value></parameter> <parameter><value>org.jboss.portal.test.framework.agent.TestAgent</value></parameter> </constructor> @@ -129,25 +135,8 @@ <bean name="Node0" class="org.jboss.portal.test.framework.server.Node"> <constructor> <parameter><value>default</value></parameter> - <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> - <parameter name="jndiEnv"> - <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>java.naming.factory.initial</key> - <value>org.jnp.interfaces.NamingContextFactory</value> - </entry> - <entry> - <key>java.naming.provider.url</key> - <value>jnp://localhost:1099</value> - </entry> - <entry> - <key>java.naming.factory.url.pkgs</key> - <value>org.jboss.naming</value> - </entry> - </map> - </parameter> <parameter> - <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.server.ServiceLookup"> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <entry> <key>TestDriverServer</key> <value><inject bean="TestDriverServerLookup0"/></value> @@ -164,25 +153,8 @@ <bean name="Node1" class="org.jboss.portal.test.framework.server.Node"> <constructor> <parameter><value>ports-01</value></parameter> - <parameter><inject bean="MBeanServerFactory1" property="server"/></parameter> - <parameter name="jndiEnv"> - <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>java.naming.factory.initial</key> - <value>org.jnp.interfaces.NamingContextFactory</value> - </entry> - <entry> - <key>java.naming.provider.url</key> - <value>jnp://localhost:1199</value> - </entry> - <entry> - <key>java.naming.factory.url.pkgs</key> - <value>org.jboss.naming</value> - </entry> - </map> - </parameter> <parameter> - <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.server.ServiceLookup"> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <entry> <key>TestDriverServer</key> <value><inject bean="TestDriverServerLookup1"/></value> @@ -199,25 +171,8 @@ <bean name="Node2" class="org.jboss.portal.test.framework.server.Node"> <constructor> <parameter><value>ports-02</value></parameter> - <parameter><inject bean="MBeanServerFactory2" property="server"/></parameter> - <parameter name="jndiEnv"> - <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>java.naming.factory.initial</key> - <value>org.jnp.interfaces.NamingContextFactory</value> - </entry> - <entry> - <key>java.naming.provider.url</key> - <value>jnp://localhost:1299</value> - </entry> - <entry> - <key>java.naming.factory.url.pkgs</key> - <value>org.jboss.naming</value> - </entry> - </map> - </parameter> <parameter> - <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.server.ServiceLookup"> + <map keyClass="java.lang.String" valueClass="org.jboss.portal.test.framework.impl.jboss.server.JBossServiceLookup"> <entry> <key>TestDriverServer</key> <value><inject bean="TestDriverServerLookup2"/></value>