JBossWS SVN: r3408 - trunk/integration/xfire/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 12:15:04 -0400 (Sun, 03 Jun 2007)
New Revision: 3408
Modified:
trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Fix test-excludes location
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-03 16:06:36 UTC (rev 3407)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-03 16:15:04 UTC (rev 3408)
@@ -18,7 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes.txt"/>
+ <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
18 years, 5 months
- 1
- 0
JBossWS SVN: r3407 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 12:06:36 -0400 (Sun, 03 Jun 2007)
New Revision: 3407
Added:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
Removed:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
Modified:
trunk/build/hudson/hudson-home/config.xml
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
Log:
Fix native jboss40 compile
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 16:06:36 UTC (rev 3407)
@@ -128,13 +128,13 @@
A collection of jobs that cover the JBossWS release matrix.
<p/>
<table border=1>
-<tr align=center><th>Target Container</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Integration Tests</th></tr>
+<tr align=center><th>Target</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Integration Tests</th></tr>
<tr align=center><th> </th> <th> </th> <th>Native</th><th>SunRI</th><th>XFire</th> <th>Native</th><th>SunRI</th><th>XFire</th></tr>
<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
</table>
-]]>
+]]>
</description>
</view>
Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-03 16:06:36 UTC (rev 3407)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss42;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public abstract class AbstractApplicationMetaDataAdapter
-{
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, ApplicationMetaData apmd)
- {
- dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
-
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, apmd);
- umd.setConfigName(apmd.getConfigName());
- umd.setConfigFile(apmd.getConfigFile());
- umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
- umd.setSecurityDomain(apmd.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
- }
-
- protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- return apmd.getWsdlPublishLocationByName(name);
- }
- };
- }
-
- protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
- {
- List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
- Iterator it = metaData.getEnterpriseBeans();
- while (it.hasNext())
- {
- BeanMetaData bmd = (BeanMetaData)it.next();
- UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
- if (ubmd != null)
- {
- beans.add(ubmd);
- }
- }
- umd.setEnterpriseBeans(beans);
- }
-
- protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd);
-}
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-03 16:06:36 UTC (rev 3407)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss42;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public abstract class AbstractApplicationMetaDataAdapter
+{
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, ApplicationMetaData apmd)
+ {
+ dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
+
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(umd, apmd);
+ umd.setConfigName(apmd.getConfigName());
+ umd.setConfigFile(apmd.getConfigFile());
+ umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
+ umd.setSecurityDomain(apmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
+
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
+ return umd;
+ }
+
+ protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return apmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
+ {
+ List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ Iterator it = metaData.getEnterpriseBeans();
+ while (it.hasNext())
+ {
+ BeanMetaData bmd = (BeanMetaData)it.next();
+ UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
+ if (ubmd != null)
+ {
+ beans.add(ubmd);
+ }
+ }
+ umd.setEnterpriseBeans(beans);
+ }
+
+ protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd);
+}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-03 16:06:36 UTC (rev 3407)
@@ -46,9 +46,9 @@
// logging support
private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class);
- private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3 = new ApplicationMetaDataAdapterEJB3();
- private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21 = new ApplicationMetaDataAdapterEJB21();
- private WebMetaDataAdapter webMetaDataAdapter = new WebMetaDataAdapter();
+ private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3;
+ private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21;
+ private WebMetaDataAdapter webMetaDataAdapter;
public void setApplicationMetaDataAdapterEJB21(AbstractApplicationMetaDataAdapter adapter)
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-06-03 16:06:36 UTC (rev 3407)
@@ -40,7 +40,7 @@
*/
public class UnifiedDeploymentInfoDeployer extends AbstractDeployer
{
- private DeploymentInfoAdapter deploymentInfoAdapter = new DeploymentInfoAdapter();
+ private DeploymentInfoAdapter deploymentInfoAdapter;
public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter)
{
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 16:06:36 UTC (rev 3407)
@@ -163,8 +163,11 @@
<!-- Deployer helper beans -->
<bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
<bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
<property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
@@ -172,6 +175,7 @@
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
</bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 16:06:36 UTC (rev 3407)
@@ -147,7 +147,9 @@
</bean>
<bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/>
<bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
+ <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
+ </bean>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
@@ -160,11 +162,19 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
</bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 16:06:36 UTC (rev 3407)
@@ -130,7 +130,9 @@
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
</bean>
<bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
+ <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
+ </bean>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -140,12 +142,20 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.sunri.WebAppDesciptorModifierImpl">
<property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property>
<property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property>
</bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:50:59 UTC (rev 3406)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 16:06:36 UTC (rev 3407)
@@ -129,7 +129,9 @@
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
</bean>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
+ <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
+ </bean>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -144,11 +146,19 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property>
</bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
18 years, 5 months
- 1
- 0
JBossWS SVN: r3406 - trunk/build/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 07:50:59 -0400 (Sun, 03 Jun 2007)
New Revision: 3406
Modified:
trunk/build/hudson/hudson-home/config.xml
Log:
Fix typo
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:45:47 UTC (rev 3405)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:50:59 UTC (rev 3406)
@@ -128,11 +128,11 @@
A collection of jobs that cover the JBossWS release matrix.
<p/>
<table border=1>
-<tr align=center><th> </th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th></tr> <th colspan=3>Integration Tests</th></tr>
-<tr align=center><th> </th> <th> </th> <th>Native</th><th>SunRI</th><th>XFire</th> </tr><th>Native</th><th>SunRI</th><th>XFire</th></tr>
-<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
+<tr align=center><th>Target Container</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Integration Tests</th></tr>
+<tr align=center><th> </th> <th> </th> <th>Native</th><th>SunRI</th><th>XFire</th> <th>Native</th><th>SunRI</th><th>XFire</th></tr>
+<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
</table>
]]>
</description>
18 years, 5 months
- 1
- 0
JBossWS SVN: r3405 - in trunk/integration: jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 07:45:47 -0400 (Sun, 03 Jun 2007)
New Revision: 3405
Added:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
Removed:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
Log:
Provide defaults for jboss42 MetaData Adapters
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -46,23 +46,23 @@
// logging support
private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class);
- private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3;
- private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21;
- private WebMetaDataAdapter webMetaDataAdapter;
+ private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3 = new ApplicationMetaDataAdapterEJB3();
+ private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21 = new ApplicationMetaDataAdapterEJB21();
+ private WebMetaDataAdapter webMetaDataAdapter = new WebMetaDataAdapter();
- public void setApplicationMetaDataAdapterEJB21(AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21)
+ public void setApplicationMetaDataAdapterEJB21(AbstractApplicationMetaDataAdapter adapter)
{
- this.applicationMetaDataAdapterEJB21 = applicationMetaDataAdapterEJB21;
+ this.applicationMetaDataAdapterEJB21 = adapter;
}
- public void setApplicationMetaDataAdapterEJB3(ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3)
+ public void setApplicationMetaDataAdapterEJB3(ApplicationMetaDataAdapterEJB3 adapter)
{
- this.applicationMetaDataAdapterEJB3 = applicationMetaDataAdapterEJB3;
+ this.applicationMetaDataAdapterEJB3 = adapter;
}
- public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter)
+ public void setWebMetaDataAdapter(WebMetaDataAdapter adapter)
{
- this.webMetaDataAdapter = webMetaDataAdapter;
+ this.webMetaDataAdapter = adapter;
}
public UnifiedDeploymentInfo buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -40,11 +40,11 @@
*/
public class UnifiedDeploymentInfoDeployer extends AbstractDeployer
{
- private DeploymentInfoAdapter deploymentInfoAdapter;
+ private DeploymentInfoAdapter deploymentInfoAdapter = new DeploymentInfoAdapter();
- public void setDeploymentInfoAdapter(DeploymentInfoAdapter deploymentInfoAdapter)
+ public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter)
{
- this.deploymentInfoAdapter = deploymentInfoAdapter;
+ this.deploymentInfoAdapter = adapter;
}
@Override
Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java (from rev 3399, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java)
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -0,0 +1,166 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss50;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EjbPortComponentMetaData;
+import org.jboss.metadata.MessageDrivenMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
+import org.jboss.metadata.ApplicationMetaData.Webservices;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class ApplicationMetaDataAdapterEJB21
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB21.class);
+
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ {
+ ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
+ dep.getContext().addAttachment(ApplicationMetaData.class, appMetaData);
+
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(umd, appMetaData);
+ buildWebservicesMetaData(umd, appMetaData);
+ umd.setSecurityDomain(appMetaData.getSecurityDomain());
+
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
+ return umd;
+ }
+
+ private void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd)
+ {
+ Webservices webservices = apmd.getWebservices();
+ if (webservices != null)
+ {
+ String contextRoot = webservices.getContextRoot();
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
+
+ List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
+ if (wsDescriptions.size() > 1)
+ log.warn("Multiple <webservice-description> elements not supported");
+
+ if (wsDescriptions.size() > 0)
+ {
+ WebserviceDescription wsd = wsDescriptions.get(0);
+ umd.setConfigName(wsd.getConfigName());
+ umd.setConfigFile(wsd.getConfigFile());
+ }
+
+ umd.setWebServiceContextRoot(contextRoot);
+ }
+ }
+
+ private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ String wsdlPublishLocation = null;
+ for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
+ {
+ if (wsd.getDescriptionName().equals(name))
+ {
+ wsdlPublishLocation = wsd.getWsdlPublishLocation();
+ }
+ }
+ return wsdlPublishLocation;
+ }
+ };
+ }
+
+ private void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData)
+ {
+ List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ Iterator it = appMetaData.getEnterpriseBeans();
+ while (it.hasNext())
+ {
+ BeanMetaData bmd = (BeanMetaData)it.next();
+ buildUnifiedBeanMetaData(beans, bmd);
+ }
+ umd.setEnterpriseBeans(beans);
+ }
+
+ private UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd)
+ {
+ UnifiedBeanMetaData ubmd = null;
+ if (bmd instanceof SessionMetaData)
+ {
+ ubmd = new UnifiedSessionMetaData();
+ }
+ else if (bmd instanceof MessageDrivenMetaData)
+ {
+ ubmd = new UnifiedMessageDrivenMetaData();
+ ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(bmd.getEjbName());
+ ubmd.setEjbClass(bmd.getEjbClass());
+ ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
+ ubmd.setHome(bmd.getHome());
+ ubmd.setLocalHome(bmd.getLocalHome());
+ ubmd.setJndiName(bmd.getJndiName());
+ ubmd.setLocalJndiName(bmd.getLocalJndiName());
+
+ EjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ if (pcmd != null)
+ {
+ UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData();
+ upcmd.setPortComponentName(pcmd.getPortComponentName());
+ upcmd.setPortComponentURI(pcmd.getPortComponentURI());
+ upcmd.setAuthMethod(pcmd.getAuthMethod());
+ upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
+ ubmd.setPortComponent(upcmd);
+ }
+
+ beans.add(ubmd);
+ }
+ return ubmd;
+ }
+}
Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java (from rev 3399, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java)
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss50;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.SessionContainer;
+import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.ejb3.metamodel.Ejb3PortComponent;
+import org.jboss.ejb3.metamodel.EjbJarDD;
+import org.jboss.ejb3.metamodel.EnterpriseBean;
+import org.jboss.ejb3.metamodel.WebserviceDescription;
+import org.jboss.ejb3.metamodel.Webservices;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Apr-2007
+ */
+public class ApplicationMetaDataAdapterEJB3
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class);
+
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ {
+ Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
+ dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment);
+
+ EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class);
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(umd, ejb3Deployment);
+ buildWebservicesMetaData(umd, jarDD);
+
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
+ return umd;
+ }
+
+ private void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD)
+ {
+ // nothing to do
+ if (jarDD == null)
+ return;
+
+ Webservices webservices = jarDD.getWebservices();
+ if (webservices != null)
+ {
+ String contextRoot = webservices.getContextRoot();
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
+
+ List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
+ if (wsDescriptions.size() > 1)
+ log.warn("Multiple <webservice-description> elements not supported");
+
+ if (wsDescriptions.size() > 0)
+ {
+ WebserviceDescription wsd = wsDescriptions.get(0);
+ umd.setConfigName(wsd.getConfigName());
+ umd.setConfigFile(wsd.getConfigFile());
+
+ // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1
+ // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress
+ if (contextRoot == null)
+ contextRoot = "/" + wsd.getDescriptionName();
+ }
+
+ umd.setWebServiceContextRoot(contextRoot);
+ }
+ }
+
+ private void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment)
+ {
+ List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>();
+ Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
+ while (it.hasNext())
+ {
+ EJBContainer container = (EJBContainer)it.next();
+ UnifiedBeanMetaData ubmd = null;
+ if (container instanceof SessionContainer)
+ {
+ ubmd = new UnifiedSessionMetaData();
+ }
+ else if (container instanceof MessagingContainer)
+ {
+ ubmd = new UnifiedMessageDrivenMetaData();
+ log.warn("No implemented: initialize MDB destination");
+ //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(container.getEjbName());
+ ubmd.setEjbClass(container.getBeanClassName());
+
+ EnterpriseBean bean = container.getXml();
+ Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null);
+ if (pcMetaData != null)
+ {
+ UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
+ ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName());
+ ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI());
+ ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod());
+ ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee());
+ ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess());
+
+ ubmd.setPortComponent(ejbPortComp);
+ }
+
+ ubmdList.add(ubmd);
+ }
+ }
+ umd.setEnterpriseBeans(ubmdList);
+ }
+
+ private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ String wsdlPublishLocation = null;
+ for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
+ {
+ if (wsd.getDescriptionName().equals(name))
+ {
+ wsdlPublishLocation = wsd.getWsdlPublishLocation();
+ }
+ }
+ return wsdlPublishLocation;
+ }
+ };
+ }
+}
Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptor.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -1,166 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.metadata.EjbPortComponentMetaData;
-import org.jboss.metadata.MessageDrivenMetaData;
-import org.jboss.metadata.SessionMetaData;
-import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
-import org.jboss.metadata.ApplicationMetaData.Webservices;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class ApplicationMetaDataAdaptor
-{
- // logging support
- private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class);
-
- public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
- {
- ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
- dep.getContext().addAttachment(ApplicationMetaData.class, appMetaData);
-
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, appMetaData);
- buildWebservicesMetaData(umd, appMetaData);
- umd.setSecurityDomain(appMetaData.getSecurityDomain());
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
- }
-
- private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd)
- {
- Webservices webservices = apmd.getWebservices();
- if (webservices != null)
- {
- String contextRoot = webservices.getContextRoot();
- umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
-
- List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
- if (wsDescriptions.size() > 1)
- log.warn("Multiple <webservice-description> elements not supported");
-
- if (wsDescriptions.size() > 0)
- {
- WebserviceDescription wsd = wsDescriptions.get(0);
- umd.setConfigName(wsd.getConfigName());
- umd.setConfigFile(wsd.getConfigFile());
- }
-
- umd.setWebServiceContextRoot(contextRoot);
- }
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- String wsdlPublishLocation = null;
- for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
- {
- if (wsd.getDescriptionName().equals(name))
- {
- wsdlPublishLocation = wsd.getWsdlPublishLocation();
- }
- }
- return wsdlPublishLocation;
- }
- };
- }
-
- private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData)
- {
- List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
- Iterator it = appMetaData.getEnterpriseBeans();
- while (it.hasNext())
- {
- BeanMetaData bmd = (BeanMetaData)it.next();
- buildUnifiedBeanMetaData(beans, bmd);
- }
- umd.setEnterpriseBeans(beans);
- }
-
- private static UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd)
- {
- UnifiedBeanMetaData ubmd = null;
- if (bmd instanceof SessionMetaData)
- {
- ubmd = new UnifiedSessionMetaData();
- }
- else if (bmd instanceof MessageDrivenMetaData)
- {
- ubmd = new UnifiedMessageDrivenMetaData();
- ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(bmd.getEjbName());
- ubmd.setEjbClass(bmd.getEjbClass());
- ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
- ubmd.setHome(bmd.getHome());
- ubmd.setLocalHome(bmd.getLocalHome());
- ubmd.setJndiName(bmd.getJndiName());
- ubmd.setLocalJndiName(bmd.getLocalJndiName());
-
- EjbPortComponentMetaData pcmd = bmd.getPortComponent();
- if (pcmd != null)
- {
- UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData();
- upcmd.setPortComponentName(pcmd.getPortComponentName());
- upcmd.setPortComponentURI(pcmd.getPortComponentURI());
- upcmd.setAuthMethod(pcmd.getAuthMethod());
- upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
- upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
- ubmd.setPortComponent(upcmd);
- }
-
- beans.add(ubmd);
- }
- return ubmd;
- }
-}
Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -1,170 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.ejb3.metamodel.Ejb3PortComponent;
-import org.jboss.ejb3.metamodel.EjbJarDD;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
-import org.jboss.ejb3.metamodel.WebserviceDescription;
-import org.jboss.ejb3.metamodel.Webservices;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Apr-2007
- */
-public class ApplicationMetaDataAdaptorEJB3
-{
- // logging support
- private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class);
-
- public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
- {
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment);
-
- EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class);
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, ejb3Deployment);
- buildWebservicesMetaData(umd, jarDD);
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
- }
-
- private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD)
- {
- // nothing to do
- if (jarDD == null)
- return;
-
- Webservices webservices = jarDD.getWebservices();
- if (webservices != null)
- {
- String contextRoot = webservices.getContextRoot();
- umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
-
- List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
- if (wsDescriptions.size() > 1)
- log.warn("Multiple <webservice-description> elements not supported");
-
- if (wsDescriptions.size() > 0)
- {
- WebserviceDescription wsd = wsDescriptions.get(0);
- umd.setConfigName(wsd.getConfigName());
- umd.setConfigFile(wsd.getConfigFile());
-
- // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1
- // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress
- if (contextRoot == null)
- contextRoot = "/" + wsd.getDescriptionName();
- }
-
- umd.setWebServiceContextRoot(contextRoot);
- }
- }
-
- private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment)
- {
- List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>();
- Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
- while (it.hasNext())
- {
- EJBContainer container = (EJBContainer)it.next();
- UnifiedBeanMetaData ubmd = null;
- if (container instanceof SessionContainer)
- {
- ubmd = new UnifiedSessionMetaData();
- }
- else if (container instanceof MessagingContainer)
- {
- ubmd = new UnifiedMessageDrivenMetaData();
- log.warn("No implemented: initialize MDB destination");
- //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(container.getEjbName());
- ubmd.setEjbClass(container.getBeanClassName());
-
- EnterpriseBean bean = container.getXml();
- Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null);
- if (pcMetaData != null)
- {
- UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
- ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName());
- ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI());
- ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod());
- ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee());
- ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess());
-
- ubmd.setPortComponent(ejbPortComp);
- }
-
- ubmdList.add(ubmd);
- }
- }
- umd.setEnterpriseBeans(ubmdList);
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- String wsdlPublishLocation = null;
- for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
- {
- if (wsd.getDescriptionName().equals(name))
- {
- wsdlPublishLocation = wsd.getWsdlPublishLocation();
- }
- }
- return wsdlPublishLocation;
- }
- };
- }
-}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -45,8 +45,27 @@
// logging support
private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class);
- public static void buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3 = new ApplicationMetaDataAdapterEJB3();
+ private ApplicationMetaDataAdapterEJB21 applicationMetaDataAdapterEJB21 = new ApplicationMetaDataAdapterEJB21();
+ private WebMetaDataAdapter webMetaDataAdapter = new WebMetaDataAdapter();
+
+ public void setApplicationMetaDataAdapterEJB21(ApplicationMetaDataAdapterEJB21 adapter)
{
+ this.applicationMetaDataAdapterEJB21 = adapter;
+ }
+
+ public void setApplicationMetaDataAdapterEJB3(ApplicationMetaDataAdapterEJB3 adapter)
+ {
+ this.applicationMetaDataAdapterEJB3 = adapter;
+ }
+
+ public void setWebMetaDataAdapter(WebMetaDataAdapter adapter)
+ {
+ this.webMetaDataAdapter = adapter;
+ }
+
+ public void buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ {
dep.getContext().addAttachment(DeploymentUnit.class, unit);
try
@@ -82,19 +101,19 @@
}
}
- private static void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception
+ private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception
{
if (unit.getAttachment(Ejb3Deployment.class) != null)
{
- udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
+ udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
}
else if (unit.getAttachment(ApplicationMetaData.class) != null)
{
- udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(dep, udi, unit);
+ udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit);
}
else if (unit.getAttachment(WebMetaData.class) != null)
{
- udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(dep, udi, unit);
+ udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
udi.webappURL = udi.vfRoot.toURL();
}
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -40,6 +40,13 @@
*/
public class UnifiedDeploymentInfoDeployer extends AbstractDeployer
{
+ private DeploymentInfoAdapter deploymentInfoAdapter = new DeploymentInfoAdapter();
+
+ public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter)
+ {
+ this.deploymentInfoAdapter = adapter;
+ }
+
@Override
public void create(Deployment dep)
{
@@ -54,13 +61,13 @@
if (type.toString().startsWith("JAXWS"))
{
udi = new JAXWSDeployment(type);
- DeploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
+ deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
}
else
{
WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class);
udi = new JAXRPCDeployment(type, wsMetaData);
- DeploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
+ deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
}
dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi);
Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java (from rev 3399, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java)
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss50;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.WebSecurityMetaData;
+import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
+import org.jboss.metadata.web.Servlet;
+import org.jboss.metadata.web.ServletMapping;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
+
+/**
+ * Build container independent web meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class WebMetaDataAdapter
+{
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ {
+ WebMetaData wmd = unit.getAttachment(WebMetaData.class);
+ dep.getContext().addAttachment(WebMetaData.class, wmd);
+
+ UnifiedWebMetaData umd = new UnifiedWebMetaData();
+ umd.setContextRoot(wmd.getContextRoot());
+ umd.setServletMappings(getServletMappings(wmd));
+ umd.setServletClassNames(getServletClassMap(wmd));
+ umd.setConfigName(wmd.getConfigName());
+ umd.setConfigFile(wmd.getConfigFile());
+ umd.setSecurityDomain(wmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+ umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
+
+ dep.getContext().addAttachment(UnifiedWebMetaData.class, umd);
+ return umd;
+ }
+
+ private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return wmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ protected List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
+ {
+ ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
+
+ while (securityConstraints.hasNext())
+ {
+ WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next();
+
+ UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData();
+ unifiedsecurityMetaData.add(current);
+
+ current.setTransportGuarantee(securityMetaData.getTransportGuarantee());
+
+ Map<String, WebResourceCollection> resources = securityMetaData.getWebResources();
+ for (WebResourceCollection webResource : resources.values())
+ {
+ UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName());
+ for (String currentPattern : webResource.getUrlPatterns())
+ {
+ currentResource.addPattern(currentPattern);
+ }
+ }
+ }
+
+ return unifiedsecurityMetaData;
+ }
+
+ private Map<String, String> getServletMappings(WebMetaData wmd)
+ {
+ Map<String, String> mappings = new HashMap<String, String>();
+ Iterator it = wmd.getServletMappings().iterator();
+ while (it.hasNext())
+ {
+ ServletMapping sm = (ServletMapping)it.next();
+ // FIXME - Add support for multiple mappings
+ mappings.put(sm.getName(), sm.getUrlPatterns().get(0));
+ }
+ return mappings;
+ }
+
+ private Map<String, String> getServletClassMap(WebMetaData wmd)
+ {
+ Map<String, String> mappings = new HashMap<String, String>();
+ Iterator it = wmd.getServlets().iterator();
+ while (it.hasNext())
+ {
+ Servlet servlet = (Servlet)it.next();
+ // Skip JSPs
+ if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0)
+ continue;
+
+ mappings.put(servlet.getName(), servlet.getServletClass());
+ }
+ return mappings;
+ }
+}
Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdaptor.java 2007-06-03 11:45:47 UTC (rev 3405)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.WebSecurityMetaData;
-import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
-import org.jboss.metadata.web.Servlet;
-import org.jboss.metadata.web.ServletMapping;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
-
-/**
- * Build container independent web meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class WebMetaDataAdaptor
-{
- public static UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
- {
- WebMetaData wmd = unit.getAttachment(WebMetaData.class);
- dep.getContext().addAttachment(WebMetaData.class, wmd);
-
- UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(wmd.getContextRoot());
- umd.setServletMappings(getServletMappings(wmd));
- umd.setServletClassNames(getServletClassMap(wmd));
- umd.setConfigName(wmd.getConfigName());
- umd.setConfigFile(wmd.getConfigFile());
- umd.setSecurityDomain(wmd.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
- umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
-
- dep.getContext().addAttachment(UnifiedWebMetaData.class, umd);
- return umd;
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- return wmd.getWsdlPublishLocationByName(name);
- }
- };
- }
-
- protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
- {
- ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
-
- while (securityConstraints.hasNext())
- {
- WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next();
-
- UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData();
- unifiedsecurityMetaData.add(current);
-
- current.setTransportGuarantee(securityMetaData.getTransportGuarantee());
-
- Map<String, WebResourceCollection> resources = securityMetaData.getWebResources();
- for (WebResourceCollection webResource : resources.values())
- {
- UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName());
- for (String currentPattern : webResource.getUrlPatterns())
- {
- currentResource.addPattern(currentPattern);
- }
- }
- }
-
- return unifiedsecurityMetaData;
- }
-
- private static Map<String, String> getServletMappings(WebMetaData wmd)
- {
- Map<String, String> mappings = new HashMap<String, String>();
- Iterator it = wmd.getServletMappings().iterator();
- while (it.hasNext())
- {
- ServletMapping sm = (ServletMapping)it.next();
- // FIXME - Add support for multiple mappings
- mappings.put(sm.getName(), sm.getUrlPatterns().get(0));
- }
- return mappings;
- }
-
- private static Map<String, String> getServletClassMap(WebMetaData wmd)
- {
- Map<String, String> mappings = new HashMap<String, String>();
- Iterator it = wmd.getServlets().iterator();
- while (it.hasNext())
- {
- Servlet servlet = (Servlet)it.next();
- // Skip JSPs
- if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0)
- continue;
-
- mappings.put(servlet.getName(), servlet.getServletClass());
- }
- return mappings;
- }
-}
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:45:47 UTC (rev 3405)
@@ -163,11 +163,8 @@
<!-- Deployer helper beans -->
<bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.ApplicationMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
<bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
<property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
@@ -175,7 +172,6 @@
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
</bean>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:45:47 UTC (rev 3405)
@@ -147,9 +147,7 @@
</bean>
<bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/>
<bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
- <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
- </bean>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
@@ -162,19 +160,11 @@
</bean>
<!-- Deployer helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
- <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
- <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
</bean>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:45:47 UTC (rev 3405)
@@ -130,9 +130,7 @@
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
</bean>
<bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
- <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
- </bean>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -142,20 +140,12 @@
</bean>
<!-- Deployer helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
- <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
- <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.sunri.WebAppDesciptorModifierImpl">
<property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property>
<property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property>
</bean>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:25:38 UTC (rev 3404)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:45:47 UTC (rev 3405)
@@ -129,9 +129,7 @@
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
</bean>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
- <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
- </bean>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -146,19 +144,11 @@
</bean>
<!-- Deployer helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
- <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
- <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property>
</bean>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
18 years, 5 months
- 1
- 0
JBossWS SVN: r3404 - trunk/build/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 07:25:38 -0400 (Sun, 03 Jun 2007)
New Revision: 3404
Modified:
trunk/build/hudson/hudson-home/config.xml
Log:
Include Distribution Tests in QA matrix table
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:15:43 UTC (rev 3403)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:25:38 UTC (rev 3404)
@@ -128,11 +128,11 @@
A collection of jobs that cover the JBossWS release matrix.
<p/>
<table border=1>
-<tr align=center><th> </th> <th>Core-Tests</th> <th colspan=3>Integration Tests</th></tr>
-<tr align=center><th> </th> <th> </th> <th>Native</th> <th>SunRI</th> <th>XFire</th></tr>
-<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
+<tr align=center><th> </th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th></tr> <th colspan=3>Integration Tests</th></tr>
+<tr align=center><th> </th> <th> </th> <th>Native</th><th>SunRI</th><th>XFire</th> </tr><th>Native</th><th>SunRI</th><th>XFire</th></tr>
+<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
</table>
]]>
</description>
18 years, 5 months
- 1
- 0
JBossWS SVN: r3403 - in trunk: build/hudson/hudson-home/jobs and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 07:15:43 -0400 (Sun, 03 Jun 2007)
New Revision: 3403
Added:
trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/
trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL/
trunk/build/hudson/hudson-home/jobs/Distro-ALL/
trunk/build/hudson/hudson-home/jobs/Integration-ALL/
Removed:
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/
trunk/build/hudson/hudson-home/jobs/Distro-All/
trunk/build/hudson/hudson-home/jobs/Integration-All/
Modified:
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
Log:
Fix jboss42 sunri,xfire
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:15:43 UTC (rev 3403)
@@ -31,7 +31,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>AS-Tests-All</string>
+ <string>AS-Tests-ALL</string>
<string>AS-Tests-AS-5.0</string>
<string>AS-Tests-AS-4.2</string>
<string>AS-Tests-AS-4.0</string>
@@ -51,7 +51,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>Core-Tests-All</string>
+ <string>Core-Tests-ALL</string>
<string>Core-Tests-AS-5.0</string>
<string>Core-Tests-AS-4.2</string>
<string>Core-Tests-AS-4.0</string>
@@ -71,7 +71,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>Distro-All</string>
+ <string>Distro-ALL</string>
<string>Distro-Native-AS-5.0</string>
<string>Distro-Native-AS-4.2</string>
<string>Distro-Native-AS-4.0</string>
@@ -95,7 +95,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>Integration-All</string>
+ <string>Integration-ALL</string>
<string>Integration-Native-AS-5.0</string>
<string>Integration-Native-AS-4.2</string>
<string>Integration-Native-AS-4.0</string>
Copied: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/AS-Tests-All)
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/Core-Tests-All)
Copied: trunk/build/hudson/hudson-home/jobs/Distro-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/Distro-All)
Copied: trunk/build/hudson/hudson-home/jobs/Integration-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/Integration-All)
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-03 11:15:43 UTC (rev 3403)
@@ -27,7 +27,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# Build sunri-jboss50
+# Build sunri
#
cd $JBWSDIR/integration/sunri
ant $ENVIRONMENT deploy-jboss42
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-03 11:15:43 UTC (rev 3403)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-All, Core-Tests-All, Integration-All, Distro-All</childProjects>
+ <childProjects>AS-Tests-ALL, Core-Tests-ALL, Integration-ALL, Distro-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:01:36 UTC (rev 3402)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:15:43 UTC (rev 3403)
@@ -130,7 +130,9 @@
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
</bean>
<bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
+ <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
+ </bean>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -140,12 +142,20 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.sunri.WebAppDesciptorModifierImpl">
<property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property>
<property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property>
</bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:01:36 UTC (rev 3402)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:15:43 UTC (rev 3403)
@@ -129,7 +129,9 @@
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
</bean>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
+ <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
+ </bean>
<bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -144,11 +146,19 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property>
</bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
</bean>
18 years, 5 months
- 1
- 0
JBossWS SVN: r3402 - in trunk: build/hudson/hudson-home and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 07:01:36 -0400 (Sun, 03 Jun 2007)
New Revision: 3402
Added:
trunk/integration/native/src/main/etc/bin-dist-build.xml
trunk/integration/native/src/test/resources/test-excludes-jboss40.txt
trunk/integration/native/src/test/resources/test-excludes.txt
trunk/integration/sunri/src/main/etc/bin-dist-build.xml
trunk/integration/sunri/src/test/resources/test-excludes.txt
trunk/integration/xfire/src/main/etc/bin-dist-build.xml
trunk/integration/xfire/src/test/resources/test-excludes.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
Removed:
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/native/src/test/resources/excludes-jboss40.txt
trunk/integration/native/src/test/resources/excludes-none.txt
trunk/integration/sunri/src/main/etc/bindist-build.xml
trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/xfire/src/main/etc/bindist-build.xml
trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt
Modified:
trunk/build/dist/ant.properties.example
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
Log:
Fix jboss40 distro
Modified: trunk/build/dist/ant.properties.example
===================================================================
--- trunk/build/dist/ant.properties.example 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/build/dist/ant.properties.example 2007-06-03 11:01:36 UTC (rev 3402)
@@ -21,6 +21,6 @@
# Java Compiler options
javac.debug=yes
-javac.deprecation=yes
+javac.deprecation=no
javac.fail.onerror=yes
javac.verbose=no
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -31,6 +31,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>AS-Tests-All</string>
<string>AS-Tests-AS-5.0</string>
<string>AS-Tests-AS-4.2</string>
<string>AS-Tests-AS-4.0</string>
@@ -50,6 +51,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Core-Tests-All</string>
<string>Core-Tests-AS-5.0</string>
<string>Core-Tests-AS-4.2</string>
<string>Core-Tests-AS-4.0</string>
@@ -69,6 +71,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Distro-All</string>
<string>Distro-Native-AS-5.0</string>
<string>Distro-Native-AS-4.2</string>
<string>Distro-Native-AS-4.0</string>
@@ -92,6 +95,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Integration-All</string>
<string>Integration-Native-AS-5.0</string>
<string>Integration-Native-AS-4.2</string>
<string>Integration-Native-AS-4.0</string>
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -91,8 +91,8 @@
</hudson.triggers.SCMTrigger>
</triggers>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
+ <daysToKeep>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -38,7 +38,7 @@
<filtersfile file="${build.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/>
<copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
<!-- build -->
@@ -120,6 +120,7 @@
<include name="jaxws-rt.jar"/>
<include name="juddi-service.sar"/>
<include name="policy.jar"/>
+ <include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
</copy>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,10 +18,10 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss40.txt">
+ <condition property="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-jboss40.txt">
<equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
- <property name="excludesfile" value="${int.native.dir}/src/test/resources/excludes-none.txt"/>
+ <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Copied: trunk/integration/native/src/main/etc/bin-dist-build.xml (from rev 3399, trunk/integration/native/src/main/etc/bindist-build.xml)
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/XFire">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jboss40.lib" value="${jboss40.home}/lib"/>
+ <property name="jboss40.client" value="${jboss40.home}/client"/>
+ <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
+ <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
+ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <condition property="excludesfile" value="${tests.dir}/resources/test-excludes-jboss40.txt">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${lib.dir}/jbossws-core.jar"/>
+ <pathelement location="${lib.dir}/jbossws-client.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/native to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50">
+ <macro-undeploy-sunri50/>
+ <macro-undeploy-xfire50/>
+ <macro-deploy-native50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42">
+ <macro-undeploy-sunri42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-native42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss40 -->
+ <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40">
+ <macro-deploy-native40
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss40.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Deleted: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS/XFire">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
- <property file="${build.dir}/version.properties"/>
-
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
-
- <property name="jboss40.lib" value="${jboss40.home}/lib"/>
- <property name="jboss40.client" value="${jboss40.home}/client"/>
- <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
- <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
- <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
- <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
- <available property="jboss40.available" file="${jboss40.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-spi.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
- <pathelement location="${lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${lib.dir}/jbossws-core.jar"/>
- <pathelement location="${lib.dir}/jbossws-client.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-xfire50/>
- <macro-deploy-native50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-xfire42/>
- <macro-deploy-native42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss40 -->
- <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40">
- <macro-undeploy-sunri40/>
- <macro-undeploy-xfire40/>
- <macro-deploy-native40
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss40.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss40 -->
- <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
- <macro-undeploy-native40/>
- <macro-undeploy-spi jbosshome="${jboss40.home}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
Deleted: trunk/integration/native/src/test/resources/excludes-jboss40.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-jboss40.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/src/test/resources/excludes-jboss40.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: trunk/integration/native/src/test/resources/excludes-none.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-none.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/src/test/resources/excludes-none.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-# Nothing to exclude
Copied: trunk/integration/native/src/test/resources/test-excludes-jboss40.txt (from rev 3399, trunk/integration/native/src/test/resources/excludes-jboss40.txt)
===================================================================
--- trunk/integration/native/src/test/resources/test-excludes-jboss40.txt (rev 0)
+++ trunk/integration/native/src/test/resources/test-excludes-jboss40.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,9 @@
+#
+# $Id$
+#
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Copied: trunk/integration/native/src/test/resources/test-excludes.txt (from rev 3399, trunk/integration/native/src/test/resources/excludes-none.txt)
===================================================================
--- trunk/integration/native/src/test/resources/test-excludes.txt (rev 0)
+++ trunk/integration/native/src/test/resources/test-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+# Nothing to exclude
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -41,7 +41,7 @@
<filtersfile file="${build.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bin-dist-build.xml"/>
<copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,12 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
+ <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Copied: trunk/integration/sunri/src/main/etc/bin-dist-build.xml (from rev 3399, trunk/integration/sunri/src/main/etc/bindist-build.xml)
===================================================================
--- trunk/integration/sunri/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/SunRI">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/http.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-xfire50/>
+ <macro-deploy-sunri50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${build.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/sunri to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-sunri42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${build.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Deleted: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS/SunRI">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
- <property file="${build.dir}/version.properties"/>
-
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-spi.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/http.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/resolver.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-xfire50/>
- <macro-deploy-sunri50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/sunri to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-xfire42/>
- <macro-deploy-sunri42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
Deleted: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,22 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1669] Fix WebServiceContext.getMessageContext()
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-
-# [JBWS-1673] Fix JAXR samples for SunRI
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1674] Fix @WebServiceRef with SunRI
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,22 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1669] Fix WebServiceContext.getMessageContext()
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-
-# [JBWS-1673] Fix JAXR samples for SunRI
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1674] Fix @WebServiceRef with SunRI
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Copied: trunk/integration/sunri/src/test/resources/test-excludes.txt (from rev 3399, trunk/integration/sunri/src/test/resources/excludes-jboss50.txt)
===================================================================
--- trunk/integration/sunri/src/test/resources/test-excludes.txt (rev 0)
+++ trunk/integration/sunri/src/test/resources/test-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,22 @@
+#
+# $Id$
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1669] Fix WebServiceContext.getMessageContext()
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
+
+# [JBWS-1673] Fix JAXR samples for SunRI
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1674] Fix @WebServiceRef with SunRI
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -43,7 +43,7 @@
<filtersfile file="${build.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bin-dist-build.xml"/>
<copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,12 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
+ <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Copied: trunk/integration/xfire/src/main/etc/bin-dist-build.xml (from rev 3399, trunk/integration/xfire/src/main/etc/bindist-build.xml)
===================================================================
--- trunk/integration/xfire/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/XFire">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <!--
+ Cannot use XFire client
+ [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
+ -->
+ <path id="sunri.classpath">
+ <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/client/http.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/client/wstx.jar"/>
+ </path>
+
+ <path id="xfire.classpath">
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jdom.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/xfire-all.jar"/>
+ <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
+ </path>
+
+ <path id="ws.stack.classpath">
+ <path refid="sunri.classpath"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/xfire to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-sunri50/>
+ <macro-deploy-xfire50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/xfire to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-sunri42/>
+ <macro-deploy-xfire42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Deleted: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS/XFire">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
- <property file="${build.dir}/version.properties"/>
-
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-spi.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <!--
- Cannot use XFire client
- [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
- -->
- <path id="sunri.classpath">
- <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/client/http.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/resolver.jar"/>
- <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/client/wstx.jar"/>
- </path>
-
- <path id="xfire.classpath">
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jdom.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/xfire-all.jar"/>
- <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
- </path>
-
- <path id="ws.stack.classpath">
- <path refid="sunri.classpath"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/xfire to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-sunri50/>
- <macro-deploy-xfire50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
- <macro-undeploy-xfire50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/xfire to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-sunri42/>
- <macro-deploy-xfire42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
- <macro-undeploy-xfire42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
Deleted: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1682] XFire does not generate proper service name
-org/jboss/test/ws/jaxws/samples/asynchronous/**
-org/jboss/test/ws/jaxws/samples/exception/**
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-org/jboss/test/ws/jaxws/samples/oneway/**
-org/jboss/test/ws/jaxws/samples/soapbinding/**
-org/jboss/test/ws/jaxws/samples/webmethod/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-1685] Add support for WebServiceContext propagation
-org/jboss/test/ws/jaxws/samples/context/**
-
-# [JBWS-1686] Add support for @Provider
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1687] Add support for @HandlerChain
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-
-# [JBWS-1684] Fix @WebServiceRef with XFire
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# [JBWS-1689] Add support for SwaRef
-org/jboss/test/ws/jaxws/samples/swaref/**
-
-# [JBWS-1688] Fix @WebParam, @WebResult handling
-org/jboss/test/ws/jaxws/samples/webparam/**
-org/jboss/test/ws/jaxws/samples/webresult/**
Deleted: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1682] XFire does not generate proper service name
-org/jboss/test/ws/jaxws/samples/asynchronous/**
-org/jboss/test/ws/jaxws/samples/exception/**
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-org/jboss/test/ws/jaxws/samples/oneway/**
-org/jboss/test/ws/jaxws/samples/soapbinding/**
-org/jboss/test/ws/jaxws/samples/webmethod/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-1685] Add support for WebServiceContext propagation
-org/jboss/test/ws/jaxws/samples/context/**
-
-# [JBWS-1686] Add support for @Provider
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1687] Add support for @HandlerChain
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-
-# [JBWS-1684] Fix @WebServiceRef with XFire
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# [JBWS-1689] Add support for SwaRef
-org/jboss/test/ws/jaxws/samples/swaref/**
-
-# [JBWS-1688] Fix @WebParam, @WebResult handling
-org/jboss/test/ws/jaxws/samples/webparam/**
-org/jboss/test/ws/jaxws/samples/webresult/**
Copied: trunk/integration/xfire/src/test/resources/test-excludes.txt (from rev 3399, trunk/integration/xfire/src/test/resources/excludes-jboss42.txt)
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes.txt (rev 0)
+++ trunk/integration/xfire/src/test/resources/test-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,46 @@
+#
+# $Id$
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1682] XFire does not generate proper service name
+org/jboss/test/ws/jaxws/samples/asynchronous/**
+org/jboss/test/ws/jaxws/samples/exception/**
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+org/jboss/test/ws/jaxws/samples/oneway/**
+org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/webmethod/**
+org/jboss/test/ws/jaxws/samples/webservice/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-1685] Add support for WebServiceContext propagation
+org/jboss/test/ws/jaxws/samples/context/**
+
+# [JBWS-1686] Add support for @Provider
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/provider/**
+
+# [JBWS-1683] Fix JAXR samples for XFire
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1687] Add support for @HandlerChain
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+
+# [JBWS-1684] Fix @WebServiceRef with XFire
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [JBWS-1689] Add support for SwaRef
+org/jboss/test/ws/jaxws/samples/swaref/**
+
+# [JBWS-1688] Fix @WebParam, @WebResult handling
+org/jboss/test/ws/jaxws/samples/webparam/**
+org/jboss/test/ws/jaxws/samples/webresult/**
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,7 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excluded tests -->
- <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/>
+ <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
<property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
<!--
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,18 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# JBossAS-4.0 excludes
+org/jboss/test/ws/jaxrpc/jbws723/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/serviceref/**
+
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,15 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/serviceref/**
+
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,20 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# Fix before JBoss50 goes final
+org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
+org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
+org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
+org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
+org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.*
+org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
+org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
+org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
+org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
+
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,18 +0,0 @@
-# Always exclude
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# JBossAS-4.0 excludes
-org/jboss/test/ws/jaxrpc/jbws723/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/serviceref/**
-
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Deleted: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,15 +0,0 @@
-# Always exclude
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/serviceref/**
-
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Deleted: trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,20 +0,0 @@
-# Always exclude
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# Fix before JBoss50 goes final
-org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
-org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
-org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
-org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
-org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.*
-org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
-org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
-org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
-org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-org/jboss/test/ws/jaxrpc/wsdlpublish/**
-
18 years, 5 months
- 1
- 0
JBossWS SVN: r3401 - trunk/integration/native/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 06:28:30 -0400 (Sun, 03 Jun 2007)
New Revision: 3401
Modified:
trunk/integration/native/ant-import/macros-deploy-native.xml
Log:
Deploy stax-api.jar to jboss40 client
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 10:11:51 UTC (rev 3400)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 10:28:30 UTC (rev 3401)
@@ -232,10 +232,11 @@
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
<include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
@@ -277,6 +278,7 @@
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss40.jar"/>
<include name="policy.jar"/>
+ <include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
<!-- remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
18 years, 5 months
- 1
- 0
JBossWS SVN: r3400 - in trunk: build/hudson/hudson-home/jobs and 31 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-03 06:11:51 -0400 (Sun, 03 Jun 2007)
New Revision: 3400
Added:
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-All/
trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-All/
trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java
trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder
Removed:
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java
Modified:
trunk/build/ant.properties.example
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java
trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java
trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java
Log:
[JBWS-1647] Text Node Preservation For Messages Sent Across The Wire
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/build/ant.properties.example 2007-06-03 10:11:51 UTC (rev 3400)
@@ -52,7 +52,7 @@
# Java Compiler options
javac.debug=yes
-javac.deprecation=yes
+javac.deprecation=no
javac.fail.onerror=yes
javac.verbose=no
Copied: trunk/build/hudson/hudson-home/jobs/AS-Tests-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>AS-Tests-5.0, AS-Tests-4.2, AS-Tests-4.0</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all AS webservice testsuites agains jbossws-(a)version.id@</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all JBossWS core tests</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Distro-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all distribution tests</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all integration tests</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, AS-Tests-AS-4.0, Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0, Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2, Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
+ <childProjects>AS-Tests-All, Core-Tests-All, Integration-All, Distro-All</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/.classpath 2007-06-03 10:11:51 UTC (rev 3400)
@@ -36,5 +36,6 @@
<classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
+ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/build.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -150,7 +150,7 @@
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
- <metainf dir="${core.resources.dir}/jbossws-core.jar"/>
+ <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
</jar>
<!-- Build jbossws-client.jar -->
@@ -166,6 +166,7 @@
<fileset dir="${core.etc.dir}">
<include name="log4j.properties"/>
</fileset>
+ <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
<metainf dir="${core.resources.dir}/standard-config">
<include name="standard-jaxrpc-client-config.xml"/>
<include name="standard-jaxws-client-config.xml"/>
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -83,7 +83,7 @@
if (factory == null)
{
SAAJMetaFactory saajFactory = SAAJMetaFactory.getInstance();
- factory = saajFactory.newMessageFactory(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
+ factory = saajFactory.newMessageFactory(SOAPConstants.DEFAULT_SOAP_PROTOCOL);
}
if (factory == null)
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -30,16 +30,16 @@
*/
public interface SOAPConstants
{
+ /** Used to create MessageFactory instances that create SOAPMessages whose behavior supports the SOAP 1.1 specification */
+ String SOAP_1_1_PROTOCOL = "SOAP 1.1 Protocol";
+ /** The media type of the Content-Type MIME header in SOAP 1.2. */
+ String SOAP_1_2_CONTENT_TYPE = "application/soap+xml";
/** The default protocol: SOAP 1.1 for backwards compatibility. */
- String DEFAULT_SOAP_PROTOCOL = "SOAP 1.1 Protocol";
+ String DEFAULT_SOAP_PROTOCOL = SOAP_1_1_PROTOCOL;
/** Used to create MessageFactory instances that create SOAPMessages whose concrete type is based on the Content-Type MIME header passed to the createMessage method. */
String DYNAMIC_SOAP_PROTOCOL = "Dynamic Protocol";
/** The media type of the Content-Type MIME header in SOAP 1.1. */
String SOAP_1_1_CONTENT_TYPE = "text/xml";
- /** Used to create MessageFactory instances that create SOAPMessages whose behavior supports the SOAP 1.1 specification */
- String SOAP_1_1_PROTOCOL = "SOAP 1.1 Protocol";
- /** The media type of the Content-Type MIME header in SOAP 1.2. */
- String SOAP_1_2_CONTENT_TYPE = "application/soap+xml";
/** Used to create MessageFactory instances that create SOAPMessages whose behavior supports the SOAP 1.2 specification */
String SOAP_1_2_PROTOCOL = "SOAP 1.2 Protocol";
/** The default namespace prefix for http://www.w3.org/2003/05/soap-envelope */
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -73,7 +73,7 @@
if (soapFactory == null)
{
SAAJMetaFactory saajFactory = SAAJMetaFactory.getInstance();
- soapFactory = saajFactory.newSOAPFactory(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
+ soapFactory = saajFactory.newSOAPFactory(SOAPConstants.DEFAULT_SOAP_PROTOCOL);
}
if (soapFactory == null)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -48,8 +48,8 @@
import org.jboss.ws.core.client.EndpointInfo;
import org.jboss.ws.core.client.SOAPRemotingConnection;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,10 +32,10 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.umdm.OperationMetaData;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -52,8 +52,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
@@ -61,13 +59,16 @@
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPBodyElementDoc;
import org.jboss.ws.core.soap.SOAPBodyElementRpc;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.SOAPElementImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.core.soap.SOAPHeaderElementImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.UnboundHeader;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.utils.MimeUtils;
@@ -544,13 +545,9 @@
msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
SOAPHeader soapHeader = soapEnvelope.getHeader();
- SOAPBody soapBody = soapEnvelope.getBody();
- Iterator bodyChildren = soapBody.getChildElements();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody();
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
- SOAPBodyElement soapBodyElement = null;
- if (bodyChildren.hasNext() != false)
- soapBodyElement = (SOAPBodyElement)bodyChildren.next();
-
// Translate the SOAPFault to an exception and throw it
if (soapBodyElement instanceof SOAPFaultImpl)
throwFaultException((SOAPFaultImpl)soapBodyElement);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -43,6 +43,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ws.core.jaxrpc;
-
-// $Id$
-
-/** A type-safe enumeration for encoding style.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Oct-2004
- */
-public class Style
-{
- private String style;
-
- public static final Style RPC = new Style("rpc");
- public static final Style DOCUMENT = new Style("document");
-
- private Style(String style)
- {
- this.style = style;
- }
-
- public static Style getDefaultStyle()
- {
- return DOCUMENT;
- }
-
- public static Style valueOf(String style)
- {
- if (RPC.style.equals(style))
- return RPC;
- if (DOCUMENT.style.equals(style))
- return DOCUMENT;
-
- throw new IllegalArgumentException("Unsupported style: " + style);
- }
-
- public String toString()
- {
- return style;
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,74 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ws.core.jaxrpc;
-
-import org.jboss.ws.Constants;
-
-// $Id$
-
-/** A type-safe enumeration for encoding use.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-Oct-2005
- */
-public class Use
-{
- private String use;
-
- public static final Use LITERAL = new Use("literal");
- public static final Use ENCODED = new Use("encoded");
-
- private Use(String use)
- {
- this.use = use;
- }
-
- public static Use getDefaultUse()
- {
- return LITERAL;
- }
-
- public static Use valueOf(String encodingStyle)
- {
- if (Constants.URI_LITERAL_ENC.equals(encodingStyle) || LITERAL.use.equals(encodingStyle))
- return LITERAL;
- if (Constants.URI_SOAP11_ENC.equals(encodingStyle) || ENCODED.use.equals(encodingStyle))
- return ENCODED;
-
- throw new IllegalArgumentException("Unsupported encoding style: " + encodingStyle);
- }
-
- public String toURI()
- {
- String encURI = null;
- if (this == LITERAL)
- encURI = Constants.URI_LITERAL_ENC;
- else if (this == ENCODED)
- encURI = Constants.URI_SOAP11_ENC;
- return encURI;
- }
-
- public String toString()
- {
- return use;
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -23,10 +23,12 @@
// $Id$
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
import javax.xml.ws.handler.Handler;
@@ -93,9 +95,9 @@
SOAPMessage reqMessage = (SOAPMessage)payload;
SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody();
- SOAPContentElement bodyElement = (SOAPContentElement)body.getFirstChild();
+
+ SOAPContentElement bodyElement = (SOAPContentElement)body.getBodyElement();
Source source = bodyElement.getXMLFragment().getSource();
-
if (source == null)
throw new IllegalStateException("Payload cannot be null");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -31,7 +31,6 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
@@ -157,8 +156,8 @@
{
if (mode == Mode.PAYLOAD)
{
- SOAPBody soapBody = resMsg.getSOAPBody();
- SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody();
+ SOAPElement soapElement = soapBody.getBodyElement();
retObj = new DOMSource(soapElement);
}
if (mode == Mode.MESSAGE)
@@ -171,7 +170,7 @@
else if (jaxbContext != null)
{
SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody();
- SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPElement soapElement = soapBody.getBodyElement();
log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false));
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,7 +32,7 @@
import javax.xml.ws.handler.MessageContext;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
/**
* The LogicalMessageContext interface extends MessageContext to provide access to a the
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -39,8 +39,13 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.soap.*;
+import org.jboss.ws.core.soap.EnvelopeBuilder;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
+import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.ws.integration.FactoryLoader;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
@@ -106,9 +111,10 @@
try
{
soapBody.removeContents();
- EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(style);
Element domBodyElement = DOMUtils.sourceToElement(source);
- builder.buildBodyElementRpc(soapBody, domBodyElement);
+ envBuilder.buildBodyElementRpc(soapBody, domBodyElement);
}
catch (IOException ex)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -25,6 +25,7 @@
import java.lang.reflect.Method;
import java.util.HashMap;
+import java.util.Iterator;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -62,6 +63,7 @@
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -395,10 +397,11 @@
if (opMetaData == null)
{
String faultString;
- SOAPBody soapBody = soapMessage.getSOAPBody();
- if (soapBody.getChildElements().hasNext())
+
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
+ if (soapBodyElement != null)
{
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
Name soapName = soapBodyElement.getElementName();
faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -25,11 +25,16 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
+import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import org.w3c.dom.Element;
+
+
/**
* @author Heiko Braun, <heiko.braun(a)jboss.com>
* @author Thomas.Diesler(a)jboss.com
@@ -37,5 +42,17 @@
*/
public interface EnvelopeBuilder
{
+ Style getStyle();
+
+ void setStyle(Style style);
+
SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException;
+
+ SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException;
+
+ SOAPEnvelope build(SOAPMessage soapMessage, Element domEnv) throws SOAPException;
+
+ SOAPBodyElement buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException;
+
+ SOAPBodyElement buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -31,7 +31,6 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -42,7 +41,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
@@ -63,14 +61,16 @@
// provide logging
private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class);
- private SOAPFactoryImpl soapFactory;
- private String envNamespace;
- private boolean isSOAP11;
+ private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
private Style style;
- public EnvelopeBuilderDOM(Style style)
+ public Style getStyle()
{
- this.soapFactory = new SOAPFactoryImpl();
+ return style;
+ }
+
+ public void setStyle(Style style)
+ {
this.style = style;
}
@@ -120,10 +120,6 @@
SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart();
SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, soapFactory.createElement(domEnv, false), false);
- // Get the envelope namespace
- envNamespace = soapEnv.getNamespaceURI();
- isSOAP11 = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(envNamespace);
-
DOMUtils.copyAttributes(soapEnv, domEnv);
NodeList envChildNodes = domEnv.getChildNodes();
@@ -305,7 +301,7 @@
XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement));
contentElement.setXMLFragment(xmlFragment);
-
+
return soapBodyElement;
}
@@ -393,21 +389,15 @@
private void appendCommentNode(SOAPElement soapElement, Node child)
{
- if (isSOAP11)
- {
- String nodeValue = child.getNodeValue();
- Document ownerDoc = soapElement.getOwnerDocument();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapElement.appendChild(comment);
- }
+ String nodeValue = child.getNodeValue();
+ Document ownerDoc = soapElement.getOwnerDocument();
+ Comment comment = ownerDoc.createComment(nodeValue);
+ soapElement.appendChild(comment);
}
private void appendTextNode(SOAPElement soapElement, Node child) throws SOAPException
{
- if (isSOAP11)
- {
- String nodeValue = child.getNodeValue();
- soapElement.addTextNode(nodeValue);
- }
+ String nodeValue = child.getNodeValue();
+ soapElement.addTextNode(nodeValue);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,10 +26,12 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
@@ -40,6 +42,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
+import org.jboss.util.NotImplementedException;
import org.w3c.dom.Element;
import com.ctc.wstx.stax.WstxInputFactory;
@@ -469,4 +472,34 @@
return builder.toString();
}
+
+ public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public SOAPEnvelope build(SOAPMessage soapMessage, Element domEnv) throws SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public SOAPBodyElement buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public SOAPBodyElement buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public Style getStyle()
+ {
+ throw new NotImplementedException();
+ }
+
+ public void setStyle(Style style)
+ {
+ throw new NotImplementedException();
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,7 +26,6 @@
import java.util.Iterator;
import javax.xml.soap.Node;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
@@ -51,9 +50,9 @@
private static Logger log = Logger.getLogger(HRefInlineHandler.class);
private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
- private SOAPBody soapBody;
+ private SOAPBodyImpl soapBody;
- public HRefInlineHandler(SOAPBody soapBody)
+ public HRefInlineHandler(SOAPBodyImpl soapBody)
{
this.soapBody = soapBody;
}
@@ -63,16 +62,21 @@
String bodyStr = DOMWriter.printNode(soapBody, true);
log.debug("Begin processHRefs:\n" + bodyStr);
- SOAPBodyElement bodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
- processElement(bodyElement);
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
+ processElement(soapBodyElement);
+ // Process elements after SOAPBodyElement
Iterator it = soapBody.getChildElements();
while (it.hasNext())
{
- // Remove id elements
- SOAPElement soapElement = (SOAPElement)it.next();
- if ((soapElement instanceof SOAPBodyElement) == false)
- soapBody.removeChild(soapElement);
+ Object next = it.next();
+ if (next instanceof SOAPElement)
+ {
+ // Remove id elements
+ SOAPElement soapElement = (SOAPElement)next;
+ if ((soapElement instanceof SOAPBodyElement) == false)
+ soapBody.removeChild(soapElement);
+ }
}
bodyStr = DOMWriter.printNode(soapBody, true);
@@ -105,11 +109,15 @@
Iterator it = soapBody.getChildElements();
while (it.hasNext())
{
- SOAPElement auxElement = (SOAPElement)it.next();
- if (href.equals("#" + auxElement.getAttribute("id")))
+ Object next = it.next();
+ if (next instanceof SOAPElement)
{
- idElement = (SOAPElement)auxElement;
- break;
+ SOAPElement auxElement = (SOAPElement)next;
+ if (href.equals("#" + auxElement.getAttribute("id")))
+ {
+ idElement = (SOAPElement)auxElement;
+ break;
+ }
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -43,9 +43,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
+import org.jboss.ws.integration.FactoryLoader;
import org.jboss.wsf.spi.utils.IOUtils;
/**
@@ -150,7 +150,7 @@
public SOAPMessage createMessage() throws SOAPException
{
if (dynamic)
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException("Cannot create default message when protocol is dynamic");
SOAPMessageImpl soapMessage = new SOAPMessageImpl();
SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart();
@@ -249,7 +249,8 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle());
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(getStyle());
// Build the payload
envBuilder.build(soapMessage, inputStream, ignoreParseError);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -182,6 +182,19 @@
return getChildElements(new QName(getNamespaceURI(), "Fault"));
}
+ public SOAPBodyElement getBodyElement()
+ {
+ SOAPBodyElement bodyElement = null;
+ Iterator it = getChildElements();
+ while (bodyElement == null && it.hasNext())
+ {
+ Object next = it.next();
+ if (next instanceof SOAPBodyElement)
+ bodyElement = (SOAPBodyElement)next;
+ }
+ return bodyElement;
+ }
+
public Node appendChild(Node newChild) throws DOMException
{
log.trace("appendChild: " + newChild.getNodeName());
@@ -274,4 +287,5 @@
element.detachNode();
return new SOAPBodyElementDoc(element);
}
+
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -160,8 +160,7 @@
@Override
public Detail createDetail() throws SOAPException
{
- if (envNamespace == null)
- throw new UnsupportedOperationException("the specified protocol was DYNAMIC_SOAP_PROTOCOL");
+ assertEnvNamespace();
return SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(envNamespace) ? new DetailImpl() :
new DetailImpl(SOAPConstants.SOAP_ENV_PREFIX, envNamespace);
@@ -182,8 +181,7 @@
@Override
public SOAPFault createFault(String reasonText, QName faultCode) throws SOAPException
{
- if (envNamespace == null)
- throw new UnsupportedOperationException("the specified protocol was DYNAMIC_SOAP_PROTOCOL");
+ assertEnvNamespace();
SOAPFaultImpl soapFault = new SOAPFaultImpl(SOAPConstants.SOAP_ENV_PREFIX, envNamespace);
soapFault.setFaultCode(faultCode);
@@ -194,11 +192,16 @@
@Override
public SOAPFault createFault() throws SOAPException
{
- if (envNamespace == null)
- throw new UnsupportedOperationException("the specified protocol was DYNAMIC_SOAP_PROTOCOL");
+ assertEnvNamespace();
SOAPFaultImpl soapFault = new SOAPFaultImpl(SOAPConstants.SOAP_ENV_PREFIX, envNamespace);
soapFault.setFaultCode(soapFault.getDefaultFaultCode());
return soapFault;
}
+
+ private void assertEnvNamespace()
+ {
+ if (envNamespace == null)
+ throw new UnsupportedOperationException("Envelope namespace not specified, use one of the SOAP protocols");
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -36,7 +36,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.integration.FactoryLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
@@ -172,7 +172,8 @@
else
throw new SOAPException("Unsupported DOMSource node: " + node);
- EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(Style.DOCUMENT);
envBuilder.build(soapMessage, domElement);
}
else if (source instanceof StreamSource)
@@ -180,7 +181,8 @@
try
{
StreamSource streamSource = (StreamSource)source;
- EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(Style.DOCUMENT);
InputStream stream = streamSource.getInputStream();
Reader reader = streamSource.getReader();
if (stream != null)
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java (from rev 3395, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,62 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.core.soap;
+
+// $Id$
+
+/** A type-safe enumeration for encoding style.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class Style
+{
+ private String style;
+
+ public static final Style RPC = new Style("rpc");
+ public static final Style DOCUMENT = new Style("document");
+
+ private Style(String style)
+ {
+ this.style = style;
+ }
+
+ public static Style getDefaultStyle()
+ {
+ return DOCUMENT;
+ }
+
+ public static Style valueOf(String style)
+ {
+ if (RPC.style.equals(style))
+ return RPC;
+ if (DOCUMENT.style.equals(style))
+ return DOCUMENT;
+
+ throw new IllegalArgumentException("Unsupported style: " + style);
+ }
+
+ public String toString()
+ {
+ return style;
+ }
+}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java (from rev 3395, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.core.soap;
+
+import org.jboss.ws.Constants;
+
+// $Id$
+
+/** A type-safe enumeration for encoding use.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-Oct-2005
+ */
+public class Use
+{
+ private String use;
+
+ public static final Use LITERAL = new Use("literal");
+ public static final Use ENCODED = new Use("encoded");
+
+ private Use(String use)
+ {
+ this.use = use;
+ }
+
+ public static Use getDefaultUse()
+ {
+ return LITERAL;
+ }
+
+ public static Use valueOf(String encodingStyle)
+ {
+ if (Constants.URI_LITERAL_ENC.equals(encodingStyle) || LITERAL.use.equals(encodingStyle))
+ return LITERAL;
+ if (Constants.URI_SOAP11_ENC.equals(encodingStyle) || ENCODED.use.equals(encodingStyle))
+ return ENCODED;
+
+ throw new IllegalArgumentException("Unsupported encoding style: " + encodingStyle);
+ }
+
+ public String toURI()
+ {
+ String encURI = null;
+ if (this == LITERAL)
+ encURI = Constants.URI_LITERAL_ENC;
+ else if (this == ENCODED)
+ encURI = Constants.URI_SOAP11_ENC;
+ return encURI;
+ }
+
+ public String toString()
+ {
+ return use;
+ }
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -44,7 +44,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Use;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.extensions.eventing.EventingConstants;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -39,11 +39,11 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.EncodedTypeMapping;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.core.jaxrpc.UnqualifiedFaultException;
-import org.jboss.ws.core.jaxrpc.Use;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -33,8 +33,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -58,10 +58,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxws.DynamicWrapperGenerator;
import org.jboss.ws.core.jaxws.WrapperGenerator;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -37,8 +37,8 @@
import javax.xml.ws.Service.Mode;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -45,9 +45,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonSOAPBinding;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory;
@@ -56,6 +54,8 @@
import org.jboss.ws.core.jaxws.JAXBDeserializerFactory;
import org.jboss.ws.core.jaxws.JAXBSerializerFactory;
import org.jboss.ws.core.jaxws.client.DispatchBinding;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.config.Configurable;
import org.jboss.ws.metadata.config.ConfigurationProvider;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -35,8 +35,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.Use;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.wsf.spi.utils.JavaUtils;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -40,8 +40,8 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -34,7 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -37,7 +37,7 @@
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -39,7 +39,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -36,7 +36,7 @@
import javax.xml.rpc.holders.Holder;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.umdm.FaultMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -73,7 +73,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.Extendable;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -33,7 +33,7 @@
import org.apache.ws.policy.util.PolicyWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Added: trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1 @@
+org.jboss.ws.core.soap.EnvelopeBuilderDOM
\ No newline at end of file
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.Iterator;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPBody;
@@ -33,12 +34,13 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.Text;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.Style;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
@@ -82,7 +84,10 @@
assertEquals("env:Envelope", env.getNodeName());
assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI());
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements().next();
+ Iterator it = env.getBody().getChildElements();
+ Text text = (Text)it.next();
+ assertEquals(" ", text.getValue());
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)it.next();
assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI());
}
@@ -186,11 +191,11 @@
public void testPreserveComments() throws Exception
{
String expMsg =
- "<soapenv:Envelope xmlns:ns1='http://somens.org' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <soapenv:Header>" +
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:ns1='http://somens.org'>" +
+ " <env:Header>" +
" <ns1:header>kermit</ns1:header>" +
- " </soapenv:Header>" +
- " <soapenv:Body>" +
+ " </env:Header>" +
+ " <env:Body>" +
" <!-- pre body element -->" +
" <Hello>" +
" <!-- pre element -->" +
@@ -198,8 +203,8 @@
" <!-- post element -->" +
" </Hello>" +
" <!-- post body element -->" +
- " </soapenv:Body>" +
- "</soapenv:Envelope>";
+ " </env:Body>" +
+ "</env:Envelope>";
// Verify that DOM parse/write do not modify the message
Element expEnv = DOMUtils.parse(expMsg);
@@ -220,8 +225,13 @@
SOAPEnvelope wasEnv = soapMsg.getSOAPPart().getEnvelope();
String wasXML = DOMWriter.printNode(wasEnv, false);
- //System.out.println(expXML);
- //System.out.println(wasXML);
- assertEquals(expXML, wasXML);
+ String wasBody = wasXML.substring(wasXML.indexOf("<env:Body>"));
+ wasBody = wasBody.substring(0, wasBody.indexOf("</env:Body>") + 11);
+
+ String expBody = expXML.substring(expXML.indexOf("<env:Body>"));
+ expBody = expBody.substring(0, expBody.indexOf("</env:Body>") + 11);
+ //System.out.println(expBody);
+ //System.out.println(wasBody);
+ assertEquals(expBody, wasBody);
}
}
\ No newline at end of file
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -107,9 +107,9 @@
{
String xml =
"<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <soap:Body>" +
- " <np:bear name='ted' zoo:species='ursus maritimus' xmlns:np='http://northpole.net' xmlns:zoo='http://zoofan.net'/>" +
- " </soap:Body>" +
+ "<soap:Body>" +
+ "<np:bear name='ted' zoo:species='ursus maritimus' xmlns:np='http://northpole.net' xmlns:zoo='http://zoofan.net'/>" +
+ "</soap:Body>" +
"</soap:Envelope>";
SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(xml.getBytes()));
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -23,6 +23,7 @@
import java.io.ByteArrayInputStream;
+import javax.xml.namespace.QName;
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.Detail;
import javax.xml.soap.DetailEntry;
@@ -49,19 +50,20 @@
*/
public class SOAPFaultTestCase extends JBossWSTest
{
- private String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <env:Fault>" +
- " <faultcode>env:Client</faultcode>" +
- " <faultstring>Some fault message</faultstring>" +
- " <faultactor>Some fault actor</faultactor>" +
- " <detail>" +
- " <ns1:name xmlns:ns1='http://somens'>Kermit</ns1:name>" +
- " </detail>" +
- " </env:Fault>" +
- " </env:Body>" +
- "</env:Envelope>";
+ private String envStr =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <env:Fault>" +
+ " <faultcode>env:Client</faultcode>" +
+ " <faultstring>Some fault message</faultstring>" +
+ " <faultactor>Some fault actor</faultactor>" +
+ " <detail>" +
+ " <ns1:name xmlns:ns1='http://somens'>Kermit</ns1:name>" +
+ " </detail>" +
+ " </env:Fault>" +
+ " </env:Body>" +
+ "</env:Envelope>";
public void testExceptionToFault() throws Exception
{
@@ -76,7 +78,7 @@
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPFault soapFault = (SOAPFault)soapBody.getChildElements().next();
+ SOAPFault soapFault = (SOAPFault)soapBody.getChildElements(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Fault")).next();
assertEquals("env:Client", soapFault.getFaultCode());
assertEquals("Some fault message", soapFault.getFaultString());
assertEquals("Some fault actor", soapFault.getFaultActor());
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -28,13 +28,13 @@
import javax.xml.rpc.Service;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import junit.framework.Test;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.w3c.dom.Node;
@@ -184,8 +184,8 @@
mimeHeaders.addHeader("Content-Type", "text/xml; charset=UTF-8");
SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes()));
- SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
+ SOAPElement soapElement = soapBody.getBodyElement();
StringBuffer builder = new StringBuffer();
NodeList nlist = soapElement.getChildNodes();
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -33,7 +33,7 @@
import org.jboss.test.ws.tools.sei.ServiceException;
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.JavaToWSDL;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -37,7 +37,7 @@
import org.jboss.test.ws.tools.validation.WSDL11Validator;
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.JavaToWSDL;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,7 +26,7 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSToolsConstants;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -31,7 +31,7 @@
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSDLToJava;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,7 +32,7 @@
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
Modified: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-03 10:11:51 UTC (rev 3400)
@@ -5,6 +5,10 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/endpoint/**
org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/serviceref/**
org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxws.samples.provider;
import javax.jws.WebParam;
@@ -27,16 +27,12 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.ParameterStyle;
-@WebService(
- serviceName = "ProviderService",
- portName = "ProviderPort",
- targetNamespace = "http://org.jboss.ws/provider",
- wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
+@WebService(name = "Provider", serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/provider", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
@SOAPBinding(parameterStyle = ParameterStyle.BARE)
public class WebServiceEndpoint
{
- @WebResult(name="user")
- public UserType echo(@WebParam(name="user")UserType type)
+ @WebResult(name = "user")
+ public UserType echo(@WebParam(name = "user") UserType type)
{
return type;
}
18 years, 5 months
- 1
- 0
JBossWS SVN: r3399 - in trunk/jbossws-core/src: main/java/org/jboss/ws/core/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-02 19:12:55 -0400 (Sat, 02 Jun 2007)
New Revision: 3399
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java
Removed:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java
Log:
[JBWS-1647] Text Node Preservation For Messages Sent Across The Wire
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -288,14 +288,25 @@
if (opMetaData.isMessageEndpoint() == false)
{
Style style = opMetaData.getStyle();
- SOAPElement soapBodyElement = soapBody;
+ SOAPElement payloadParent = soapBody;
if (style == Style.RPC)
{
- soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
- Name elName = soapBodyElement.getElementName();
-
- QName elQName = new QName(elName.getURI(), elName.getLocalName(), elName.getPrefix());
- elQName = namespaceRegistry.registerQName(elQName);
+ payloadParent = null;
+ Iterator it = soapBody.getChildElements();
+ while (payloadParent == null && it.hasNext())
+ {
+ Object childNode = it.next();
+ if (childNode instanceof SOAPElement)
+ {
+ payloadParent = (SOAPElement)childNode;
+ }
+ }
+
+ if (payloadParent == null)
+ throw new SOAPException("Cannot find RPC element in");
+
+ QName elName = payloadParent.getElementQName();
+ elName = namespaceRegistry.registerQName(elName);
}
int numParameters = 0;
@@ -324,7 +335,7 @@
else
{
boolean isHeader = paramMetaData.isInHeader();
- SOAPElement element = isHeader ? soapHeader : soapBodyElement;
+ SOAPElement element = isHeader ? soapHeader : payloadParent;
if (!isHeader)
numParameters++;
@@ -336,7 +347,7 @@
// Verify the numer of parameters matches the actual message payload
int numChildElements = 0;
- Iterator itElements = soapBodyElement.getChildElements();
+ Iterator itElements = payloadParent.getChildElements();
while (itElements.hasNext())
{
Node node = (Node)itElements.next();
@@ -804,44 +815,47 @@
Iterator childElements = soapElement.getChildElements();
while (childElements.hasNext())
{
- SOAPElementImpl childElement = (SOAPElementImpl)childElements.next();
+ Object childNode = childElements.next();
+ if (childNode instanceof SOAPElement)
+ {
+ SOAPElementImpl childElement = (SOAPElementImpl)childNode;
+ // If this message was manipulated by a handler the child may not be a content element
+ if (!(childElement instanceof SOAPContentElement))
+ childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement);
- // If this message was manipulated by a handler the child may not be a content element
- if (!(childElement instanceof SOAPContentElement))
- childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement);
+ // The parameters are expected to be lazy
+ SOAPContentElement aux = (SOAPContentElement)childElement;
+ Name elName = aux.getElementName();
- // The parameters are expected to be lazy
- SOAPContentElement aux = (SOAPContentElement)childElement;
- Name elName = aux.getElementName();
+ if (xmlName.equals(elName))
+ {
+ soapContentElement = aux;
+ soapContentElement.setParamMetaData(paramMetaData);
+ break;
+ }
- if (xmlName.equals(elName))
- {
- soapContentElement = aux;
- soapContentElement.setParamMetaData(paramMetaData);
- break;
- }
-
- if (SOAP_ARRAY_NAME.equals(elName))
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE);
- try
+ if (SOAP_ARRAY_NAME.equals(elName))
{
- QName compXMLName = paramMetaData.getXmlName();
- Element compElement = DOMUtils.getFirstChildElement(aux);
- // NPE when the soap encoded array size is 0 on the return path
- // http://jira.jboss.org/jira/browse/JBWS-1285
- if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart()))
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE);
+ try
{
- soapContentElement = aux;
- soapContentElement.setParamMetaData(paramMetaData);
- break;
+ QName compXMLName = paramMetaData.getXmlName();
+ Element compElement = DOMUtils.getFirstChildElement(aux);
+ // NPE when the soap encoded array size is 0 on the return path
+ // http://jira.jboss.org/jira/browse/JBWS-1285
+ if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart()))
+ {
+ soapContentElement = aux;
+ soapContentElement.setParamMetaData(paramMetaData);
+ break;
+ }
}
+ finally
+ {
+ msgContext.remove(CommonMessageContext.ALLOW_EXPAND_TO_DOM);
+ }
}
- finally
- {
- msgContext.remove(CommonMessageContext.ALLOW_EXPAND_TO_DOM);
- }
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -144,17 +144,9 @@
}
else
{
- log.warn("Ignore envelope chile element: " + elName);
+ log.warn("Ignore envelope child: " + elName);
}
}
- else if (childType == Node.COMMENT_NODE)
- {
- appendCommentNode(soapEnv, child);
- }
- else if (childType == Node.TEXT_NODE)
- {
- appendTextNode(soapEnv, child);
- }
else
{
log.warn("Ignore child type: " + childType);
@@ -189,14 +181,6 @@
DOMUtils.copyAttributes(destElement, srcElement);
destElement.setXMLFragment(xmlFragment);
}
- else if (childType == Node.COMMENT_NODE)
- {
- appendCommentNode(soapHeader, child);
- }
- else if (childType == Node.TEXT_NODE)
- {
- appendTextNode(soapHeader, child);
- }
else
{
log.warn("Ignore child type: " + childType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -465,9 +465,7 @@
}
else if (node instanceof Text)
{
- String value = node.getNodeValue();
- if (value.trim().length() > 0)
- list.add(node);
+ list.add(node);
}
}
return list.iterator();
@@ -835,7 +833,7 @@
}
else if (node instanceof TextImpl)
{
- out.write(node.getValue());
+ ((TextImpl)node).writeNode(out);
}
else
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -68,7 +68,7 @@
if (wsaAction.equals(opAux.getSOAPAction()))
{
opMetaData = opAux;
- if(log.isDebugEnabled()) log.debug("Use wsa:Action dispatch: " + wsaAction);
+ log.debug("Use wsa:Action dispatch: " + wsaAction);
break;
}
}
@@ -86,9 +86,19 @@
{
SOAPBody soapBody = soapMessage.getSOAPBody();
+ SOAPBodyElement soapBodyElement = null;
Iterator bodyChildren = soapBody.getChildElements();
- if (bodyChildren.hasNext() == false)
+ while (bodyChildren.hasNext() && soapBodyElement == null)
{
+ Object childNode = bodyChildren.next();
+ if (childNode instanceof SOAPBodyElement)
+ {
+ soapBodyElement = (SOAPBodyElement)childNode;
+ }
+ }
+
+ if (soapBodyElement == null)
+ {
if (epMetaData.getStyle() == Style.RPC)
throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
@@ -97,7 +107,7 @@
{
if (opAux.getParameters().size() == 0)
{
- if(log.isDebugEnabled()) log.debug ("Dispatching empty SOAP body");
+ log.debug ("Dispatching empty SOAP body");
opMetaData = opAux;
break;
}
@@ -105,7 +115,6 @@
}
else
{
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
Name soapName = soapBodyElement.getElementName();
QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
opMetaData = epMetaData.getOperation(xmlElementName);
@@ -119,14 +128,14 @@
{
if (opAux.isMessageEndpoint())
{
- if(log.isDebugEnabled()) log.debug("Use generic message style dispatch");
+ log.debug("Use generic message style dispatch");
opMetaData = opAux;
break;
}
}
}
- if(log.isDebugEnabled()) log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null));
+ log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null));
return opMetaData;
}
}
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -21,6 +21,9 @@
*/
package org.jboss.ws.core.soap;
+import java.io.IOException;
+import java.io.Writer;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Text;
@@ -55,6 +58,15 @@
setNodeValue(value);
}
+ public void writeNode(Writer out) throws IOException
+ {
+ String nodeValue = getNodeValue();
+ if (isComment() && !nodeValue.startsWith("<!--"))
+ out.write("<!--" + nodeValue + "-->");
+ else
+ out.write(nodeValue);
+ }
+
/**
* Breaks this node into two nodes at the specified <code>offset</code>, keeping both in the tree as siblings.
* <p/>
@@ -322,5 +334,4 @@
{
return null;
}
-
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -21,15 +21,16 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1647;
-import java.io.ByteArrayOutputStream;
-
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.GenericHandler;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.utils.DOMWriter;
/**
*
@@ -38,49 +39,39 @@
*/
public abstract class AbstractHandler extends GenericHandler
{
-
private static final Logger log = Logger.getLogger(AbstractHandler.class);
- public abstract String getExpectedMessage();
+ public abstract String getMessageBody();
public boolean handleRequest(MessageContext msgContext)
{
log.info("handleRequest");
-
- boolean valid = false;
SOAPMessageContext messageContext = (SOAPMessageContext)msgContext;
-
SOAPMessage soapMessage = messageContext.getMessage();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- String receivedMessage = "";
try
{
- soapMessage.writeTo(baos);
- receivedMessage = baos.toString();
+ SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
+ String wasEnv = DOMWriter.printNode(soapEnv, false);
+ String wasBody = wasEnv.substring(wasEnv.indexOf("<env:Body>"));
+ wasBody = wasBody.substring(0, wasBody.indexOf("</env:Envelope>"));
+ if (wasBody.equals(getMessageBody()) == false)
+ {
+ log.error("Exp Body: " + getMessageBody());
+ log.error("Was Body: " + wasBody);
+ throw new RuntimeException("Received message does not contain expected soap body.");
+ }
}
catch (Exception e)
{
throw new RuntimeException("Unable to process SOAPMessage", e);
}
-
- valid = getExpectedMessage().equals(receivedMessage);
- if (valid == false)
- {
- log.error("Received message does not equal expected message.");
- log.info("EXP - " + getExpectedMessage());
- log.info("ACT - " + receivedMessage);
-
- throw new RuntimeException("Received message does not equal expected message.");
- }
-
- return valid;
+ return true;
}
public QName[] getHeaders()
{
return null;
}
-
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -29,26 +29,20 @@
public class DocumentHandler extends AbstractHandler
{
- public static final String MESSAGE =
- "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" +
- " <!-- Comment Before Header -->" +
- " <soapenv:Header></soapenv:Header>" +
- " <!-- Comment After Header, Before Body -->" +
- " <soapenv:Body>" +
- " <!-- Comment After Body -->" +
- " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" +
- " <!-- Comment After Wrapper -->" +
- " <String_1>My Message</String_1>" +
- " <!-- Comment After Parameter -->" +
- " </typ:echoMessage>" +
- " <!-- Comment Before Close Body -->" +
- " </soapenv:Body>" +
- " <!-- Comment Before Close Envelope -->" +
- "</soapenv:Envelope>";
+ public static final String MESSAGE_BODY =
+ "<env:Body>" +
+ " <!-- Comment After Body -->" +
+ " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" +
+ " <!-- Comment After Wrapper -->" +
+ " <String_1>My Message</String_1>" +
+ " <!-- Comment After Parameter -->" +
+ " </typ:echoMessage>" +
+ " <!-- Comment Before Close Body -->" +
+ "</env:Body>";
- public String getExpectedMessage()
+ public String getMessageBody()
{
- return MESSAGE;
+ return MESSAGE_BODY;
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -33,7 +33,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 15 May 2007
*/
-public class JBWS1647DocumentTestCase extends TestCaseBase
+public class JBWS1647DocumentTestCase extends JBWS1647TestBase
{
public static Test suite() throws Exception
@@ -43,10 +43,10 @@
public String getMessage()
{
- return DocumentHandler.MESSAGE;
+ return "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + DocumentHandler.MESSAGE_BODY + "</env:Envelope>";
}
- public String getToUrl()
+ public String getEndpointAddress()
{
return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint";
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -21,10 +21,10 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1647;
+import junit.framework.Test;
+
import org.jboss.wsf.spi.test.JBossWSTestSetup;
-import junit.framework.Test;
-
/**
* Text Node Preservation For Messages Sent Across The Wire
*
@@ -33,7 +33,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 14 May 2007
*/
-public class JBWS1647RPCTestCase extends TestCaseBase
+public class JBWS1647RPCTestCase extends JBWS1647TestBase
{
public static Test suite() throws Exception
@@ -43,10 +43,10 @@
public String getMessage()
{
- return RpcHandler.MESSAGE;
+ return "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + RpcHandler.MESSAGE_BODY + "</env:Envelope>";
}
- public String getToUrl()
+ public String getEndpointAddress()
{
return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint";
}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java (from rev 3395, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import java.io.ByteArrayInputStream;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 15 May 2007
+ */
+public abstract class JBWS1647TestBase extends JBossWSTest
+{
+ public abstract String getMessage();
+
+ public abstract String getEndpointAddress();
+
+ public void testCall() throws Exception
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes()));
+
+ SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
+ SOAPConnection con = conFactory.createConnection();
+ SOAPMessage resMessage = con.call(soapMessage, getEndpointAddress());
+
+ SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
+ assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName());
+ }
+
+}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -29,26 +29,20 @@
public class RpcHandler extends AbstractHandler
{
- public static final String MESSAGE =
- "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <!-- Comment Before Header -->" +
- " <soapenv:Header></soapenv:Header>" +
- " <!-- Comment After Header, Before Body -->" +
- " <soapenv:Body>" +
- " <!-- Comment After Body -->" +
- " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" +
- " <!-- Comment After Operation -->" +
- " <String_1>My Message</String_1>" +
- " <!-- Comment After Parameter -->" +
- " </jbw:echoMessage>" +
- " <!-- Comment Before Close Body -->" +
- " </soapenv:Body>" +
- " <!-- Comment Before Close Envelope -->" +
- "</soapenv:Envelope>";
+ public static final String MESSAGE_BODY =
+ "<env:Body>" +
+ " <!-- Comment After Body -->" +
+ " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" +
+ " <!-- Comment After Operation -->" +
+ " <String_1>My Message</String_1>" +
+ " <!-- Comment After Parameter -->" +
+ " </jbw:echoMessage>" +
+ " <!-- Comment Before Close Body -->" +
+ "</env:Body>";
- public String getExpectedMessage()
+ public String getMessageBody()
{
- return MESSAGE;
+ return MESSAGE_BODY;
}
}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-06-02 21:44:36 UTC (rev 3398)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-06-02 23:12:55 UTC (rev 3399)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1647;
-
-import java.io.ByteArrayInputStream;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.wsf.spi.test.JBossWSTest;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 15 May 2007
- */
-public abstract class TestCaseBase extends JBossWSTest
-{
- public abstract String getMessage();
-
- public abstract String getToUrl();
-
- public void testCall() throws Exception
- {
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes()));
-
- SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
- SOAPConnection con = conFactory.createConnection();
- SOAPMessage resMessage = con.call(soapMessage, getToUrl());
-
- SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
- assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName());
- }
-
-}
18 years, 5 months
- 1
- 0