Author: mageshbk(a)jboss.com
Date: 2008-01-02 03:09:38 -0500 (Wed, 02 Jan 2008)
New Revision: 5389
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
Log:
[JBWS-1900] JBWS-1217 - Modified for default behavior to remain as it was before the
changes
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-02
07:47:51 UTC (rev 5388)
+++
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-02
08:09:38 UTC (rev 5389)
@@ -836,6 +836,8 @@
}
}
- return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return seiPkgName;
}
}
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-02
07:47:51 UTC (rev 5388)
+++
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-02
08:09:38 UTC (rev 5389)
@@ -98,6 +98,7 @@
private WSDLDefinitions wsdlDefinitions = null;
private String typeNamespace;
private String serviceName = null;
+ private String packageName = null;
private Map<String, String> namespacePackageMap = null;
private Set<String> registeredTypes = new HashSet<String>();
private Set<String> registeredExceptions = new HashSet<String>();
@@ -113,6 +114,8 @@
{
this.wsdlDefinitions = wsdl;
this.serviceName = sname;
+ String targetNS = wsdl.getTargetNamespace();
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
this.namespacePackageMap = map;
this.typeMapping = ltm;
@@ -968,6 +971,7 @@
return pkg;
}
}
- return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return packageName;
}
}
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-01-02
07:47:51 UTC (rev 5388)
+++
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-01-02
08:09:38 UTC (rev 5389)
@@ -303,7 +303,7 @@
wsdlToJava.generateSEI(wsdl, new File(outDir));
//Generate the Service File
- this.generateServiceFile(getPackageName(wsdl.getTargetNamespace(), glc), wsdl,
outDir);
+ this.generateServiceFile(getPackageName(wsdl, glc), wsdl, outDir);
//Generate the Mapping File
if (w2jc.mappingFileNeeded)
@@ -332,7 +332,7 @@
if (wsdl.getInterfaces().length == 1)
{
- String seiPackage = getPackageName(wsdl.getTargetNamespace(), glc);
+ String seiPackage = getPackageName(wsdl, glc);
seiName = seiPackage + "." +
wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]);
}
@@ -396,8 +396,9 @@
sc.createServiceDescriptor();
}
- private String getPackageName(String targetNamespace, GlobalConfig glc)
+ private String getPackageName(WSDLDefinitions wsdl, GlobalConfig glc)
{
+ String targetNamespace = wsdl.getTargetNamespace();
//Get it from global config if it is overriden
if (glc != null && glc.packageNamespaceMap != null)
{
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-01-02
07:47:51 UTC (rev 5388)
+++
legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-01-02
08:09:38 UTC (rev 5389)
@@ -80,6 +80,11 @@
protected String serviceName;
/**
+ * SEI Package Name to override
+ */
+ protected String packageName;
+
+ /**
* Service Endpoint Interface (if available).
* <br/> Will be available for server side generation (Java -> WSDL)
*/
@@ -95,6 +100,8 @@
public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM)
{
this.wsdlDefinitions = wsdl;
+ String targetNS = wsdl.getTargetNamespace();
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
this.typeMapping = (LiteralTypeMapping)typeM;
}
@@ -111,6 +118,19 @@
this.wsdlDefinitions = wsdlDefinitions;
}
+ /**
+ * @return @see #packageName
+ */
+ public String getPackageName()
+ {
+ return packageName;
+ }
+
+ public void setPackageName(String packageName)
+ {
+ this.packageName = packageName;
+ }
+
public Map<String, String> getNamespacePackageMap()
{
return namespacePackageMap;
@@ -242,6 +262,7 @@
return pkg;
}
}
- return NamespacePackageMapping.getJavaPackageName(targetNamespace);
+ //Default behaviour will always generate all classes in the SEI package only
+ return packageName;
}
}
Show replies by date