[jboss-svn-commits] JBL Code SVN: r21379 - in labs/jbosstm/trunk/qa: ext and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 6 06:01:35 EDT 2008
Author: mmusgrov
Date: 2008-08-06 06:01:35 -0400 (Wed, 06 Aug 2008)
New Revision: 21379
Added:
labs/jbosstm/trunk/qa/ext/jboss-server-manager-0.1.1.GA.jar
Removed:
labs/jbosstm/trunk/qa/ext/jboss-server-manager-0.1.0.GA.jar
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ServerWrapper.java
Modified:
labs/jbosstm/trunk/qa/build.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ASTestConfig.java
Log:
Remove ServerWrapper.java since the latest release of the jboss-server-manager project has made it redundant.
JBTM-360
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2008-08-06 08:32:31 UTC (rev 21378)
+++ labs/jbosstm/trunk/qa/build.xml 2008-08-06 10:01:35 UTC (rev 21379)
@@ -74,7 +74,7 @@
<fileset refid="sybase.drivers"/>
</path>
- <property name="org.jboss.jbossts.qa.server_manager_location" location="ext/jboss-server-manager-0.1.0.GA.jar"/>
+ <property name="org.jboss.jbossts.qa.server_manager_location" location="ext/jboss-server-manager-0.1.1.GA.jar"/>
<property name="org.jboss.jbossts.qa.dist.buildroot" location="build"/>
<target name="buildtype">
Deleted: labs/jbosstm/trunk/qa/ext/jboss-server-manager-0.1.0.GA.jar
===================================================================
(Binary files differ)
Added: labs/jbosstm/trunk/qa/ext/jboss-server-manager-0.1.1.GA.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosstm/trunk/qa/ext/jboss-server-manager-0.1.1.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ASTestConfig.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ASTestConfig.java 2008-08-06 08:32:31 UTC (rev 21378)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ASTestConfig.java 2008-08-06 10:01:35 UTC (rev 21379)
@@ -205,7 +205,7 @@
{
Server server = manager.getServer(serverName);
- return (server != null ? new ServerWrapper(server).getNamingContext() : null);
+ return (server != null ? server.getNamingContext() : null);
}
catch (NamingException e)
{
@@ -290,7 +290,7 @@
*/
public void configureServerBinding(String serverName) throws TransformerException, IOException, SAXException, ParserConfigurationException
{
- ServerWrapper server = new ServerWrapper(manager.getServer(serverName));
+ Server server = manager.getServer(serverName);
String configHome = getProductDir();
String mbeanServiceFile = getServerPath(serverName) + "conf/jboss-service.xml";
String bindingName = server.getSysProperty("server.binding.name");
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ServerWrapper.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ServerWrapper.java 2008-08-06 08:32:31 UTC (rev 21378)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/ServerWrapper.java 2008-08-06 10:01:35 UTC (rev 21379)
@@ -1,245 +0,0 @@
-package org.jboss.jbossts.qa.astests.taskdefs;
-
-import org.jboss.jbossas.servermanager.Server;
-import org.jboss.jbossas.servermanager.Argument;
-import org.jboss.jbossas.servermanager.Property;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.InitialContext;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.File;
-import java.io.PrintWriter;
-import java.util.Properties;
-
-/**
- * Temporary wrapper for org.jboss.jbossas.servermanager.Server
- */
-public class ServerWrapper
-{
- Server server;
- private Context namingContext;
-
- public ServerWrapper(Server server)
- {
- this.server = server;
- }
-
- public String getName()
- {
- return server.getName();
- }
-
- public void setName(String name)
- {
- server.setName(name);
- }
-
- public String getUsername()
- {
- return server.getUsername();
- }
-
- public void setUsername(String username)
- {
- server.setUsername(username);
- }
-
- public String getPassword()
- {
- return server.getPassword();
- }
-
- public void setPassword(String password)
- {
- server.setPassword(password);
- }
-
- public void addArg(Argument arg)
- {
- server.addArg(arg);
- }
-
- public String getArgs()
- {
- return server.getArgs();
- }
-
- public void addJvmArg(Argument arg)
- {
- server.addJvmArg(arg);
- }
-
- public String getJvmArgs()
- {
- return server.getJvmArgs();
- }
-
- public void addSysProperty(Property property)
- {
- server.addSysProperty(property);
- }
-
- public String getSysProperties()
- {
- return server.getSysProperties();
- }
-
- public String getSysProperty(String key)
- {
- //args.append("-D" + property.getKey() + "=" + property.getValue() + " ");
- key = "-D" + key + '=';
- for (String k : server.getSysProperties().split(" "))
- {
- if (k.startsWith(key))
- return k.substring(key.length());
- }
-
- return null;
- }
-
- public void setProcess(Process process)
- {
- server.setProcess(process);
- }
-
- public boolean isRunning()
- {
- return server.isRunning();
- }
-
- public boolean isStopped()
- {
- return server.isStopped();
- }
-
- public Process getProcess()
- {
- return server.getProcess();
- }
-
- public URL getHttpUrl()
- throws MalformedURLException
- {
- return server.getHttpUrl();
- }
-
- public String getRmiUrl()
- {
- return server.getRmiUrl();
- }
-
- public String getConfig()
- {
- return server.getConfig();
- }
-
- public void setConfig(String config)
- {
- server.setConfig(config);
- }
-
- public String getHost()
- {
- return server.getHost();
- }
-
- public void setHost(String host)
- {
- server.setHost(host);
- }
-
- public void setHttpPort(Integer httpPort)
- {
- server.setHttpPort(httpPort);
- }
-
- /**
- * Get the httpPort
- *
- * @return the rmi port
- */
- public Integer getHttpPort()
- {
- try
- {
- return server.getHttpUrl().getPort();
- }
- catch (MalformedURLException e)
- {
- return 8080;
- }
- }
-
- public void setRmiPort(Integer rmiPort)
- {
- server.setRmiPort(rmiPort);
- }
-
- public Integer getRmiPort()
- {
- return server.getRmiPort();
- }
-
- public File getErrorLog()
- {
- return server.getErrorLog();
- }
-
- public File getOutputLog()
- {
- return server.getOutputLog();
- }
-
- public void setOutWriter(PrintWriter outlog)
- {
- server.setOutWriter(outlog);
- }
-
- public PrintWriter getOutWriter()
- {
- return server.getOutWriter();
- }
-
- public PrintWriter getErrorWriter()
- {
- return server.getErrorWriter();
- }
-
- public void setErrorWriter(PrintWriter errorlog)
- {
- server.setErrorWriter(errorlog);
- }
-
- public boolean hasWebServer()
- {
- return server.hasWebServer();
- }
-
- public void setHasWebServer(boolean hasWebServer)
- {
- server.setHasWebServer(hasWebServer);
- }
-
- public void setNamingContext(Context namingContext)
- {
- this.namingContext = namingContext;
- }
-
- public Context getNamingContext() throws NamingException
- {
- if (namingContext == null)
- {
- Properties properties = new Properties();
-
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, ("org.jboss.naming.NamingContextFactory"));
- properties.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- properties.setProperty(Context.PROVIDER_URL, "jnp://"+ getHost() + ':' + getRmiPort());
-
- setNamingContext(new InitialContext(properties));
- }
-
- return namingContext;
- }
-}
More information about the jboss-svn-commits
mailing list