Author: richard.opalka(a)jboss.com
Date: 2009-05-28 03:43:15 -0400 (Thu, 28 May 2009)
New Revision: 10129
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
adding AS 5.2.x support
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-05-28 07:29:35 UTC
(rev 10128)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-05-28 07:43:15 UTC
(rev 10129)
@@ -68,7 +68,7 @@
{
super(name);
}
-
+
/**
* Execute <b>command</b> in separate process.
* @param command command to execute
@@ -78,7 +78,7 @@
{
this.executeCommand(command, null, null, null);
}
-
+
/**
* Execute <b>command</b> in separate process. If process will fail,
display custom <b>message</b> in assertion.
* @param command command to execute
@@ -89,7 +89,7 @@
{
this.executeCommand(command, null, message, null);
}
-
+
/**
* Execute <b>command</b> in separate process, copy process input to
<b>os</b>.
* @param command command to execute
@@ -125,10 +125,10 @@
{
if (command == null)
throw new NullPointerException( "Command cannot be null" );
-
+
System.out.println("Executing command: " + command);
log.debug("Executing command: " + command);
-
+
StringTokenizer st = new StringTokenizer(command, " \t\r");
List<String> tokenizedCommand = new LinkedList<String>();
while (st.hasMoreTokens())
@@ -136,7 +136,7 @@
// PRECONDITION: command doesn't contain whitespaces in the paths
tokenizedCommand.add(st.nextToken());
}
-
+
try
{
this.executeCommand(tokenizedCommand, os, message, env);
@@ -201,12 +201,17 @@
{
return delegate.isTargetJBoss5();
}
-
+
public boolean isTargetJBoss51()
{
return delegate.isTargetJBoss51();
}
+ public boolean isTargetJBoss52()
+ {
+ return delegate.isTargetJBoss52();
+ }
+
public boolean isTargetJBoss50()
{
return delegate.isTargetJBoss50();
@@ -216,7 +221,7 @@
{
return delegate.isTargetJBoss6();
}
-
+
public boolean isTargetJBoss61()
{
return delegate.isTargetJBoss61();
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-05-28
07:29:35 UTC (rev 10128)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-05-28
07:43:15 UTC (rev 10129)
@@ -78,7 +78,7 @@
/** True, if -Djbossws.integration.target=jboss5x */
public boolean isTargetJBoss5()
{
- return isTargetJBoss51() || isTargetJBoss50();
+ return isTargetJBoss52() || isTargetJBoss51() || isTargetJBoss50();
}
/** True, if -Djbossws.integration.target=jboss50x */
@@ -95,6 +95,13 @@
return target.startsWith("jboss51");
}
+ /** True, if -Djbossws.integration.target=jboss52x */
+ public boolean isTargetJBoss52()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss52");
+ }
+
/** True, if -Djbossws.integration.target=jboss6x */
public boolean isTargetJBoss6()
{
@@ -219,7 +226,9 @@
if (jbossVersion == null)
throw new IllegalStateException("Cannot obtain jboss version");
- if (jbossVersion.startsWith("5.1"))
+ if (jbossVersion.startsWith("5.2"))
+ jbossVersion = "jboss52";
+ else if (jbossVersion.startsWith("5.1"))
jbossVersion = "jboss51";
else if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";