JBossWS SVN: r6133 - stack/cxf/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-27 14:10:28 -0400 (Thu, 27 Mar 2008)
New Revision: 6133
Modified:
stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2082] svn merge -r 6107:6108 https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-3.0.1-cxf-...
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-03-27 18:06:46 UTC (rev 6132)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-03-27 18:10:28 UTC (rev 6133)
@@ -11,12 +11,6 @@
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
org/jboss/test/ws/jaxws/smoke/tools/**
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
@@ -26,7 +20,7 @@
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
# Won't Fix: [CXF-1261] Handler does not see XOP message properly
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-03-27 18:06:46 UTC (rev 6132)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-03-27 18:10:28 UTC (rev 6133)
@@ -11,12 +11,6 @@
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
org/jboss/test/ws/jaxws/smoke/tools/**
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
@@ -26,7 +20,7 @@
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
# Won't Fix: [CXF-1261] Handler does not see XOP message properly
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-27 18:06:46 UTC (rev 6132)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-27 18:10:28 UTC (rev 6133)
@@ -8,9 +8,6 @@
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
org/jboss/test/ws/jaxws/smoke/tools/**
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -23,7 +20,7 @@
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
# Won't Fix: [CXF-1261] Handler does not see XOP message properly
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-27 18:06:46 UTC (rev 6132)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-27 18:10:28 UTC (rev 6133)
@@ -9,18 +9,12 @@
org/jboss/test/ws/jaxws/smoke/tools/**
# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
-# [EJBTHREE-1192] ClassProxyHack breaks all EJB3 endpoints
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/swaref/**
-org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
-
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
@@ -30,12 +24,11 @@
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
# Won't Fix: [CXF-1261] Handler does not see XOP message properly
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
16 years, 3 months
JBossWS SVN: r6132 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-27 14:06:46 -0400 (Thu, 27 Mar 2008)
New Revision: 6132
Modified:
stack/cxf/trunk/version.properties
Log:
[JBWS-2004] synchronizing trunk with branch
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-03-27 17:18:26 UTC (rev 6131)
+++ stack/cxf/trunk/version.properties 2008-03-27 18:06:46 UTC (rev 6132)
@@ -32,16 +32,16 @@
cxf.xmlschema=1.3.2
# Thirdparty library versions
-jbossws-spi=1.0.1.GA
-jbossws-common=snapshot
-jbossws-framework=snapshot
+jbossws-spi=1.0.2.GA
+jbossws-common=1.0.4.GA
+jbossws-framework=3.0.1.GA
jbossws-jboss42=4.2.1.GA
apache-xml-commons=1.2
ibm-wsdl4j=1.6.2
jboss-common-core=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3
+jboss-javaee=5.0.0.Beta3Update1
jboss-jaxr=1.2.0.GA
jboss-security-spi=2.0.0.Beta
stax-api=1.0
16 years, 3 months
JBossWS SVN: r6131 - in stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools: mapping and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-03-27 13:18:26 -0400 (Thu, 27 Mar 2008)
New Revision: 6131
Modified:
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
Log:
Further compliation fixes.
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-03-27 17:17:41 UTC (rev 6130)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-03-27 17:18:26 UTC (rev 6131)
@@ -55,7 +55,7 @@
/**
* Utility class that converts a XSD Type into a Java class
*/
- protected XSDTypeToJava xsdJava = new XSDTypeToJava(null);
+ protected final XSDTypeToJava xsdJava = new XSDTypeToJava(null, false);
private LiteralTypeMapping typeMapping = null;
@@ -106,7 +106,6 @@
String nsuri = type.getNamespace();
String tname = type.getName();
if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue;
- checkXSDTypeToJava();
xsdJava.createJavaFile(ctype, dirloc.getPath(), packageName, xsmodel);
}
else if (type instanceof XSSimpleTypeDefinition)
@@ -116,7 +115,6 @@
String nsuri = type.getNamespace();
String tname = type.getName();
if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue;
- checkXSDTypeToJava();
xsdJava.createJavaFile(stype, dirloc.getPath(), packageName, xsmodel);
}
}
@@ -158,16 +156,9 @@
String str = "Method should be used for anon complex types only";
if (type.getName() != null)
throw new IllegalArgumentException(str);
- checkXSDTypeToJava();
xsdJava.createJavaFile(type,outerElementName,loc.getPath(),pkgname,schema, false);
}
- private void checkXSDTypeToJava()
- {
- if(xsdJava == null)
- xsdJava = new XSDTypeToJava(null);
- xsdJava.setTypeMapping(typeMapping);
- }
}
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-03-27 17:17:41 UTC (rev 6130)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-03-27 17:18:26 UTC (rev 6131)
@@ -225,43 +225,6 @@
return jwm;
}
- public void generateJavaSourceFileForRequestResponseStruct(File location, ServiceEndpointInterfaceMapping seim, JBossXSModel xsmodel, String typeNamespace)
- throws IOException
- {
- WSDLUtils utils = WSDLUtils.getInstance();
- XSDTypeToJava xst = new XSDTypeToJava(namespacePackageMap);
- xst.setTypeMapping(this.typeMapping);
- xst.setPackageName(getPackageName(typeNamespace));
- ServiceEndpointMethodMapping[] mapArr = seim.getServiceEndpointMethodMappings();
- int len = mapArr != null ? mapArr.length : 0;
- for (int i = 0; i < len; i++)
- {
- ServiceEndpointMethodMapping mm = mapArr[i];
- String opname = mm.getJavaMethodName();
- String sei = seim.getServiceEndpointInterface();
- String plainClassName = utils.getJustClassName(sei);
- String classname = plainClassName + "_" + opname + "_RequestStruct";
- List<VAR> listInputs = new ArrayList<VAR>();
- MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings();
- int lenmppmarr = mppmarr != null ? mppmarr.length : 0;
- for (int j = 0; j < lenmppmarr; j++)
- {
- listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false));
- }
- JavaWriter jw = new JavaWriter();
- jw.createJavaFile(location, classname, getPackageName(typeNamespace), listInputs, null, null, false, null);
- classname = plainClassName + "_" + opname + "_ResponseStruct";
- XSTypeDefinition xt = xsmodel.getTypeDefinition(opname + "Response", typeNamespace);
- List<VAR> listOutputs = new ArrayList<VAR>();
- if (xt instanceof XSSimpleTypeDefinition)
- {
- listOutputs.add(new VAR(Constants.DEFAULT_RPC_RETURN_NAME, xt.getName(), false));
- }
- else listOutputs.addAll(xst.getVARList((XSComplexTypeDefinition)xt, xsmodel, false));
- jw.createJavaFile(location, classname, getPackageName(typeNamespace), listOutputs, null, null, false, null);
- }
- }
-
//PRIVATE METHODS
private boolean isServerSideGeneration()
{
16 years, 3 months
JBossWS SVN: r6127 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-27 13:05:54 -0400 (Thu, 27 Mar 2008)
New Revision: 6127
Modified:
common/trunk/version.properties
Log:
changing version properties accordingly
Modified: common/trunk/version.properties
===================================================================
--- common/trunk/version.properties 2008-03-27 17:04:14 UTC (rev 6126)
+++ common/trunk/version.properties 2008-03-27 17:05:54 UTC (rev 6127)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-3.0
-version.id=snapshot
+version.id=2.0.5.DEV
repository.id=snapshot
implementation.url=http://www.jboss.org/products/jbossws
16 years, 3 months
JBossWS SVN: r6126 - in stack/native/branches/dlofthouse/JBWS-1278/src: main/java/org/jboss/ws/tools/config and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-03-27 13:04:14 -0400 (Thu, 27 Mar 2008)
New Revision: 6126
Modified:
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/Configuration.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/JavaWriter.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
stack/native/branches/dlofthouse/JBWS-1278/src/main/resources/schema/jbossws-tool_1_0.xsd
stack/native/branches/dlofthouse/JBWS-1278/src/test/resources/tools/jbws1278/doclit/wstools-config.xml
Log:
Feature implementation.
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/Configuration.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/Configuration.java 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/Configuration.java 2008-03-27 17:04:14 UTC (rev 6126)
@@ -140,6 +140,8 @@
public String wsdlLocation;
// Parameter style {"wrapped", "bare"}
public String parameterStyle = "wrapped";
+ // Should generated types be Serializable?
+ public boolean serializableTypes;
// Is a jaxrpc-mapping file needed?
public boolean mappingFileNeeded;
// Name of the jaxrpc-mapping file
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/JavaWriter.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-03-27 17:04:14 UTC (rev 6126)
@@ -192,7 +192,7 @@
* @throws IOException
*/
public void createJavaFile(File location, String filename, String packageName, List<VAR> vars, List<String> importList, String baseTypeName,
- boolean isExceptionType, Map<String, List> typeNameToBaseVARList) throws IOException
+ boolean isExceptionType, boolean isSerializable, Map<String, List> typeNameToBaseVARList) throws IOException
{
File newLoc = null;
if (needToCreatePackageStructure(location, packageName))
@@ -217,6 +217,8 @@
buffer.append(newline).append("public class ").append(classname).append(newline);
if (baseTypeName != null && baseTypeName.length() > 0)
buffer.append(" extends ").append(baseTypeName);
+ if (isSerializable)
+ buffer.append(" implements java.io.Serializable");
buffer.append("{").append(newline);
createVariables(buffer, vars, isExceptionType);
createCTR(buffer, classname, vars, isExceptionType, typeNameToBaseVARList);
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-03-27 17:04:14 UTC (rev 6126)
@@ -96,6 +96,7 @@
protected boolean annotate = false;
protected Map<String, String> namespacePackageMap = null;
+ protected boolean generateSerializableTypes = false;
protected HolderWriter holderWriter = new HolderWriter();
@@ -207,6 +208,16 @@
namespacePackageMap.put(pkg, map.get(pkg));
}
}
+
+ public boolean isGenerateSerializableTypes()
+ {
+ return generateSerializableTypes;
+ }
+
+ public void setGenerateSerializableTypes(boolean generateSerializableTypes)
+ {
+ this.generateSerializableTypes = generateSerializableTypes;
+ }
public void setTypeMapping(LiteralTypeMapping tm)
{
@@ -808,7 +819,7 @@
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException
{
- XSDTypeToJava xtj = new XSDTypeToJava(namespacePackageMap);
+ XSDTypeToJava xtj = new XSDTypeToJava(namespacePackageMap, generateSerializableTypes);
xtj.setTypeMapping(this.typeMapping);
String targetNS = wsdl.getTargetNamespace();
String tgtNS = xt.getNamespace();
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-03-27 17:04:14 UTC (rev 6126)
@@ -77,6 +77,7 @@
private Set<String> generatedFiles = new HashSet<String>();
protected Map<String, String> namespacePackageMap = null;
+ protected boolean serializableTypes;
/**
* List that is used for exception inheritance case wherein the variables
@@ -85,9 +86,10 @@
*/
private Map<String, List> typeNameToBaseVARList = new HashMap<String, List>();
- public XSDTypeToJava(Map<String, String> map)
+ public XSDTypeToJava(Map<String, String> map, boolean serializableTypes)
{
this.namespacePackageMap = map;
+ this.serializableTypes = serializableTypes;
}
public void createJavaFile(XSComplexTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException
@@ -164,7 +166,8 @@
baseName = getPackageName(baseType.getNamespace()) + "." + baseName;
}
String packageName = getPackageName(type.getNamespace());
- jwriter.createJavaFile(getLocationForJavaGeneration(packageName), fname, packageName, vars, null, baseName, isExceptionType, typeNameToBaseVARList);
+ jwriter.createJavaFile(getLocationForJavaGeneration(packageName), fname, packageName, vars, null, baseName, isExceptionType, serializableTypes,
+ typeNameToBaseVARList);
}
public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) throws IOException
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-03-27 17:04:14 UTC (rev 6126)
@@ -81,6 +81,7 @@
private static final String RETURN_XML_NAME_ATTRIBUTE = "return-xml-name";
private static final String ONEWAY_ATTRIBUTE = "one-way";
private static final String PARAMETER_STYLE_ATTRIBUTE = "parameter-style";
+ private static final String SERIALIZABLE_TYPES_ATTRIBUTE = "serializable-types";
private static final String STYLE_ATTRIBUTE = "style";
private static final String ENDPOINT_ATTRIBUTE = "endpoint";
private static final String NAME_ATTRIBUTE = "name";
@@ -179,7 +180,10 @@
String paramStyle = attrs.getValue(PARAMETER_STYLE_ATTRIBUTE);
if (paramStyle != null)
wsdl2jc.parameterStyle = paramStyle;
-
+ String serializableTypes = attrs.getValue(SERIALIZABLE_TYPES_ATTRIBUTE);
+ if ("true".equals(serializableTypes) || "1".equals(serializableTypes))
+ wsdl2jc.serializableTypes = true;
+
return wsdl2jc;
}
else if (GLOBAL_TAG.equals(localName))
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-03-27 17:04:14 UTC (rev 6126)
@@ -28,7 +28,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -64,9 +63,10 @@
import org.jboss.ws.tools.interfaces.WebservicesXMLCreator;
import org.jboss.ws.tools.mapping.MappingFileGenerator;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.common.JavaUtils;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.*;
/**
* Helper class used by the cmd line tool "jbossws"
@@ -225,7 +225,7 @@
}
JavaWriter writer = new JavaWriter();
- writer.createJavaFile(new File(outDir), name + ".java", packageName, vars, null, null, false, null);
+ writer.createJavaFile(new File(outDir), name + ".java", packageName, vars, null, null, false, false, null);
JavaXmlTypeMapping type = mappingIndex.get(parameter.getXmlType());
if (type == null)
@@ -262,6 +262,7 @@
WSDLToJava wsdlToJava = new WSDLToJava();
wsdlToJava.setTypeMapping(new LiteralTypeMapping());
+ wsdlToJava.setGenerateSerializableTypes(w2jc.serializableTypes);
WSDLDefinitions wsdl = null;
try
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/resources/schema/jbossws-tool_1_0.xsd
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/main/resources/schema/jbossws-tool_1_0.xsd 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/main/resources/schema/jbossws-tool_1_0.xsd 2008-03-27 17:04:14 UTC (rev 6126)
@@ -247,6 +247,11 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="serializable-types" type="xs:boolean" use="optional">
+ <xs:annotation>
+ <xs:documentation>Should generated types implement java.io.Serializable, default to false.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:complexType>
<xs:complexType name="parameterType">
<xs:attribute name="type" use="required">
Modified: stack/native/branches/dlofthouse/JBWS-1278/src/test/resources/tools/jbws1278/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1278/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-03-27 17:02:13 UTC (rev 6125)
+++ stack/native/branches/dlofthouse/JBWS-1278/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-03-27 17:04:14 UTC (rev 6126)
@@ -1,6 +1,7 @@
<configuration>
<wsdl-java location="resources/tools/jbws1278/doclit/PhoneBook.wsdl"
- parameter-style="bare">
+ parameter-style="bare"
+ serializable-types="true">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
16 years, 3 months
JBossWS SVN: r6125 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-27 13:02:13 -0400 (Thu, 27 Mar 2008)
New Revision: 6125
Modified:
framework/trunk/version.properties
Log:
[JBWS-2004] changing trunk version properties accordingly
Modified: framework/trunk/version.properties
===================================================================
--- framework/trunk/version.properties 2008-03-27 16:51:03 UTC (rev 6124)
+++ framework/trunk/version.properties 2008-03-27 17:02:13 UTC (rev 6125)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-3.0
-version.id=3.0.1.DEV
+version.id=3.0.2.DEV
repository.id=snapshot
implementation.title=JBoss Web Services - Framework
16 years, 3 months