JBossWS SVN: r11155 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-11-25 10:34:50 -0500 (Wed, 25 Nov 2009)
New Revision: 11155
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
Log:
[JBWS-2841] ClassCastException TextImpl cannot be cast to SOAPElementImpl in CommonSOAPBinding.getParameterFromMessage.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-11-25 07:49:16 UTC (rev 11154)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-11-25 15:34:50 UTC (rev 11155)
@@ -891,10 +891,19 @@
childElements = soapElement.getChildElements();
OperationMetaData opMetaData = paramMetaData.getOperationMetaData();
TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData();
- if (childElements.hasNext() && opMetaData.getStyle() == Style.DOCUMENT)
+
+ SOAPElementImpl childElement = null;
+ while (childElement == null && childElements.hasNext())
{
- SOAPElementImpl childElement = (SOAPElementImpl)childElements.next();
+ Object current = childElements.next();
+ if (current instanceof SOAPElementImpl)
+ {
+ childElement = (SOAPElementImpl)current;
+ }
+ }
+ if (childElement != null && opMetaData.getStyle() == Style.DOCUMENT)
+ {
// The parameters are expected to be lazy
SOAPContentElement aux = (SOAPContentElement)childElement;
Name elName = aux.getElementName();
14 years, 4 months
JBossWS SVN: r11154 - stack/native/trunk/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:49:16 -0500 (Wed, 25 Nov 2009)
New Revision: 11154
Modified:
stack/native/trunk/src/main/distro/ant.properties.example
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2009-11-25 07:39:05 UTC (rev 11153)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2009-11-25 07:49:16 UTC (rev 11154)
@@ -16,10 +16,6 @@
jboss.server.instance=default
jboss.bind.address=localhost
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
# JBoss JMX invoker authentication
#jmx.authentication.username=admin
#jmx.authentication.password=admin
14 years, 4 months
JBossWS SVN: r11153 - stack/metro/trunk/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:39:05 -0500 (Wed, 25 Nov 2009)
New Revision: 11153
Modified:
stack/metro/trunk/src/main/distro/ant.properties.example
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-11-25 07:37:31 UTC (rev 11152)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-11-25 07:39:05 UTC (rev 11153)
@@ -16,10 +16,6 @@
jboss.server.instance=default
jboss.bind.address=localhost
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
# JBoss JMX invoker authentication
#jmx.authentication.username=admin
#jmx.authentication.password=admin
14 years, 4 months
JBossWS SVN: r11152 - stack/cxf/trunk/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:37:31 -0500 (Wed, 25 Nov 2009)
New Revision: 11152
Modified:
stack/cxf/trunk/src/main/distro/ant.properties.example
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-11-25 07:30:57 UTC (rev 11151)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-11-25 07:37:31 UTC (rev 11152)
@@ -16,10 +16,6 @@
jboss.server.instance=default
jboss.bind.address=localhost
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
# JBoss JMX invoker authentication
#jmx.authentication.username=admin
#jmx.authentication.password=admin
14 years, 4 months
JBossWS SVN: r11151 - in framework/trunk: src/main and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:30:57 -0500 (Wed, 25 Nov 2009)
New Revision: 11151
Removed:
framework/trunk/profiles-example.xml
framework/trunk/src/main/etc/
framework/trunk/src/main/scripts/build-install.xml
Modified:
framework/trunk/pom.xml
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-11-25 07:30:31 UTC (rev 11150)
+++ framework/trunk/pom.xml 2009-11-25 07:30:57 UTC (rev 11151)
@@ -24,11 +24,11 @@
<!-- Properties -->
<properties>
+ <jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.2.2-SNAPSHOT</jbossws.common.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
<jboss.web.version>2.1.3.GA</jboss.web.version>
- <jbossws.common.version>1.2.1.GA</jbossws.common.version>
- <jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
<jbossxb.version>2.0.1.GA</jbossxb.version>
</properties>
@@ -84,34 +84,8 @@
<!-- Plugins -->
<build>
- <resources>
- <resource>
- <targetPath>../etc</targetPath>
- <directory>src/main/etc</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- http://jira.codehaus.org/browse/MANTRUN-87 -->
- <property name="version.id" value="${project.version}" />
- <property name="jboss.local.repository" value="${jboss.local.repository}" />
- <ant antfile="src/main/scripts/build-install.xml" target="install" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Deleted: framework/trunk/profiles-example.xml
===================================================================
--- framework/trunk/profiles-example.xml 2009-11-25 07:30:31 UTC (rev 11150)
+++ framework/trunk/profiles-example.xml 2009-11-25 07:30:57 UTC (rev 11151)
@@ -1,20 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profiles>
- <profile>
- <id>user-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
- <!-- The location of the legacy jboss repository -->
- <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
- </properties>
- </profile>
- </profiles>
-
-</profilesXml>
\ No newline at end of file
Deleted: framework/trunk/src/main/scripts/build-install.xml
===================================================================
--- framework/trunk/src/main/scripts/build-install.xml 2009-11-25 07:30:31 UTC (rev 11150)
+++ framework/trunk/src/main/scripts/build-install.xml 2009-11-25 07:30:57 UTC (rev 11151)
@@ -1,61 +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. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="framework.dir" value="${basedir}"/>
- <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/>
- <property name="framework.target.dir" value="${framework.dir}/target"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
- <property name="repository.id" value="${version.id}"/>
- <echo message="version.id=${version.id}"/>
- <echo message="repository.id=${repository.id}"/>
- <echo message="jboss.local.repository=${jboss.local.repository}"/>
- </target>
-
- <target name="check-properties" depends="init">
- <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/>
- <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Installation -->
- <!-- ================================================================== -->
-
- <!-- Install to jboss.local.repository -->
- <target name="install" depends="check-properties" description="Install to jboss.local.repository">
-
- <!-- Check if the target jar is available -->
- <available property="jbossws.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
- <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/>
-
- <!-- Check if the source jar is available -->
- <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/>
- <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/>
-
- <!-- jboss/jbossws-framework -->
- <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/>
- <mkdir dir="${jboss.repository.dir}/lib"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/>
- <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
- </target>
-
-</project>
14 years, 4 months
JBossWS SVN: r11150 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:30:31 -0500 (Wed, 25 Nov 2009)
New Revision: 11150
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
Log:
[JBWS-2838] implementing new context mode creator
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2009-11-25 07:17:57 UTC (rev 11149)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2009-11-25 07:30:31 UTC (rev 11150)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.framework.deployment;
+import org.jboss.ws.Constants;
import org.jboss.wsf.spi.annotation.AuthMethod;
import org.jboss.wsf.spi.annotation.TransportGuarantee;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -100,7 +101,7 @@
{
String simpleName = dep.getSimpleName();
String contextRoot = simpleName.substring(0, simpleName.length() - 4);
- if (dep.getParent() != null)
+ if (dep.getParent() != null && Constants.BC_CONTEXT_MODE)
{
simpleName = dep.getParent().getSimpleName();
contextRoot = simpleName.substring(0, simpleName.length() - 4) + "-" + contextRoot;
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2009-11-25 07:17:57 UTC (rev 11149)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2009-11-25 07:30:31 UTC (rev 11150)
@@ -23,6 +23,9 @@
import java.util.StringTokenizer;
+import javax.jws.WebService;
+
+import org.jboss.ws.Constants;
import org.jboss.wsf.spi.annotation.WebContext;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -101,7 +104,24 @@
Class beanClass = ep.getTargetBeanClass();
WebContext anWebContext = (WebContext)beanClass.getAnnotation(WebContext.class);
if (anWebContext != null && anWebContext.urlPattern().length() > 0)
+ {
urlPattern = anWebContext.urlPattern();
+ }
+ else if (!Constants.BC_CONTEXT_MODE)
+ {
+ WebService webServiceAnnotation = (WebService)beanClass.getAnnotation(WebService.class);
+ String name = webServiceAnnotation != null ? webServiceAnnotation.name() : null;
+ if (name.length() > 0)
+ {
+ urlPattern = name;
+ }
+ else
+ {
+ String fullClassName = beanClass.getName();
+ urlPattern = fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
+ }
+ }
+
}
return urlPattern;
14 years, 4 months
JBossWS SVN: r11149 - spi/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:17:57 -0500 (Wed, 25 Nov 2009)
New Revision: 11149
Modified:
spi/trunk/pom.xml
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2009-11-25 07:15:56 UTC (rev 11148)
+++ spi/trunk/pom.xml 2009-11-25 07:17:57 UTC (rev 11149)
@@ -91,13 +91,6 @@
<!-- Plugins -->
<build>
- <resources>
- <resource>
- <targetPath>../etc</targetPath>
- <directory>src/main/etc</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
14 years, 4 months
JBossWS SVN: r11148 - in spi/trunk: src/main and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:15:56 -0500 (Wed, 25 Nov 2009)
New Revision: 11148
Removed:
spi/trunk/profiles-example.xml
spi/trunk/src/main/ant/
spi/trunk/src/main/etc/
Modified:
spi/trunk/pom.xml
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2009-11-25 07:09:06 UTC (rev 11147)
+++ spi/trunk/pom.xml 2009-11-25 07:15:56 UTC (rev 11148)
@@ -100,24 +100,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="version.id" value="${project.version}" />
- <property name="jboss.local.repository" value="${jboss.local.repository}" />
- <ant antfile="src/main/ant/build-install.xml" target="install" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-8</version>
Deleted: spi/trunk/profiles-example.xml
===================================================================
--- spi/trunk/profiles-example.xml 2009-11-25 07:09:06 UTC (rev 11147)
+++ spi/trunk/profiles-example.xml 2009-11-25 07:15:56 UTC (rev 11148)
@@ -1,20 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profiles>
- <profile>
- <id>user-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
- <!-- The location of the legacy jboss repository -->
- <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
- </properties>
- </profile>
- </profiles>
-
-</profilesXml>
\ No newline at end of file
14 years, 4 months
JBossWS SVN: r11147 - in common/trunk: src/main and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:09:06 -0500 (Wed, 25 Nov 2009)
New Revision: 11147
Removed:
common/trunk/profiles-example.xml
common/trunk/src/main/ant/
common/trunk/src/main/etc/
Modified:
common/trunk/pom.xml
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2009-11-25 07:06:31 UTC (rev 11146)
+++ common/trunk/pom.xml 2009-11-25 07:09:06 UTC (rev 11147)
@@ -103,33 +103,8 @@
<!-- Plugins -->
<build>
- <resources>
- <resource>
- <targetPath>../etc</targetPath>
- <directory>src/main/etc</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="version.id" value="${project.version}" />
- <property name="jboss.local.repository" value="${jboss.local.repository}" />
- <ant antfile="src/main/ant/build-install.xml" target="install" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-8</version>
Deleted: common/trunk/profiles-example.xml
===================================================================
--- common/trunk/profiles-example.xml 2009-11-25 07:06:31 UTC (rev 11146)
+++ common/trunk/profiles-example.xml 2009-11-25 07:09:06 UTC (rev 11147)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<profilesXml
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profiles>
- <profile>
- <id>user-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
- <!-- The location of the legacy jboss repository -->
- <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
- </properties>
- </profile>
- </profiles>
-
-</profilesXml>
14 years, 4 months
JBossWS SVN: r11146 - common/trunk/src/main/java/org/jboss/ws.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:06:31 -0500 (Wed, 25 Nov 2009)
New Revision: 11146
Modified:
common/trunk/src/main/java/org/jboss/ws/Constants.java
Log:
[JBWS-2838] temporary default value
Modified: common/trunk/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/Constants.java 2009-11-24 13:43:45 UTC (rev 11145)
+++ common/trunk/src/main/java/org/jboss/ws/Constants.java 2009-11-25 07:06:31 UTC (rev 11146)
@@ -325,4 +325,7 @@
static final String NETTY_MESSAGE = "org.jboss.ws.http.netty.Message";
+ // TODO: [JBWS-2838] default value have to be "false" in JBossWS 3.x series
+ static final boolean BC_CONTEXT_MODE = Boolean.parseBoolean(
+ System.getProperty("org.jboss.ws.backward_compatible_context_creator", "true"));
}
14 years, 4 months