JBossWS SVN: r10337 - stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-07-17 10:56:17 -0400 (Fri, 17 Jul 2009)
New Revision: 10337
Modified:
stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
Log:
Remove the System.out.println calls :-)
Modified: stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-07-17 14:55:22 UTC (rev 10336)
+++ stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-07-17 14:56:17 UTC (rev 10337)
@@ -769,14 +769,11 @@
List filtered = new LinkedList();
- System.out.println(namespaceURI + ", " + localName);
- System.out.println("filtering " + nodes.size() + " nodes");
for (Element current : nodes)
{
boolean namespaceMatch = false;
boolean localNameMatch = false;
- System.out.println("Checking " + current.getNamespaceURI() + ", " + current.getLocalName());
if ("*".equals(namespaceURI) || ((namespaceURI != null) && namespaceURI.equals(current.getNamespaceURI())))
{
namespaceMatch = true;
@@ -789,7 +786,6 @@
if (namespaceMatch == true && localNameMatch == true)
{
- System.out.println("Adding " + current.getNamespaceURI() + ", " + current.getLocalName());
filtered.add(current);
}
}
15 years, 5 months
- 1
- 0
JBossWS SVN: r10336 - in stack/native/branches/dlofthouse/JBWS-2704/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-07-17 10:55:22 -0400 (Fri, 17 Jul 2009)
New Revision: 10336
Added:
stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2704.xml
Modified:
stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
Test case and implementation.
Modified: stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-07-17 14:53:41 UTC (rev 10335)
+++ stack/native/branches/dlofthouse/JBWS-2704/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-07-17 14:55:22 UTC (rev 10336)
@@ -25,6 +25,7 @@
import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import javax.xml.namespace.QName;
@@ -764,7 +765,36 @@
public NodeList getElementsByTagNameNS(String namespaceURI, String localName)
{
- return new NodeListImpl(DOMUtils.getChildElements(this, new QName(namespaceURI, localName), true));
+ List<Element> nodes = DOMUtils.getChildElementsAsList(this, (QName)null, true);
+
+ List filtered = new LinkedList();
+
+ System.out.println(namespaceURI + ", " + localName);
+ System.out.println("filtering " + nodes.size() + " nodes");
+ for (Element current : nodes)
+ {
+ boolean namespaceMatch = false;
+ boolean localNameMatch = false;
+
+ System.out.println("Checking " + current.getNamespaceURI() + ", " + current.getLocalName());
+ if ("*".equals(namespaceURI) || ((namespaceURI != null) && namespaceURI.equals(current.getNamespaceURI())))
+ {
+ namespaceMatch = true;
+ }
+
+ if ("*".equals(localName) || ((localName != null) && localName.equals(current.getLocalName())))
+ {
+ localNameMatch = true;
+ }
+
+ if (namespaceMatch == true && localNameMatch == true)
+ {
+ System.out.println("Adding " + current.getNamespaceURI() + ", " + current.getLocalName());
+ filtered.add(current);
+ }
+ }
+
+ return new NodeListImpl(filtered.iterator());
}
public TypeInfo getSchemaTypeInfo()
Modified: stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-07-17 14:53:41 UTC (rev 10335)
+++ stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-07-17 14:55:22 UTC (rev 10336)
@@ -123,7 +123,45 @@
}
assertEquals("Strawberry Apple Banana Orange Raspberry ", sb.toString());
}
+
+ // JBWS-2704
+ public void testGetElementByTagNameNS_Wildcard() throws Exception
+ {
+ InputStream is = getResourceURL("common/soap/jbws2704.xml").openStream();
+ MessageFactory messageFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = messageFactory.createMessage(null, is);
+ SOAPEnvelope envelope = soapMessage.getSOAPPart().getEnvelope();
+ NodeList nodes = envelope.getElementsByTagNameNS("*", "String_1");
+ assertEquals("String_1 nodes", 2, nodes.getLength());
+ assertEquals("String_1(0) text content", "Value_1", nodes.item(0).getTextContent());
+ assertEquals("String_1(1) text content", "Value_2", nodes.item(1).getTextContent());
+
+ nodes = envelope.getElementsByTagNameNS("*", "String_2");
+ assertEquals("String_2 nodes", 2, nodes.getLength());
+ assertEquals("String_2(0) text content", "Value_3", nodes.item(0).getTextContent());
+ assertEquals("String_2(1) text content", "Value_4", nodes.item(1).getTextContent());
+
+ nodes = envelope.getElementsByTagNameNS("http://org.jboss.ws/testNS1", "*");
+ assertEquals("http://org.jboss.ws/testNS1 nodes", 2, nodes.getLength());
+ assertEquals("http://org.jboss.ws/testNS1(0) text content", "Value_1", nodes.item(0).getTextContent());
+ assertEquals("http://org.jboss.ws/testNS1(1) text content", "Value_3", nodes.item(1).getTextContent());
+
+ nodes = envelope.getElementsByTagNameNS("http://org.jboss.ws/testNS2", "*");
+ assertEquals("http://org.jboss.ws/testNS2 nodes", 2, nodes.getLength());
+ assertEquals("http://org.jboss.ws/testNS2(0) text content", "Value_2", nodes.item(0).getTextContent());
+ assertEquals("http://org.jboss.ws/testNS2(1) text content", "Value_4", nodes.item(1).getTextContent());
+
+ nodes = envelope.getElementsByTagNameNS("http://org.jboss.ws/testNS1", "String_1");
+ assertEquals("http://org.jboss.ws/testNS1 String_1 nodes", 1, nodes.getLength());
+ assertEquals("http://org.jboss.ws/testNS1 String_1(0) text content", "Value_1", nodes.item(0).getTextContent());
+
+ nodes = envelope.getElementsByTagNameNS("http://org.jboss.ws/testNS2", "String_1");
+ assertEquals("http://org.jboss.ws/testNS2 String_1 nodes", 1, nodes.getLength());
+ assertEquals("http://org.jboss.ws/testNS2 String_1(0) text content", "Value_2", nodes.item(0).getTextContent());
+ }
+
+
// http://jira.jboss.com/jira/browse/JBWS-773
public void testGetNamespaceURI() throws Exception
{
Added: stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2704.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2704.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2704.xml 2009-07-17 14:55:22 UTC (rev 10336)
@@ -0,0 +1,11 @@
+<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2704'>
+ <soapenv:Header/>
+ <soapenv:Body>
+ <jbw:echo xmlns:ns1='http://org.jboss.ws/testNS1' xmlns:ns2='http://org.jboss.ws/testNS2'>
+ <ns1:String_1>Value_1</ns1:String_1>
+ <ns2:String_1>Value_2</ns2:String_1>
+ <ns1:String_2>Value_3</ns1:String_2>
+ <ns2:String_2>Value_4</ns2:String_2>
+ </jbw:echo>
+ </soapenv:Body>
+</soapenv:Envelope>
Property changes on: stack/native/branches/dlofthouse/JBWS-2704/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2704.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 5 months
- 1
- 0
JBossWS SVN: r10335 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-07-17 10:53:41 -0400 (Fri, 17 Jul 2009)
New Revision: 10335
Added:
stack/native/branches/dlofthouse/JBWS-2704/
Log:
Create working area.
Copied: stack/native/branches/dlofthouse/JBWS-2704 (from rev 10334, stack/native/trunk)
15 years, 5 months
- 1
- 0
JBossWS SVN: r10334 - in stack/native/branches/dlofthouse/JBWS-2703/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-07-17 09:06:34 -0400 (Fri, 17 Jul 2009)
New Revision: 10334
Added:
stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2703.xml
Modified:
stack/native/branches/dlofthouse/JBWS-2703/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
Test case and starting the implementation.
Modified: stack/native/branches/dlofthouse/JBWS-2703/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2703/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-07-17 13:05:14 UTC (rev 10333)
+++ stack/native/branches/dlofthouse/JBWS-2703/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-07-17 13:06:34 UTC (rev 10334)
@@ -738,6 +738,11 @@
public NodeList getElementsByTagName(String name)
{
+ if ("*".equals(name))
+ {
+
+ }
+
return new NodeListImpl(DOMUtils.getChildElements(this, name, true));
}
Modified: stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-07-17 13:05:14 UTC (rev 10333)
+++ stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-07-17 13:06:34 UTC (rev 10334)
@@ -123,6 +123,26 @@
}
assertEquals("Strawberry Apple Banana Orange Raspberry ", sb.toString());
}
+
+ // JBWS-2703
+ public void testGetElementByTagName() throws Exception
+ {
+ InputStream is = getResourceURL("common/soap/jbws2703.xml").openStream();
+ MessageFactory messageFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = messageFactory.createMessage(null, is);
+ SOAPEnvelope envelope = soapMessage.getSOAPPart().getEnvelope();
+
+ NodeList nodeList = envelope.getElementsByTagName("soapenv:Envelope");
+ assertEquals("soapenv:Envelope nodes.", 1, nodeList.getLength());
+ nodeList = envelope.getElementsByTagName("soapenv:Header");
+ assertEquals("soapenv:Header nodes.", 1, nodeList.getLength());
+ nodeList = envelope.getElementsByTagName("soapenv:Body");
+ assertEquals("soapenv:Body nodes.", 1, nodeList.getLength());
+ nodeList = envelope.getElementsByTagName("jbw:echo");
+ assertEquals("jbw:echo nodes.", 1, nodeList.getLength());
+ nodeList = envelope.getElementsByTagName("arg0");
+ assertEquals("arg0 nodes.", 1, nodeList.getLength());
+ }
// http://jira.jboss.com/jira/browse/JBWS-773
public void testGetNamespaceURI() throws Exception
Added: stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2703.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2703.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2703.xml 2009-07-17 13:06:34 UTC (rev 10334)
@@ -0,0 +1,13 @@
+<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2703'>
+ <soapenv:Header>
+ <jbw:myvalue>
+ <arg0>111</arg0>
+ </jbw:myvalue>
+ </soapenv:Header>
+ <soapenv:Body>
+ <jbw:echo>
+ <arg0>222</arg0>
+ </jbw:echo>
+ </soapenv:Body>
+</soapenv:Envelope>
+
Property changes on: stack/native/branches/dlofthouse/JBWS-2703/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2703.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 5 months
- 1
- 0
JBossWS SVN: r10333 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-07-17 09:05:14 -0400 (Fri, 17 Jul 2009)
New Revision: 10333
Added:
stack/native/branches/dlofthouse/JBWS-2703/
Log:
Create working area.
Copied: stack/native/branches/dlofthouse/JBWS-2703 (from rev 10332, stack/native/trunk)
15 years, 5 months
- 1
- 0
JBossWS SVN: r10332 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/management and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-17 08:54:39 -0400 (Fri, 17 Jul 2009)
New Revision: 10332
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-2273] Support jboss510 only
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -54,31 +54,16 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
- <isset property="profiles.profile.properties.jboss500.home"/>
- </condition>
- <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
- <isset property="profiles.profile.properties.jboss501.home"/>
- </condition>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
- <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
- <isset property="profiles.profile.properties.jboss600.home"/>
- </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <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}"/>
- <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
- <echo message="jboss500.home=${jboss500.home}"/>
- <echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
- <echo message="jboss600.home=${jboss600.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/pom.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -29,16 +29,6 @@
<scope>provided</scope>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -47,11 +37,6 @@
<artifactId>jbossws-jboss510x</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <scope>provided</scope>
- </dependency>
-->
<!-- END -->
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -178,6 +178,9 @@
</resource>
</resources>
<plugins>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -192,46 +195,19 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
- </artifactItem>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
- </artifactItem>
- -->
- <!-- END -->
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ -->
+ <!-- END -->
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -27,26 +27,6 @@
<!-- Compile resource files -->
<target name="main" depends="init">
- <!-- 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">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss510/jbossws.beans -->
<echo message="Concat jbossws-jboss510/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
@@ -57,16 +37,6 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss600/jbossws.beans -->
- <echo message="Concat jbossws-jboss600/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
</target>
</project>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -276,122 +276,6 @@
</profile>
<!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <properties>
- <jboss.version>5.0.0.GA</jboss.version>
- <jbossws.integration.target>jboss500</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <properties>
- <jboss.version>5.0.1.GA</jboss.version>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss510
Descr: JBoss-5.1.0 specific options
-->
@@ -447,61 +331,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- </properties>
- <dependencies>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <!-- END -->
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss500.txt 2009-07-17 12:54:39 UTC (rev 10332)
@@ -1,55 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [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-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-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/bare
-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-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1655] Add support for endpoint address rewriting
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2596] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-org/jboss/test/ws/jaxws/jbws2634/**
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2571] Mode.INOUT parameter not generated
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss501.txt 2009-07-17 12:54:39 UTC (rev 10332)
@@ -1,55 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [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-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-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/bare
-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-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1655] Add support for endpoint address rewriting
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2596] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-org/jboss/test/ws/jaxws/jbws2634/**
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2571] Mode.INOUT parameter not generated
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss600.txt 2009-07-17 12:54:39 UTC (rev 10332)
@@ -1,55 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [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-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-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/bare
-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-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1655] Add support for endpoint address rewriting
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2596] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-org/jboss/test/ws/jaxws/jbws2634/**
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2571] Mode.INOUT parameter not generated
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -44,15 +44,12 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.1.0.SP2</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP3</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP1</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
<cxf.version>2.2.2</cxf.version>
@@ -104,30 +101,6 @@
<classifier>testsuite</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
<!-- JBWS-2505 -->
<!-- START -->
<!--
@@ -143,18 +116,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
-->
<!-- END -->
@@ -523,30 +484,6 @@
</profile>
<!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <properties>
- <jbossws.integration.target>jboss500</jbossws.integration.target>
- <jboss.home>${jboss500.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <properties>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- <jboss.home>${jboss501.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss510
Descr: JBoss-5.1.0 specific options
-->
@@ -559,18 +496,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: smoketest
Descr: Executes the smoke tests
-->
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/profiles.xml.example 2009-07-17 12:54:39 UTC (rev 10332)
@@ -11,10 +11,7 @@
</property>
</activation>
<properties>
- <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.GA</jboss510.home>
- <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/Install.txt 2009-07-17 12:54:39 UTC (rev 10332)
@@ -11,11 +11,9 @@
1.) Copy ant.properties.examples to ant.properties
2.) Modify the target container location in ant.properties
-3.) Execute one of the following
+3.) Execute
- ant deploy-jboss50x
- ant deploy-jboss51x
- ant deploy-jboss60x
+ ant deploy-jboss510
4.) Execute the samples to verify your installation
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/ant.properties.example 2009-07-17 12:54:39 UTC (rev 10332)
@@ -3,13 +3,10 @@
#
# Optional JBoss 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 [jboss500|jboss501|jboss510|jboss600]
-jbossws.integration.target=jboss500
+# The JBoss server under test. This can be [jboss510]
+jbossws.integration.target=jboss510
# The JBoss settings
jboss.server.instance=default
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-deploy.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -27,50 +27,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss500">
- <property name="jbossws.integration.target" value="jboss500"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <copy todir="${jboss500.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss501">
- <property name="jbossws.integration.target" value="jboss501"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
@@ -108,43 +64,6 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss60" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf60" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-setup.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -21,20 +21,6 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <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}"/>
- <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
<property name="jboss510.lib" value="${jboss510.home}/lib"/>
<property name="jboss510.client" value="${jboss510.home}/client"/>
<property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/>
@@ -42,22 +28,9 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
- <property name="jboss600.lib" value="${jboss600.home}/lib"/>
- <property name="jboss600.client" value="${jboss600.home}/client"/>
- <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
- <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
- <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
- <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
-
- <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="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
- <available property="jboss600.available" file="${jboss600.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -45,22 +45,11 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss50" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss51" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
- <condition property="jbossws.integration.jboss60" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- </or>
- </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-17 11:03:54 UTC (rev 10331)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-17 12:54:39 UTC (rev 10332)
@@ -92,22 +92,11 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss501:jar</include>
- </includes>
- </dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -121,16 +110,6 @@
<include>org.jboss.ws:jbossws-jboss510x:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss600x:jar</include>
- </includes>
- </dependencySet>
-->
<!-- END -->
</dependencySets>
15 years, 5 months
- 1
- 0
JBossWS SVN: r10331 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-17 07:03:54 -0400 (Fri, 17 Jul 2009)
New Revision: 10331
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss500.txt
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss501.txt
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss600.txt
Modified:
stack/native/branches/jbossws-native-3.1.2/build.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
stack/native/branches/jbossws-native-3.1.2/profiles.xml.example
stack/native/branches/jbossws-native-3.1.2/src/main/distro/Install.txt
stack/native/branches/jbossws-native-3.1.2/src/main/distro/ant.properties.example
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-deploy.xml
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-setup.xml
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-2273] Support jboss510 only
Modified: stack/native/branches/jbossws-native-3.1.2/build.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/build.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/build.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -50,31 +50,16 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
- <isset property="profiles.profile.properties.jboss500.home"/>
- </condition>
- <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
- <isset property="profiles.profile.properties.jboss501.home"/>
- </condition>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
- <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
- <isset property="profiles.profile.properties.jboss600.home"/>
- </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <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}"/>
- <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
- <echo message="jboss500.home=${jboss500.home}"/>
- <echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
- <echo message="jboss600.home=${jboss600.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -179,6 +179,9 @@
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -192,46 +195,19 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
- </artifactItem>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
- </artifactItem>
- -->
- <!-- END -->
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ -->
+ <!-- END -->
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/scripts/antrun-beans-config.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/scripts/antrun-beans-config.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -27,26 +27,6 @@
<!-- Compile resource files -->
<target name="main" depends="init">
- <!-- 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">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss510/jbossws.beans -->
<echo message="Concat jbossws-jboss510/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
@@ -57,16 +37,6 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss600/jbossws.beans -->
- <echo message="Concat jbossws-jboss600/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
</target>
</project>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -29,16 +29,6 @@
<scope>provided</scope>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -47,11 +37,6 @@
<artifactId>jbossws-jboss510x</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <scope>provided</scope>
- </dependency>
-->
<!-- END -->
<dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -105,21 +105,6 @@
<!-- Deploy Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-lib50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-lib51">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -135,21 +120,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-lib60">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -171,21 +141,6 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client51">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -206,44 +161,10 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-client60">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <include name="**/jbossws-(a){jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-server-lib51">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -258,20 +179,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-server-lib60">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy JUDDI Service -->
<!-- ================================================================== -->
@@ -299,21 +206,6 @@
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-sar50">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-sar51">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -329,62 +221,10 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-sar60">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy Deployers -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-deployers50">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-deployers51">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -432,70 +272,12 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-deployers60">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <include name="**/jbossws-(a){jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
- </fileset>
- </copy>
- -->
- <!-- END -->
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
<available classname="java.io.Console" property="HAVE_JDK16_OR_ABOVE"/>
- <target name="deploy-jbossws-native50" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-native51" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -507,17 +289,6 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-native60" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-sar60 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-endorsed" if="HAVE_JDK16_OR_ABOVE">
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
@@ -532,42 +303,6 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws50">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
<macrodef name="macro-undeploy-jbossws51">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
@@ -609,45 +344,4 @@
</sequential>
</macrodef>
- <macrodef name="macro-undeploy-jbossws60">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!-- delete stale container integration jars -->
- <!--
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
- -->
- <!-- END -->
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
</project>
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 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -279,150 +279,6 @@
</profile>
<!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <properties>
- <jboss.version>5.0.0.GA</jboss.version>
- <jbossws.integration.target>jboss500</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <exclusions>
- <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <properties>
- <jboss.version>5.0.1.GA</jboss.version>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <exclusions>
- <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata -->
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>${jboss.javaee.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss510
Descr: JBoss-5.1.0 specific options
-->
@@ -494,77 +350,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- </properties>
- <dependencies>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <!-- END -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
- <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss500.txt 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss500.txt 2009-07-17 11:03:54 UTC (rev 10331)
@@ -1,14 +0,0 @@
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1967] Implement in memory webapp deployment
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBWS-2217] Fix BPEL jaxrpc samples
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2634] Implement support for @EJB annotations in WS components (fixed in AS 501 and above)
-org/jboss/test/ws/jaxws/jbws2634/**
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss501.txt 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss501.txt 2009-07-17 11:03:54 UTC (rev 10331)
@@ -1,8 +0,0 @@
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2217] Fix BPEL jaxrpc samples
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss600.txt 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss600.txt 2009-07-17 11:03:54 UTC (rev 10331)
@@ -1,8 +0,0 @@
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2217] Fix BPEL jaxrpc samples
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -48,15 +48,12 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.1.0.SP2</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP3</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP1</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600.version>3.1.2-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -107,30 +104,6 @@
<classifier>testsuite</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -146,18 +119,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
-->
<!-- END -->
<!-- provided apis -->
@@ -453,30 +414,6 @@
</profile>
<!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <properties>
- <jbossws.integration.target>jboss500</jbossws.integration.target>
- <jboss.home>${jboss500.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <properties>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- <jboss.home>${jboss501.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss510
Descr: JBoss-5.1.0 specific options
-->
@@ -489,18 +426,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jdk16
Descr: Compile with jdk1.6
-->
Modified: stack/native/branches/jbossws-native-3.1.2/profiles.xml.example
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/profiles.xml.example 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/profiles.xml.example 2009-07-17 11:03:54 UTC (rev 10331)
@@ -12,10 +12,7 @@
</activation>
<properties>
<java.jdk15.home>/usr/java/jdk1.5</java.jdk15.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.GA</jboss510.home>
- <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/Install.txt
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/Install.txt 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/Install.txt 2009-07-17 11:03:54 UTC (rev 10331)
@@ -11,11 +11,9 @@
1.) Copy ant.properties.examples to ant.properties
2.) Modify the target container location in ant.properties
-3.) Execute one of the following
+3.) Execute
- ant deploy-jboss50x
- ant deploy-jboss51x
- ant deploy-jboss60x
+ ant deploy-jboss510
4.) Execute the samples to verify your installation
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/ant.properties.example
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/ant.properties.example 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/ant.properties.example 2009-07-17 11:03:54 UTC (rev 10331)
@@ -3,13 +3,10 @@
#
# Optional JBoss 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 [jboss500|jboss501|jboss510|jboss600]
-jbossws.integration.target=jboss500
+# The JBoss server under test. This can be [jboss510]
+jbossws.integration.target=jboss510
# The JBoss settings
jboss.server.instance=default
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-deploy.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-deploy.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -12,65 +12,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.0.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss50" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native50" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss500">
- <property name="jbossws.integration.target" value="jboss500"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <copy todir="${jboss500.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss501">
- <property name="jbossws.integration.target" value="jboss501"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
@@ -108,43 +49,6 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss60" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native60" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-setup.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-setup.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-setup.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -21,20 +21,6 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <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}"/>
- <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
<property name="jboss510.lib" value="${jboss510.home}/lib"/>
<property name="jboss510.client" value="${jboss510.home}/client"/>
<property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/>
@@ -42,22 +28,9 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
- <property name="jboss600.lib" value="${jboss600.home}/lib"/>
- <property name="jboss600.client" value="${jboss600.home}/client"/>
- <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
- <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
- <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
- <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
-
- <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="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
- <available property="jboss600.available" file="${jboss600.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -45,22 +45,11 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss50" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss51" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
- <condition property="jbossws.integration.jboss60" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- </or>
- </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-17 10:57:17 UTC (rev 10330)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-17 11:03:54 UTC (rev 10331)
@@ -82,22 +82,11 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss501:jar</include>
- </includes>
- </dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -111,16 +100,6 @@
<include>org.jboss.ws:jbossws-jboss510x:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss600x:jar</include>
- </includes>
- </dependencySet>
-->
<!-- END -->
</dependencySets>
15 years, 5 months
- 1
- 0
JBossWS SVN: r10330 - framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-17 06:57:17 -0400 (Fri, 17 Jul 2009)
New Revision: 10330
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml
Log:
[JBPAPP-2273] Support jboss510 only
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml 2009-07-17 08:02:58 UTC (rev 10329)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml 2009-07-17 10:57:17 UTC (rev 10330)
@@ -15,18 +15,9 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
- <condition property="jboss.home" value="${jboss501.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </condition>
<condition property="jboss.home" value="${jboss510.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</condition>
- <condition property="jboss.home" value="${jboss600.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -108,7 +99,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
+ <target name="tests-classpath" depends="tests-classpath-jboss51">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
@@ -121,82 +112,6 @@
</path>
</target>
- <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
-
- <path id="integration.target.javac.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss500.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss501.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/trove.jar"/>
- <!-- FIXME jars should be available in the client dir -->
- <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-container.jar"/>
- <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
- <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
-
<target name="tests-classpath-jboss51" depends="tests-prepare" if="jbossws.integration.jboss51">
<path id="integration.target.javac.classpath">
@@ -243,6 +158,7 @@
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss510.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> <!-- EAP5 support -->
<pathelement location="${jboss.client}/jaxws-tools.jar"/>
<pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
@@ -272,80 +188,6 @@
</path>
</target>
- <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60">
-
- <path id="integration.target.javac.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss510.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/trove.jar"/>
- <!-- FIXME jars should be available in the client dir -->
- <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-container.jar"/>
- <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
- <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
<!-- ================================================================== -->
<!-- Compiling -->
15 years, 5 months
- 1
- 0