Author: julien(a)jboss.com Date: 2007-09-14 17:39:10 -0400 (Fri, 14 Sep 2007) New Revision: 8280 Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java Modified: modules/test/trunk/build/build-thirdparty.xml modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml modules/test/trunk/test/build.xml modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java Log: update to use cargo 0.9 Modified: modules/test/trunk/build/build-thirdparty.xml =================================================================== --- modules/test/trunk/build/build-thirdparty.xml 2007-09-14 21:38:23 UTC (rev 8279) +++ modules/test/trunk/build/build-thirdparty.xml 2007-09-14 21:39:10 UTC (rev 8280) @@ -48,6 +48,9 @@ --> <componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/> + + <componentref name="codehaus/cargo" version="0.9"/> + <componentref name="jbossas/core-libs" version="4.0.4.GA"/> <componentref name="hibernate" version="3.2.0.CR2"/> <componentref name="jboss/microcontainer" version="1.0.2"/> Modified: modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml =================================================================== --- modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-09-14 21:38:23 UTC (rev 8279) +++ modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-09-14 21:39:10 UTC (rev 8280) @@ -301,7 +301,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../tools/lib/cargo-core-uberjar-0.8.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet/lib/servlet-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -310,7 +310,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet/lib/servlet-api.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -319,12 +319,21 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/codehaus/cargo/lib/cargo-ant-0.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/codehaus/cargo/lib/cargo-core-uberjar-0.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/test/trunk/test/build.xml =================================================================== --- modules/test/trunk/test/build.xml 2007-09-14 21:38:23 UTC (rev 8279) +++ modules/test/trunk/test/build.xml 2007-09-14 21:39:10 UTC (rev 8280) @@ -98,7 +98,7 @@ <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 refid="codehaus.cargo.classpath"/> <path location="selenium-java-client-driver-backport.jar"/> <!--<path refid="sun.opends.classpath"/>--> </path> Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java 2007-09-14 21:39:10 UTC (rev 8280) @@ -0,0 +1,50 @@ +/****************************************************************************** + * 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.driver.remote.response; + +import org.jboss.portal.test.framework.driver.DriverResponse; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class DeployResponse extends DriverResponse +{ + + /** . */ + private final String id; + + public DeployResponse(String id) + { + if (id == null) + { + throw new IllegalArgumentException(); + } + this.id = id; + } + + public String getId() + { + return id; + } +} Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java (rev 0) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java 2007-09-14 21:39:10 UTC (rev 8280) @@ -0,0 +1,50 @@ +/****************************************************************************** + * 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.driver.remote.response; + +import org.jboss.portal.test.framework.driver.DriverResponse; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class UndeployResponse extends DriverResponse +{ + + /** . */ + private final String id; + + public UndeployResponse(String id) + { + if (id == null) + { + throw new IllegalArgumentException(); + } + this.id = id; + } + + public String getId() + { + return id; + } +} Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java =================================================================== --- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java 2007-09-14 21:38:23 UTC (rev 8279) +++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java 2007-09-14 21:39:10 UTC (rev 8280) @@ -56,7 +56,7 @@ public Configuration createConfiguration() { ConfigurationFactory cfgFactory = new DefaultConfigurationFactory(); - Configuration cfg = cfgFactory.createConfiguration(name, ConfigurationType.RUNTIME); + Configuration cfg = cfgFactory.createConfiguration(name, ContainerType.REMOTE, ConfigurationType.RUNTIME); cfg.setProperty(GeneralPropertySet.PROTOCOL, "http"); cfg.setProperty(GeneralPropertySet.HOSTNAME, host); cfg.setProperty(ServletPropertySet.PORT, port);