JBossWS SVN: r16534 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-07-25 09:21:12 -0400 (Wed, 25 Jul 2012)
New Revision: 16534
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
Log:
excluding JMS tests - not supported on EAP 51x
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2012-07-25 11:37:52 UTC (rev 16533)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2012-07-25 13:21:12 UTC (rev 16534)
@@ -361,6 +361,11 @@
<!--# [JBWS-2217] Fix BPEL jaxrpc samples -->
<exclude>org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*</exclude>
+
+ <!--# JMS not supported in EAP51x -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*</exclude>
</excludes>
</configuration>
</plugin>
12 years, 5 months
JBossWS SVN: r16533 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 07:37:52 -0400 (Wed, 25 Jul 2012)
New Revision: 16533
Removed:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
Log:
Removing unrequired abstractions
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -25,7 +25,5 @@
{
public void setIsNative(boolean integrationNative);
- public void setIsMetro(boolean integrationMetro);
-
public void setIsCXF(boolean integrationCXF);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -39,7 +39,7 @@
* @author Heiko.Braun <heiko.braun(a)jboss.com>
* @author alessio.soldano(a)jboss.com
*/
-public class WSConsumerPlugin extends JBossWSTest implements WSConsumerPluginDelegate, StackConfigurable
+public class WSConsumerPlugin extends JBossWSTest implements StackConfigurable
{
// Tools delegate. Recreated for every test. See setup(...)
WSContractConsumer consumer;
@@ -447,11 +447,6 @@
return integrationNative;
}
- public boolean getIsMetro()
- {
- return integrationMetro;
- }
-
public boolean getIsCXF()
{
return integrationCXF;
@@ -462,11 +457,6 @@
this.integrationNative = integrationNative;
}
- public void setIsMetro(boolean integrationMetro)
- {
- this.integrationMetro = integrationMetro;
- }
-
public void setIsCXF(boolean integrationCXF)
{
this.integrationCXF = integrationCXF;
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.test.ws.jaxws.smoke.tools;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public interface WSConsumerPluginDelegate
-{
- void testBindingFiles() throws Exception;
-
- void testCatalog() throws Exception;
-
- void testOutputDirectory() throws Exception;
-
- void testSourceDirectory() throws Exception;
-
- void testGenerateSource() throws Exception;
-
- void testTargetPackage() throws Exception;
-
- void testWsdlLocation() throws Exception;
-
- void testMessageStream() throws Exception;
-
- void testAdditionalCompilerClassPath();
-
- void testTarget() throws Exception;
-
- void testSOAP12Extension() throws Exception;
-
- void testAdditionalHeaders() throws Exception;
-}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -23,12 +23,11 @@
/**
* Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
* @author alessio.soldano(a)jboss.com
*/
-public class WSConsumerTestCaseForked extends PluginBase implements WSConsumerPluginDelegate
+public class WSConsumerTestCaseForked extends PluginBase
{
/**
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -42,7 +42,7 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class WSProviderPlugin extends JBossWSTest implements WSProviderPluginDelegate
+public class WSProviderPlugin extends JBossWSTest
{
private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
// tools delegate
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.test.ws.jaxws.smoke.tools;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public interface WSProviderPluginDelegate
-{
- void testGenerateWsdl() throws Exception;
-
- void testGenerateSource() throws Exception;
-
- void testOutputDirectory() throws Exception;
-
- void testResourceDirectory() throws Exception;
-
- void testSourceDirectory() throws Exception;
-
- void testClassLoader() throws Exception;
-
- void testMessageStream() throws Exception;
-}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2012-07-25 10:49:50 UTC (rev 16532)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2012-07-25 11:37:52 UTC (rev 16533)
@@ -24,7 +24,7 @@
/**
* @author Heiko.Braun(a)jboss.com
*/
-public class WSProviderTestCaseForked extends PluginBase implements WSProviderPluginDelegate
+public class WSProviderTestCaseForked extends PluginBase
{
/**
* Recreates a tools delegate for every test
12 years, 5 months
JBossWS SVN: r16532 - stack/cxf/trunk/modules/testsuite/shared-tests.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 06:49:50 -0400 (Wed, 25 Jul 2012)
New Revision: 16532
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/
Log:
Fixing wrong svn:ignore
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
.settings
target
org
+ .classpath
.project
.settings
target
12 years, 5 months
JBossWS SVN: r16531 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 06:48:56 -0400 (Wed, 25 Jul 2012)
New Revision: 16531
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
Log:
[JBWS-3519] Improving wsconsumer testcase
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2012-07-25 10:48:18 UTC (rev 16530)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2012-07-25 10:48:56 UTC (rev 16531)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -26,7 +26,6 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Arrays;
import java.util.List;
import java.util.LinkedList;
import java.util.StringTokenizer;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-07-25 10:48:18 UTC (rev 16530)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-07-25 10:48:56 UTC (rev 16531)
@@ -156,31 +156,76 @@
assertTrue("Source directory switch ignored", sei.exists());
}
- public void testNocompileNoKeep() throws Exception
+ public void testNoCompile() throws Exception
{
- File sourceDir = new File(workDirectory, "wsconsumeNoCPNOKeepsource/java/");
- File outputDir = new File(workDirectory, "wsconsumeNoCPNOKeepOutput/java/");
+ File sourceDir = new File(workDirectory, "wsconsumeNoCPSources/java/");
+ File outputDir = new File(workDirectory, "wsconsumeNoCPOutput/java/");
consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
consumer.setSourceDirectory(sourceDir);
consumer.setOutputDirectory(outputDir);
+ consumer.setGenerateSource(true);
consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
- File sei = new File(workDirectory, "wsconsumeNoCPNOKeepOutput/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ File sei = new File(workDirectory, "wsconsumeNoCPSources/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
assertTrue("Expected sei not generated in the expected directory " + outputDir.getPath() , sei.exists());
- File notExistSei = new File(workDirectory, "wsconsumeNoCPNOKeepsource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ File notExistSei = new File(workDirectory, "wsconsumeNoCPOutput/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
assertFalse("Directory " + sourceDir.getPath() + " is expected to empty", notExistSei.exists());
}
+ public void testNoCompileNoKeep() throws Exception
+ {
+ File sourceDir = new File(workDirectory, "wsconsumeNoCPNoKeepsource/java/");
+ File outputDir = new File(workDirectory, "wsconsumeNoCPNoKeepOutput/java/");
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
+ consumer.setSourceDirectory(sourceDir);
+ consumer.setOutputDirectory(outputDir);
+ consumer.setGenerateSource(false);
+
+ consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
+
+ File sourceSei = new File(workDirectory, "wsconsumeNoCPNoKeepsource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ assertFalse("Directory " + sourceDir.getPath() + " is expected to be empty", sourceSei.exists());
+
+ File outputSei = new File(workDirectory, "wsconsumeNoCPNoKeepOutput/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ assertFalse("Directory " + sourceDir.getPath() + " is expected to be empty", outputSei.exists());
+ }
+
/**
* Enables/Disables Java source generation.
*
*/
public void testGenerateSource() throws Exception
{
- testTargetPackage();
+ File sourceDir = new File(workDirectory, "wsconsumeGenerateSource/java/");
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testGenerateSource");
+ consumer.setSourceDirectory(sourceDir);
+ consumer.setGenerateSource(true);
+ consumer.setNoCompile(true);
+
+ consumeWSDL();
+
+ File packageDir = new File(sourceDir, "org/jboss/test/ws/tools/testGenerateSource");
+ assertTrue("Package not created", packageDir.exists());
+
+ File seiSource = new File(sourceDir, "org/jboss/test/ws/tools/testGenerateSource/EndpointInterface.java");
+ assertTrue("SEI not generated", seiSource.exists());
+
+ sourceDir = new File(workDirectory, "wsconsumeGenerateSource2/java/");
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testGenerateSource2");
+ consumer.setSourceDirectory(sourceDir);
+ consumer.setGenerateSource(false);
+ consumer.setNoCompile(false);
+
+ consumeWSDL();
+
+ packageDir = new File(sourceDir, "org/jboss/test/ws/tools/testGenerateSource2");
+ assertFalse("Package should not have been created!", packageDir.exists());
+
+ File interfaceClass = new File(outputDirectory, "org/jboss/test/ws/tools/testGenerateSource2/EndpointInterface.class");
+ assertTrue("SEI not generated", interfaceClass.exists());
}
/**
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-07-25 10:48:18 UTC (rev 16530)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-07-25 10:48:56 UTC (rev 16531)
@@ -92,22 +92,29 @@
/**
- *JBWS-3193
- * If there are "-n" and "-s" flag, without "-k", the generated
- * artifacts should be placed in output directory
+ * If there are "-n" and "-s" flag, with "-k", the generated
+ * artifacts should be placed in source directory
*/
- public void testNocompileNoKeep() throws Exception
+ public void testNoCompile() throws Exception
{
- dispatch("testNocompileNoKeep");
+ dispatch("testNoCompile");
}
/**
+ * If there are "-n" and "-s" flag, without "-k", nothing should be generated
+ */
+ public void testNoCompileNoKeep() throws Exception
+ {
+ dispatch("testNoCompileNoKeep");
+ }
+
+ /**
* Enables/Disables Java source generation.
*
*/
public void testGenerateSource() throws Exception
{
- testTargetPackage();
+ dispatch("testGenerateSource");
}
/**
12 years, 5 months
JBossWS SVN: r16530 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 06:48:18 -0400 (Wed, 25 Jul 2012)
New Revision: 16530
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
[JBWS-3519] Remove generated sources when -k (keep/generateSource) option is not used + fix wrong impl of JBWS-3193
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-07-25 08:24:48 UTC (rev 16529)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-07-25 10:48:18 UTC (rev 16530)
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.ResourceBundle;
+import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
import org.jboss.ws.api.tools.WSContractConsumer;
@@ -185,27 +186,31 @@
args.add("-exsh");
args.add(additionalHeaders ? "true" : "false");
-
- if (generateSource && sourceDir == null)
+
+ if (targetPackage != null)
{
- sourceDir = outputDir;
+ args.add("-p");
+ args.add(targetPackage);
}
- if (sourceDir != null && generateSource)
- {
+ File sourceTempDir = null;
+ if (generateSource) {
+ if (sourceDir == null)
+ {
+ sourceDir = outputDir;
+ }
if (!sourceDir.exists() && !sourceDir.mkdirs())
throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_MAKE_DIRECTORY", sourceDir.getName()));
args.add("-d");
args.add(sourceDir.getAbsolutePath());
+ } else {
+ sourceTempDir = new File(outputDir, "tmp" + Math.round(Math.random() * 10000000));
+ FileUtils.mkDir(sourceTempDir);
+ args.add("-d");
+ args.add(sourceTempDir.getAbsolutePath());
}
- if (targetPackage != null)
- {
- args.add("-p");
- args.add(targetPackage);
- }
-
if (wsdlLocation != null)
{
args.add("-wsdlLocation");
@@ -230,11 +235,6 @@
args.add("-classdir");
args.add(outputDir.getAbsolutePath());
}
- if (nocompile && !generateSource)
- {
- args.add("-d");
- args.add(outputDir.getAbsolutePath());
- }
//Always generate wrapped style for reference element:CXF-1079
args.add("-allowElementReferences");
@@ -271,5 +271,12 @@
t.printStackTrace();
}
}
+ finally
+ {
+ if (sourceTempDir != null)
+ {
+ FileUtils.removeDir(sourceTempDir);
+ }
+ }
}
}
12 years, 5 months
JBossWS SVN: r16529 - hudson/trunk/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 04:24:48 -0400 (Wed, 25 Jul 2012)
New Revision: 16529
Modified:
hudson/trunk/scripts/http-spider.sh
Log:
Try every 5 sec...
Modified: hudson/trunk/scripts/http-spider.sh
===================================================================
--- hudson/trunk/scripts/http-spider.sh 2012-07-25 08:21:46 UTC (rev 16528)
+++ hudson/trunk/scripts/http-spider.sh 2012-07-25 08:24:48 UTC (rev 16529)
@@ -13,8 +13,8 @@
#############################################################
TIMEOUT=2 # wget timeout in sec
-SLEEP_TIME=10 # the actual sleep time in between test
-NUM_RETRIES=30 # equals to 5 minutes before exit
+SLEEP_TIME=5 # the actual sleep time in between test
+NUM_RETRIES=60 # equals to 5 minutes before exit
if [ "x$1" = "x" ]; then
echo "Usage: http.sh <hostname:port> <output_dir>"
12 years, 5 months
JBossWS SVN: r16528 - hudson/trunk/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 04:21:46 -0400 (Wed, 25 Jul 2012)
New Revision: 16528
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Restoring httpspider for detecting server boot is done
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2012-07-25 06:32:52 UTC (rev 16527)
+++ hudson/trunk/scripts/jbossws-qa.sh 2012-07-25 08:21:46 UTC (rev 16528)
@@ -53,18 +53,14 @@
}
ensureRunningJBoss() {
-# if [ -f $JBOSS_HOME/bin/run.sh ]; then
-# $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
-# if [ -e $WORKSPACE/spider.failed ]; then
-# tail -n 100 $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log
-# stopJBoss
-# copyJBossLogs
-# exit 1
-# fi
-# else
-# echo "There's no admin console for AS7 yet"
- sleep 5
-# fi
+ $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
+ if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_HOME/standalone/log/server.log
+ stopJBoss
+ copyJBossLogs
+ exit 1
+ fi
+# sleep 5
}
logMavenDependencies() {
12 years, 5 months
JBossWS SVN: r16526 - common/tags.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 02:31:57 -0400 (Wed, 25 Jul 2012)
New Revision: 16526
Added:
common/tags/jbossws-common-2.1.0.Beta2/
Log:
Tagging jbossws-common-2.1.0.Beta2
12 years, 5 months