JBossWS SVN: r9491 - framework/trunk/hudson/hudson-home.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-05 05:24:58 -0500 (Thu, 05 Mar 2009)
New Revision: 9491
Modified:
framework/trunk/hudson/hudson-home/config.xml
Log:
fix
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2009-03-04 16:13:42 UTC (rev 9490)
+++ framework/trunk/hudson/hudson-home/config.xml 2009-03-05 10:24:58 UTC (rev 9491)
@@ -118,7 +118,7 @@
<string>Metro-Distro-AS-4.2.3-JDK6</string>
<string>Metro-Distro-AS-5.0.0</string>
<string>Metro-Distro-AS-5.0.0-JDK6</string>
- <string>Metro-Distro-AS-5.0.1</string>1
+ <string>Metro-Distro-AS-5.0.1</string>
<string>Metro-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Distro-AS-5.1.0</string>
<string>Metro-Distro-AS-5.1.0-JDK6</string>
15 years, 2 months
JBossWS SVN: r9490 - in framework/branches/jbossws-framework-2.0.1.GA_CP/src/test: resources/jaxws/smoke/tools/wsdl and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-04 11:13:42 -0500 (Wed, 04 Mar 2009)
New Revision: 9490
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
Log:
[JBPAPP-1750] Support for SOAP 1.2 in wsconsume.
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-03-04 15:41:37 UTC (rev 9489)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-03-04 16:13:42 UTC (rev 9490)
@@ -21,23 +21,25 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
-import junit.framework.TestCase;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
+import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
-import java.lang.reflect.Method;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+import junit.framework.TestCase;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
/**
* Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be execurted below 'output/tests'.
+ * NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
@@ -276,6 +278,23 @@
}
+ /**
+ * Tests the SOAP 1.2 binding extension
+ *
+ */
+ public void testSOAP12Extension() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
+ consumer.setGenerateSource(true);
+ consumer.setExtension(true);
+ consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl");
+ File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java");
+ assertTrue("SEI not generated", sei.exists());
+ File service = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/TestService.java");
+ assertTrue("Service not generated", service.exists());
+ }
+
private void consumeWSDL() throws Exception
{
consumer.setOutputDirectory(outputDirectory);
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl (from rev 5776, framework/trunk/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl)
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl 2009-03-04 16:13:42 UTC (rev 9490)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService"
+ targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
+ <types/>
+ <message name="EndpointInterface_echo">
+ <part name="String_1" type="xsd:string"/>
+ </message>
+ <message name="EndpointInterface_echoResponse">
+ <part name="result" type="xsd:string"/>
+ </message>
+ <portType name="EndpointInterface">
+ <operation name="echo" parameterOrder="String_1">
+ <input message="tns:EndpointInterface_echo"/>
+ <output message="tns:EndpointInterface_echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="echo">
+ <soap12:operation soapAction=""/>
+ <input>
+ <soap12:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </input>
+ <output>
+ <soap12:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="TestService">
+ <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+ <soap12:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
15 years, 2 months
JBossWS SVN: r9489 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-04 10:41:37 -0500 (Wed, 04 Mar 2009)
New Revision: 9489
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
Log:
[JBPAPP-1750] Support for SOAP 1.2 in wsconsume.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2009-03-04 15:41:11 UTC (rev 9488)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2009-03-04 15:41:37 UTC (rev 9489)
@@ -41,6 +41,7 @@
{
private List<File> bindingFiles;
private File catalog;
+ private boolean extension;
private boolean generateSource;
private File outputDir = new File("output");
private File sourceDir;
@@ -63,6 +64,12 @@
}
@Override
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
+ @Override
public void setGenerateSource(boolean generateSource)
{
this.generateSource = generateSource;
@@ -128,6 +135,11 @@
args.add(catalog.getAbsolutePath());
}
+ if (extension)
+ {
+ args.add("-extension");
+ }
+
if (generateSource)
{
args.add("-keep");
15 years, 2 months
JBossWS SVN: r9488 - stack/native/branches/jbossws-native-2.0.1.SP2_CP.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-04 10:41:11 -0500 (Wed, 04 Mar 2009)
New Revision: 9488
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties
Log:
[JBPAPP-1749] Switch to SPI snapshot.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2009-03-04 15:13:16 UTC (rev 9487)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2009-03-04 15:41:11 UTC (rev 9488)
@@ -24,7 +24,7 @@
wscommons-policy=1.0
# Dependend integration projects
-jbossws-spi=1.0.0.GA_CP01-brew
+jbossws-spi=1.0.0.GA_CP-SNAPSHOT
jbossws-common=1.0.0.GA_CP-SNAPSHOT
jbossws-framework=2.0.1.GA_CP03-brew
jbossws-jboss40=2.0.1.GA
15 years, 2 months
JBossWS SVN: r9487 - in spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools: ant and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-04 10:13:16 -0500 (Wed, 04 Mar 2009)
New Revision: 9487
Modified:
spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
Log:
[JBPAPP-1750] Support for SOAP 1.2 in wsconsume.
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2009-03-04 13:38:08 UTC (rev 9486)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2009-03-04 15:13:16 UTC (rev 9487)
@@ -109,6 +109,13 @@
public abstract void setSourceDirectory(File directory);
/**
+ * Enables/Disables SOAP 1.2 binding extension
+ *
+ * @param extension whether or not to enable SOAP 1.2 binding extension
+ */
+ public abstract void setExtension(boolean extension);
+
+ /**
* Enables/Disables Java source generation.
*
* @param generateSource whether or not to generate Java source.
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2009-03-04 13:38:08 UTC (rev 9486)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2009-03-04 15:13:16 UTC (rev 9487)
@@ -53,6 +53,7 @@
* <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation</td><td>generated</td></tr>
* <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr>
* <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr>
+ * <tr><td>extension</td><td>Enable SOAP 1.2 binding extension.</td><td>false</td></tr>
* <tr><td>target</td><td>The JAX-WS specification target</td><td>2.0 | 2.1</td></tr>
* <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr>
* <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr>
@@ -88,6 +89,7 @@
private String wsdlLocation;
private String targetPackage;
private boolean keep;
+ private boolean extension;
private boolean verbose;
private boolean fork;
private boolean debug;
@@ -129,6 +131,11 @@
this.keep = keep;
}
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
public void setSourcedestdir(File sourcedestdir)
{
this.sourcedestdir = sourcedestdir;
@@ -178,6 +185,7 @@
{
WSContractConsumer importer = WSContractConsumer.newInstance();
importer.setGenerateSource(keep);
+ importer.setExtension(extension);
if (destdir != null)
importer.setOutputDirectory(destdir);
if (sourcedestdir != null)
@@ -261,6 +269,9 @@
if (keep)
command.createArgument().setValue("-k");
+
+ if (extension)
+ command.createArgument().setValue("-e");
for (File file : bindingFiles)
{
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2009-03-04 13:38:08 UTC (rev 9486)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2009-03-04 15:13:16 UTC (rev 9487)
@@ -51,6 +51,7 @@
* -q, --quiet Be somewhat more quiet
* -v, --verbose Show full exception stack traces
* -l, --load-consumer Load the consumer and exit (debug utility)
+ * -e, --extension Enable SOAP 1.2 binding extension
* </pre>
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
@@ -66,6 +67,7 @@
private boolean quiet = false;
private boolean verbose = false;
private boolean loadConsumer = false;
+ private boolean extension = false;
private File outputDir = new File("output");
private File sourceDir = null;
private String target = null;
@@ -81,7 +83,7 @@
private URL parseArguments(String[] args)
{
- String shortOpts = "b:c:p:w:o:s:t:khqvl";
+ String shortOpts = "b:c:p:w:o:s:t:khqvle";
LongOpt[] longOpts =
{
new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
@@ -95,6 +97,7 @@
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'),
new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'),
+ new LongOpt("extension", LongOpt.NO_ARGUMENT, null, 'e'),
new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'),
};
@@ -137,6 +140,9 @@
case 'l':
loadConsumer = true;
break;
+ case 'e':
+ extension = true;
+ break;
case 'h':
printHelp();
System.exit(0);
@@ -190,6 +196,7 @@
importer.setGenerateSource(generateSource);
importer.setOutputDirectory(outputDir);
+ importer.setExtension(extension);
if (sourceDir != null)
importer.setSourceDirectory(sourceDir);
@@ -254,6 +261,7 @@
out.println(" -q, --quiet Be somewhat more quiet");
out.println(" -v, --verbose Show full exception stack traces");
out.println(" -l, --load-consumer Load the consumer and exit (debug utility)");
+ out.println(" -e, --extension Enable SOAP 1.2 binding extension");
out.flush();
}
}
15 years, 2 months
JBossWS SVN: r9486 - in framework/trunk/hudson: hudson-home and 11 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-04 08:38:08 -0500 (Wed, 04 Mar 2009)
New Revision: 9486
Removed:
framework/trunk/hudson/hudson-home/jobs/AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.4/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.4-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.4/
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
Log:
[JBWS-2568] Updating hudson config
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/ant.properties.example 2009-03-04 13:38:08 UTC (rev 9486)
@@ -30,10 +30,6 @@
hudson.jboss423.build=jboss-4.2.3.GA
hudson.jboss423.rev=HEAD
-hudson.jboss424.url=http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss424.build=jboss-4.2.4.GA
-hudson.jboss424.rev=HEAD
-
hudson.jboss500.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_0...
hudson.jboss500.build=jboss-5.0.0.GA
hudson.jboss500.rev=HEAD
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -14,7 +14,6 @@
<tr><th align=left>Stack-CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
<tr><th align=left>@hudson.jboss423.build@</th><td>-r(a)hudson.jboss423.rev@ @hudson.jboss423.url@</td></tr>
- <tr><th align=left>@hudson.jboss424.build@</th><td>-r(a)hudson.jboss424.rev@ @hudson.jboss424.url@</td></tr>
<tr><th align=left>@hudson.jboss500.build@</th><td>-r(a)hudson.jboss500.rev@ @hudson.jboss500.url@</td></tr>
<tr><th align=left>@hudson.jboss501.build@</th><td>-r(a)hudson.jboss501.rev@ @hudson.jboss501.url@</td></tr>
<tr><th align=left>@hudson.jboss510.build@</th><td>-r(a)hudson.jboss510.rev@ @hudson.jboss510.url@</td></tr>
@@ -35,7 +34,6 @@
<no-comparator/>
<string>AS-Tests-ALL</string>
<string>AS-Tests-AS-4.2.3</string>
- <string>AS-Tests-AS-4.2.4</string>
<string>AS-Tests-AS-5.0.0</string>
<string>AS-Tests-AS-5.0.1</string>
<string>AS-Tests-AS-5.1.0</string>
@@ -60,8 +58,6 @@
<string>Native-Light</string>
<string>Native-Core-AS-4.2.3</string>
<string>Native-Core-AS-4.2.3-JDK6</string>
- <string>Native-Core-AS-4.2.4</string>
- <string>Native-Core-AS-4.2.4-JDK6</string>
<string>Native-Core-AS-5.0.0</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
<string>Native-Core-AS-5.0.1</string>
@@ -72,8 +68,6 @@
<string>Native-Core-AS-6.0.0-JDK6</string>
<string>Native-Distro-AS-4.2.3</string>
<string>Native-Distro-AS-4.2.3-JDK6</string>
- <string>Native-Distro-AS-4.2.4</string>
- <string>Native-Distro-AS-4.2.4-JDK6</string>
<string>Native-Distro-AS-5.0.0</string>
<string>Native-Distro-AS-5.0.0-JDK6</string>
<string>Native-Distro-AS-5.0.1</string>
@@ -84,8 +78,6 @@
<string>Native-Distro-AS-6.0.0-JDK6</string>
<string>Native-Source-Distro-AS-4.2.3</string>
<string>Native-Source-Distro-AS-4.2.3-JDK6</string>
- <string>Native-Source-Distro-AS-4.2.4</string>
- <string>Native-Source-Distro-AS-4.2.4-JDK6</string>
<string>Native-Source-Distro-AS-5.0.0</string>
<string>Native-Source-Distro-AS-5.0.0-JDK6</string>
<string>Native-Source-Distro-AS-5.0.1</string>
@@ -114,8 +106,6 @@
<string>Metro-Light</string>
<string>Metro-Core-AS-4.2.3</string>
<string>Metro-Core-AS-4.2.3-JDK6</string>
- <string>Metro-Core-AS-4.2.4</string>
- <string>Metro-Core-AS-4.2.4-JDK6</string>
<string>Metro-Core-AS-5.0.0</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
<string>Metro-Core-AS-5.0.1</string>
@@ -126,8 +116,6 @@
<string>Metro-Core-AS-6.0.0-JDK6</string>
<string>Metro-Distro-AS-4.2.3</string>
<string>Metro-Distro-AS-4.2.3-JDK6</string>
- <string>Metro-Distro-AS-4.2.4</string>
- <string>Metro-Distro-AS-4.2.4-JDK6</string>
<string>Metro-Distro-AS-5.0.0</string>
<string>Metro-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Distro-AS-5.0.1</string>1
@@ -138,8 +126,6 @@
<string>Metro-Distro-AS-6.0.0-JDK6</string>
<string>Metro-Source-Distro-AS-4.2.3</string>
<string>Metro-Source-Distro-AS-4.2.3-JDK6</string>
- <string>Metro-Source-Distro-AS-4.2.4</string>
- <string>Metro-Source-Distro-AS-4.2.4-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.0</string>
<string>Metro-Source-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.1</string>
@@ -168,8 +154,6 @@
<string>CXF-Light</string>
<string>CXF-Core-AS-4.2.3</string>
<string>CXF-Core-AS-4.2.3-JDK6</string>
- <string>CXF-Core-AS-4.2.4</string>
- <string>CXF-Core-AS-4.2.4-JDK6</string>
<string>CXF-Core-AS-5.0.0</string>
<string>CXF-Core-AS-5.0.0-JDK6</string>
<string>CXF-Core-AS-5.0.1</string>
@@ -180,8 +164,6 @@
<string>CXF-Core-AS-6.0.0-JDK6</string>
<string>CXF-Distro-AS-4.2.3</string>
<string>CXF-Distro-AS-4.2.3-JDK6</string>
- <string>CXF-Distro-AS-4.2.4</string>
- <string>CXF-Distro-AS-4.2.4-JDK6</string>
<string>CXF-Distro-AS-5.0.0</string>
<string>CXF-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Distro-AS-5.0.1</string>
@@ -192,8 +174,6 @@
<string>CXF-Distro-AS-6.0.0-JDK6</string>
<string>CXF-Source-Distro-AS-4.2.3</string>
<string>CXF-Source-Distro-AS-4.2.3-JDK6</string>
- <string>CXF-Source-Distro-AS-4.2.4</string>
- <string>CXF-Source-Distro-AS-4.2.4-JDK6</string>
<string>CXF-Source-Distro-AS-5.0.0</string>
<string>CXF-Source-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Source-Distro-AS-5.0.1</string>
@@ -230,7 +210,6 @@
<tr align=center><th>Target</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Source distribution Tests</th></tr>
<tr align=center><th> </th> <th> </th> <th>Native</th><th>Metro</th><th>CXF</th> <th>Native</th><th>Metro</th><th>CXF</th></tr>
<tr align=center><th align=left>AS-4.2.3</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.2.4</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.1.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
@@ -246,7 +225,6 @@
<jobNames class="tree-set">
<no-comparator/>
<string>AS-4.2.3</string>
- <string>AS-4.2.4</string>
<string>AS-5.0.0</string>
<string>AS-5.0.1</string>
<string>AS-5.1.0</string>
@@ -267,8 +245,6 @@
<string>Metro-Light</string>
<string>Metro-Core-AS-4.2.3</string>
<string>Metro-Core-AS-4.2.3-JDK6</string>
- <string>Metro-Core-AS-4.2.4</string>
- <string>Metro-Core-AS-4.2.4-JDK6</string>
<string>Metro-Core-AS-5.0.0</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
<string>Metro-Core-AS-5.0.1</string>
@@ -279,8 +255,6 @@
<string>Metro-Core-AS-6.0.0-JDK6</string>
<string>Metro-Distro-AS-4.2.3</string>
<string>Metro-Distro-AS-4.2.3-JDK6</string>
- <string>Metro-Distro-AS-4.2.4</string>
- <string>Metro-Distro-AS-4.2.4-JDK6</string>
<string>Metro-Distro-AS-5.0.0</string>
<string>Metro-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Distro-AS-5.0.1</string>
@@ -292,8 +266,6 @@
<string>CXF-Light</string>
<string>CXF-Core-AS-4.2.3</string>
<string>CXF-Core-AS-4.2.3-JDK6</string>
- <string>CXF-Core-AS-4.2.4</string>
- <string>CXF-Core-AS-4.2.4-JDK6</string>
<string>CXF-Core-AS-5.0.0</string>
<string>CXF-Core-AS-5.0.0-JDK6</string>
<string>CXF-Core-AS-5.0.1</string>
@@ -304,8 +276,6 @@
<string>CXF-Core-AS-6.0.0-JDK6</string>
<string>CXF-Distro-AS-4.2.3</string>
<string>CXF-Distro-AS-4.2.3-JDK6</string>
- <string>CXF-Distro-AS-4.2.4</string>
- <string>CXF-Distro-AS-4.2.4-JDK6</string>
<string>CXF-Distro-AS-5.0.0</string>
<string>CXF-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Distro-AS-5.0.1</string>
@@ -317,8 +287,6 @@
<string>Native-Light</string>
<string>Native-Core-AS-4.2.3</string>
<string>Native-Core-AS-4.2.3-JDK6</string>
- <string>Native-Core-AS-4.2.4</string>
- <string>Native-Core-AS-4.2.4-JDK6</string>
<string>Native-Core-AS-5.0.0</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
<string>Native-Core-AS-5.0.1</string>
@@ -329,8 +297,6 @@
<string>Native-Core-AS-6.0.0-JDK6</string>
<string>Native-Distro-AS-4.2.3</string>
<string>Native-Distro-AS-4.2.3-JDK6</string>
- <string>Native-Distro-AS-4.2.4</string>
- <string>Native-Distro-AS-4.2.4-JDK6</string>
<string>Native-Distro-AS-5.0.0</string>
<string>Native-Distro-AS-5.0.0-JDK6</string>
<string>Native-Distro-AS-5.0.1</string>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-4.2.3, AS-Tests-AS-4.2.4, AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-6.0.0</childProjects>
+ <childProjects>AS-Tests-AS-4.2.3, AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -5,19 +5,16 @@
<hudson.tasks.BuildTrigger>
<childProjects>
CXF-Core-AS-4.2.3, CXF-Core-AS-4.2.3-JDK6
-, CXF-Core-AS-4.2.4, CXF-Core-AS-4.2.4-JDK6
, CXF-Core-AS-5.0.0, CXF-Core-AS-5.0.0-JDK6
, CXF-Core-AS-5.0.1, CXF-Core-AS-5.0.1-JDK6
, CXF-Core-AS-5.1.0, CXF-Core-AS-5.1.0-JDK6
, CXF-Core-AS-6.0.0, CXF-Core-AS-6.0.0-JDK6
, CXF-Distro-AS-4.2.3, CXF-Distro-AS-4.2.3-JDK6
-, CXF-Distro-AS-4.2.4, CXF-Distro-AS-4.2.4-JDK6
, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.0.0-JDK6
, CXF-Distro-AS-5.0.1, CXF-Distro-AS-5.0.1-JDK6
, CXF-Distro-AS-5.1.0, CXF-Distro-AS-5.1.0-JDK6
, CXF-Distro-AS-6.0.0, CXF-Distro-AS-6.0.0-JDK6
, CXF-Source-Distro-AS-4.2.3, CXF-Source-Distro-AS-4.2.3-JDK6
-, CXF-Source-Distro-AS-4.2.4, CXF-Source-Distro-AS-4.2.4-JDK6
, CXF-Source-Distro-AS-5.0.0, CXF-Source-Distro-AS-5.0.0-JDK6
, CXF-Source-Distro-AS-5.0.1, CXF-Source-Distro-AS-5.0.1-JDK6
, CXF-Source-Distro-AS-5.1.0, CXF-Source-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -5,13 +5,11 @@
<hudson.tasks.BuildTrigger>
<childProjects>
CXF-Core-AS-4.2.3, CXF-Core-AS-4.2.3-JDK6
-, CXF-Core-AS-4.2.4, CXF-Core-AS-4.2.4-JDK6
, CXF-Core-AS-5.0.0, CXF-Core-AS-5.0.0-JDK6
, CXF-Core-AS-5.0.1, CXF-Core-AS-5.0.1-JDK6
, CXF-Core-AS-5.1.0, CXF-Core-AS-5.1.0-JDK6
, CXF-Core-AS-6.0.0, CXF-Core-AS-6.0.0-JDK6
, CXF-Distro-AS-4.2.3, CXF-Distro-AS-4.2.3-JDK6
-, CXF-Distro-AS-4.2.4, CXF-Distro-AS-4.2.4-JDK6
, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.0.0-JDK6
, CXF-Distro-AS-5.0.1, CXF-Distro-AS-5.0.1-JDK6
, CXF-Distro-AS-5.1.0, CXF-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -5,19 +5,16 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Metro-Core-AS-4.2.3, Metro-Core-AS-4.2.3-JDK6
-, Metro-Core-AS-4.2.4, Metro-Core-AS-4.2.4-JDK6
, Metro-Core-AS-5.0.0, Metro-Core-AS-5.0.0-JDK6
, Metro-Core-AS-5.0.1, Metro-Core-AS-5.0.1-JDK6
, Metro-Core-AS-5.1.0, Metro-Core-AS-5.1.0-JDK6
, Metro-Core-AS-6.0.0, Metro-Core-AS-6.0.0-JDK6
, Metro-Distro-AS-4.2.3, Metro-Distro-AS-4.2.3-JDK6
-, Metro-Distro-AS-4.2.4, Metro-Distro-AS-4.2.4-JDK6
, Metro-Distro-AS-5.0.0, Metro-Distro-AS-5.0.0-JDK6
, Metro-Distro-AS-5.0.1, Metro-Distro-AS-5.0.1-JDK6
, Metro-Distro-AS-5.1.0, Metro-Distro-AS-5.1.0-JDK6
, Metro-Distro-AS-6.0.0, Metro-Distro-AS-6.0.0-JDK6
, Metro-Source-Distro-AS-4.2.3, Metro-Source-Distro-AS-4.2.3-JDK6
-, Metro-Source-Distro-AS-4.2.4, Metro-Source-Distro-AS-4.2.4-JDK6
, Metro-Source-Distro-AS-5.0.0, Metro-Source-Distro-AS-5.0.0-JDK6
, Metro-Source-Distro-AS-5.0.1, Metro-Source-Distro-AS-5.0.1-JDK6
, Metro-Source-Distro-AS-5.1.0, Metro-Source-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -5,13 +5,11 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Metro-Core-AS-4.2.3, Metro-Core-AS-4.2.3-JDK6
-, Metro-Core-AS-4.2.4, Metro-Core-AS-4.2.4-JDK6
, Metro-Core-AS-5.0.0, Metro-Core-AS-5.0.0-JDK6
, Metro-Core-AS-5.0.1, Metro-Core-AS-5.0.1-JDK6
, Metro-Core-AS-5.1.0, Metro-Core-AS-5.1.0-JDK6
, Metro-Core-AS-6.0.0, Metro-Core-AS-6.0.0-JDK6
, Metro-Distro-AS-4.2.3, Metro-Distro-AS-4.2.3-JDK6
-, Metro-Distro-AS-4.2.4, Metro-Distro-AS-4.2.4-JDK6
, Metro-Distro-AS-5.0.0, Metro-Distro-AS-5.0.0-JDK6
, Metro-Distro-AS-5.0.1, Metro-Distro-AS-5.0.1-JDK6
, Metro-Distro-AS-5.1.0, Metro-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -5,19 +5,16 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6
-, Native-Core-AS-4.2.4, Native-Core-AS-4.2.4-JDK6
, Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6
, Native-Core-AS-5.0.1, Native-Core-AS-5.0.1-JDK6
, Native-Core-AS-5.1.0, Native-Core-AS-5.1.0-JDK6
, Native-Core-AS-6.0.0, Native-Core-AS-6.0.0-JDK6
, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6
-, Native-Distro-AS-4.2.4, Native-Distro-AS-4.2.4-JDK6
, Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6
, Native-Distro-AS-5.0.1, Native-Distro-AS-5.0.1-JDK6
, Native-Distro-AS-5.1.0, Native-Distro-AS-5.1.0-JDK6
, Native-Distro-AS-6.0.0, Native-Distro-AS-6.0.0-JDK6
, Native-Source-Distro-AS-4.2.3, Native-Source-Distro-AS-4.2.3-JDK6
-, Native-Source-Distro-AS-4.2.4, Native-Source-Distro-AS-4.2.4-JDK6
, Native-Source-Distro-AS-5.0.0, Native-Source-Distro-AS-5.0.0-JDK6
, Native-Source-Distro-AS-5.0.1, Native-Source-Distro-AS-5.0.1-JDK6
, Native-Source-Distro-AS-5.1.0, Native-Source-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -5,13 +5,11 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6
-, Native-Core-AS-4.2.4, Native-Core-AS-4.2.4-JDK6
, Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6
, Native-Core-AS-5.0.1, Native-Core-AS-5.0.1-JDK6
, Native-Core-AS-5.1.0, Native-Core-AS-5.1.0-JDK6
, Native-Core-AS-6.0.0, Native-Core-AS-6.0.0-JDK6
, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6
-, Native-Distro-AS-4.2.4, Native-Distro-AS-4.2.4-JDK6
, Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6
, Native-Distro-AS-5.0.1, Native-Distro-AS-5.0.1-JDK6
, Native-Distro-AS-5.1.0, Native-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL</childProjects>
+ <childProjects>AS-4.2.3, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
+ <childProjects>AS-4.2.3, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-03-04 13:27:46 UTC (rev 9485)
+++ framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-03-04 13:38:08 UTC (rev 9486)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
+ <childProjects>AS-4.2.3, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
15 years, 2 months
JBossWS SVN: r9485 - in stack/cxf/trunk: modules/management and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-04 08:27:46 -0500 (Wed, 04 Mar 2009)
New Revision: 9485
Removed:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/ant.properties.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build-setup.xml
stack/cxf/trunk/src/main/distro/build.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2568] Removing 4.2.4 support
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/build.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -58,9 +58,6 @@
<condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
<isset property="profiles.profile.properties.jboss423.home"/>
</condition>
- <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}">
- <isset property="profiles.profile.properties.jboss424.home"/>
- </condition>
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -77,7 +74,6 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
- <property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
@@ -85,7 +81,6 @@
<echo/>
<echo message="jboss423.home=${jboss423.home}"/>
- <echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -37,11 +37,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -33,13 +33,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
<!-- CXF dependencies -->
<dependency>
@@ -212,14 +205,6 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
@@ -272,7 +257,6 @@
<configuration>
<tasks>
<property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/>
- <property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}"/>
<ant antfile="src/main/scripts/antrun-beans-config.xml"/>
</tasks>
</configuration>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -39,18 +39,6 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss424/jbossws.beans -->
- <echo message="Concat jbossws-jboss424/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <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"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -316,46 +316,6 @@
</profile>
<!--
- Name: jboss424
- Descr: JBoss-4.2.4 specific options
- -->
- <profile>
- <id>jboss424</id>
- <properties>
- <jboss.version>4.2.4-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss424</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 13:27:46 UTC (rev 9485)
@@ -1,91 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
-# [CXF-1253] CXF does not respect @HandlerChain on client SEI
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
-# [CXF-1510] Cannot handle anonymous bare requests
-org/jboss/test/ws/jaxws/anonymous/**
-
-# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
-org/jboss/test/ws/jaxws/binding/**
-
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [CXF-1516] Type inheritance with document/literal/wrapped
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1655] Add support for endpoint address rewriting
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
-
-# [JBWS-2118] context-root in jboss.xml is ignored
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2119] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2307] Stub properties not propagated through service-ref (fixed in AS 5.x and above)
-org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.*
-
-# [JBWS-2330] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
-
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/pom.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -48,7 +48,6 @@
<jbossws.framework.version>3.1.1-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss423.version>3.1.0.GA</jbossws.jboss423.version>
- <jbossws.jboss424.version>3.1.0.GA</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.0.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
@@ -119,18 +118,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -536,18 +523,6 @@
</profile>
<!--
- Name: jboss424
- Descr: JBoss-4.2.4 specific options
- -->
- <profile>
- <id>jboss424</id>
- <properties>
- <jbossws.integration.target>jboss424</jbossws.integration.target>
- <jboss.home>${jboss424.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/profiles.xml.example 2009-03-04 13:27:46 UTC (rev 9485)
@@ -12,7 +12,6 @@
</activation>
<properties>
<jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-03-04 13:27:46 UTC (rev 9485)
@@ -4,13 +4,12 @@
# Optional JBoss Home
jboss423.home=(a)jboss423.home@
-jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss423|jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -49,28 +49,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss424 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss424">
- <property name="jbossws.integration.target" value="jboss424"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss424" depends="undeploy-jboss424,deploy-structure-jboss42" description="Deploy jbossws to jboss424">
- <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <copy todir="${jboss424.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424">
- <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -27,12 +27,6 @@
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
- <property name="jboss424.lib" value="${jboss424.home}/lib"/>
- <property name="jboss424.client" value="${jboss424.home}/client"/>
- <property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/>
- <property name="jboss424.server.lib" value="${jboss424.server}/lib"/>
- <property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/>
-
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -62,14 +56,12 @@
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
- <available property="jboss424.available" file="${jboss424.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/src/main/distro/build.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -49,7 +49,6 @@
<condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss424"/>
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 13:12:04 UTC (rev 9484)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 13:27:46 UTC (rev 9485)
@@ -100,16 +100,6 @@
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss424x:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
15 years, 2 months
JBossWS SVN: r9484 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-04 08:12:04 -0500 (Wed, 04 Mar 2009)
New Revision: 9484
Modified:
stack/metro/trunk/build.xml
Log:
[JBWS-2568]
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-03-04 13:07:02 UTC (rev 9483)
+++ stack/metro/trunk/build.xml 2009-03-04 13:12:04 UTC (rev 9484)
@@ -58,9 +58,6 @@
<condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
<isset property="profiles.profile.properties.jboss423.home"/>
</condition>
- <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}">
- <isset property="profiles.profile.properties.jboss424.home"/>
- </condition>
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -77,7 +74,6 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
- <property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
@@ -85,7 +81,6 @@
<echo/>
<echo message="jboss423.home=${jboss423.home}"/>
- <echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
15 years, 2 months
JBossWS SVN: r9483 - in stack/metro/trunk: modules/management and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-04 08:07:02 -0500 (Wed, 04 Mar 2009)
New Revision: 9483
Removed:
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2568] Removing 4.2.4 support
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/management/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -37,11 +37,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/server/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -33,13 +33,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
<!-- Metro dependencies -->
<dependency>
@@ -161,14 +154,6 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -39,18 +39,6 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss424/jbossws.beans -->
- <echo message="Concat jbossws-jboss424/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <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"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -332,51 +332,6 @@
</profile>
<!--
- Name: jboss424
- Descr: JBoss-4.2.4 specific options
- -->
- <profile>
- <id>jboss424</id>
- <properties>
- <jboss.version>4.2.4-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss424</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 13:07:02 UTC (rev 9483)
@@ -1,65 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/jbws2307/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-1949] Metro MTOM ignores content-type on attachment part
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws2183/**
-
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2347] Rewrite @WebFault related tests
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2348] Fix jbws1969 testcase
-org/jboss/test/ws/jaxws/jbws1969/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2400] Rewrite large attachment testcase
-org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2462] Address rewrite test fails in Metro integration
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
-
-# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
\ No newline at end of file
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -49,7 +49,6 @@
<jbossws.framework.version>3.1.1-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss423.version>3.1.0.GA</jbossws.jboss423.version>
- <jbossws.jboss424.version>3.1.0.GA</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.0.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
@@ -118,18 +117,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -460,18 +447,6 @@
</profile>
<!--
- Name: jboss424
- Descr: JBoss-4.2.4 specific options
- -->
- <profile>
- <id>jboss424</id>
- <properties>
- <jbossws.integration.target>jboss424</jbossws.integration.target>
- <jboss.home>${jboss424.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/profiles.xml.example 2009-03-04 13:07:02 UTC (rev 9483)
@@ -12,7 +12,6 @@
</activation>
<properties>
<jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-03-04 13:07:02 UTC (rev 9483)
@@ -4,13 +4,12 @@
# Optional JBoss Home
jboss423.home=(a)jboss423.home@
-jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss423|jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -51,30 +51,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss424 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss424">
- <property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss424"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
- <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
- </target>
-
- <target name="deploy-jboss424" depends="undeploy-jboss424,deploy-structure-jboss42" description="Deploy jbossws to jboss424">
- <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <copy todir="${jboss424.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424">
- <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -26,12 +26,6 @@
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
- <property name="jboss424.lib" value="${jboss424.home}/lib"/>
- <property name="jboss424.client" value="${jboss424.home}/client"/>
- <property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/>
- <property name="jboss424.server.lib" value="${jboss424.server}/lib"/>
- <property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/>
-
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -61,14 +55,12 @@
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
- <available property="jboss424.available" file="${jboss424.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -49,7 +49,6 @@
<condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss424"/>
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -88,16 +88,6 @@
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss424x:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
15 years, 2 months