2:21 p.m.
Author: jason.greene(a)jboss.com
Date: 2007-02-23 15:21:21 -0500 (Fri, 23 Feb 2007)
New Revision: 2457
Modified:
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java
trunk/jbossws-core/src/main/resources/jbossws.war/index.html
Log:
Merge all changes missing from trunk
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-02-23 20:20:22 UTC (rev 2456)
+++ trunk/jbossws-core/build.xml 2007-02-23 20:21:21 UTC (rev 2457)
@@ -164,8 +164,8 @@
</fileset>
<zipfileset dir="${etc.dir}" filemode="755">
<include name="wsprovide.sh"/>
+ <include name="wsconsume.sh"/>
<include name="wsrunclient.sh"/>
- <include name="wsconsume.sh"/>
<include name="wstools.sh"/>
</zipfileset>
</jar>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java 2007-02-23
20:20:22 UTC (rev 2456)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java 2007-02-23
20:21:21 UTC (rev 2457)
@@ -85,7 +85,7 @@
if(endpoints.isEmpty())
{
writer.print("<tr>");
- writer.print(" <td><h3>There currently no endpoints
deployed</h3></td>");
+ writer.print(" <td><h3>There are currently no endpoints
deployed</h3></td>");
writer.print("</tr>");
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-23
20:20:22 UTC (rev 2456)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-23
20:21:21 UTC (rev 2457)
@@ -124,6 +124,7 @@
{
if (log.isTraceEnabled())
log.trace("register: TypeMappingImpl@" + hashCode() + "
[xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf="
+ sf + ",df=" + df + "]");
+
registerInternal(javaType, new IQName(xmlType), sf, df);
keyPairCache.clear();
}
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-23
20:20:22 UTC (rev 2456)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-23
20:21:21 UTC (rev 2457)
@@ -32,9 +32,9 @@
import java.io.StringWriter;
import java.lang.reflect.Constructor;
import java.net.InetAddress;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-23 20:20:22
UTC (rev 2456)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-23 20:21:21
UTC (rev 2457)
@@ -170,6 +170,7 @@
URL orgURL = locs.get(nsURI);
URL resURL = resolveNamespaceURI(resolver, nsURI);
URL url = resURL != null ? resURL : orgURL;
+
log.debug("Load schema: " + nsURI + "=" + url);
XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(),
null);
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-02-23
20:20:22 UTC (rev 2456)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-02-23
20:21:21 UTC (rev 2457)
@@ -533,58 +533,6 @@
return true;
}
- private void unwrapResponse(ServiceEndpointMethodMapping methodMapping, QName
messageName, XSTypeDefinition xt)
- {
- if (xt instanceof XSComplexTypeDefinition == false)
- throw new WSException("Tried to unwrap a non-complex type.");
-
- XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
- XSParticle particle = wrapper.getParticle();
- XSTerm term = particle.getTerm();
- if (term instanceof XSModelGroup == false)
- throw new WSException("Expected model group, could not unwrap");
- unwrapResponseParticles(methodMapping, messageName, (XSModelGroup)term);
- }
-
- private boolean unwrapResponseParticles(ServiceEndpointMethodMapping methodMapping,
QName messageName, XSModelGroup group)
- {
- if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE)
- throw new WSException("Only a sequence type can be unwrapped.");
-
- XSObjectList particles = group.getParticles();
-
- for (int i = 0; i < particles.getLength(); i++)
- {
- XSParticle particle = (XSParticle)particles.item(i);
- XSTerm term = particle.getTerm();
- if (term instanceof XSModelGroup)
- {
- if (unwrapResponseParticles(methodMapping, messageName, (XSModelGroup)term))
- return true;
- }
- else if (term instanceof XSElementDeclaration)
- {
- XSElementDeclaration element = (XSElementDeclaration)term;
- QName xmlName = new QName(element.getNamespace(), element.getName());
- QName xmlType = new QName(element.getTypeDefinition().getNamespace(),
element.getTypeDefinition().getName());
- boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs()
> 1;
- boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0
&& particle.getMaxOccurs() == 1));
-
- String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
-
- WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(methodMapping);
- wrvm.setMethodReturnValue(javaType);
- wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(),
messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS));
- wrvm.setWsdlMessagePartName(xmlName.getLocalPart());
- methodMapping.setWsdlReturnValueMapping(wrvm);
-
- return true;
- }
- }
-
- return false;
- }
-
private void checkEssentials()
{
if (typeMapping == null)
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-02-23
20:20:22 UTC (rev 2456)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-02-23
20:21:21 UTC (rev 2457)
@@ -45,7 +45,7 @@
* -h, --help Show this help message
* -k, --keep Keep/Generate Java source
* -w, --wsdl Enable WSDL file generation
- * -c, --classpath=<directory> The classpath that contains the endpoint
+ * -c. --classpath=<path< The classpath that contains the endpoint
* -o, --output=<directory> The directory to put generated artifacts
* -r, --resource=<directory> The directory to put resource artifacts
* -s, --source=<directory> The directory to put Java source
@@ -214,7 +214,7 @@
out.println(" -h, --help Show this help message");
out.println(" -k, --keep Keep/Generate Java
source");
out.println(" -w, --wsdl Enable WSDL file
generation");
- out.println(" -c, --classpath=<directory> The classpath that contains
the endpoint");
+ out.println(" -c. --classpath=<path> The classpath that contains
the endpoint");
out.println(" -o, --output=<directory> The directory to put
generated artifacts");
out.println(" -r, --resource=<directory> The directory to put
resource artifacts");
out.println(" -s, --source=<directory> The directory to put Java
source");
Modified: trunk/jbossws-core/src/main/resources/jbossws.war/index.html
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws.war/index.html 2007-02-23 20:20:22 UTC
(rev 2456)
+++ trunk/jbossws-core/src/main/resources/jbossws.war/index.html 2007-02-23 20:21:21 UTC
(rev 2457)
@@ -9,7 +9,7 @@
<div class="pageSection">
<h2>J2EE compatible web services</h2>
-After JBoss J2EE-1.4 certification in Jun/2004 we have decided to develop our own JAX-RPC
1.1 / JAX-WS compliant SOAP stack that fits better in the overall JBoss architecture and
is generally more suiteable for the specific J2EE requirements for web services.
+JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss'
JavaEE5 offering.
</div>
<div class="pageSection">
@@ -60,4 +60,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>