You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by ae...@apache.org on 2007/01/02 19:52:31 UTC
svn commit: r491893 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator:
./ synthesizer/ util/
Author: aeberbac
Date: Tue Jan 2 10:52:30 2007
New Revision: 491893
URL: http://svn.apache.org/viewvc?view=rev&rev=491893
Log:
MUSE-166: added support for the -headers flag. This covers the server synthesizer, but the proxy has support which will be rewritten as per 118.
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/ConfigurationData.java
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties?view=diff&rev=491893&r1=491892&r2=491893
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties Tue Jan 2 10:52:30 2007
@@ -31,6 +31,7 @@
\ \ XXX\t\t\tGenerate an OSGi project\n\
\ \ XXX\t\t\tGenerate a Mini SOAP Engine project\n\
\ \ XXX\t\tGenerate a proxy project\n\
+\ \ XXX\t\tGenerate a custom headers parameter in operations\n\
\ \ XXX\t\tTurn off all messages\n\
\ \ XXX\t\tTurn on verbose output\n\
\ \ XXX\t\t\tDisplay a simple help message\n\
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java?view=diff&rev=491893&r1=491892&r2=491893
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java Tue Jan 2 10:52:30 2007
@@ -68,7 +68,7 @@
* @throws Exception
*/
public Wsdl2Java(File wsdlFile) throws Exception {
- this(wsdlFile, null, false);
+ this(wsdlFile, null, false, false);
}
/**
@@ -81,7 +81,7 @@
* @throws Exception
*/
public Wsdl2Java(File wsdlFile, boolean overwrite) throws Exception {
- this(wsdlFile, null, overwrite);
+ this(wsdlFile, null, overwrite, false);
}
/**
@@ -91,9 +91,10 @@
* @param wsdlFile The WSDL file to analyze.
* @param descriptorFile The Muse descriptor (can be null).
* @param overwrite Whether or not to overwrite existing files.
+ * @param generateHeaders
* @throws Exception
*/
- public Wsdl2Java(File wsdlFile, File descriptorFile, boolean overwrite) throws Exception {
+ public Wsdl2Java(File wsdlFile, File descriptorFile, boolean overwrite, boolean generateCustomHeaders) throws Exception {
Document descriptorDocument = getDescriptorDocument(descriptorFile);
Document[] wsdlDocuments = getWSDLDocuments(wsdlFile, descriptorFile, descriptorDocument);
@@ -102,6 +103,7 @@
_configuration.addParameter(ConfigurationData.WSDL_DOCUMENT_LIST, wsdlDocuments);
_configuration.addParameter(ConfigurationData.DESCRIPTOR_DOCUMENT, descriptorDocument);
_configuration.addParameter(ConfigurationData.OVERWRITE, Boolean.valueOf(overwrite));
+ _configuration.addParameter(ConfigurationData.GENERATE_CUSTOM_HEADERS, Boolean.valueOf(generateCustomHeaders));
}
private Document getDescriptorDocument(File file) {
@@ -238,6 +240,7 @@
checkBaseDescriptorArg(arguments);
boolean overwrite = checkOverwriteArg(arguments);
+ boolean generateCustomHeaders = checkHeadersFlag(arguments);
File wsdl = checkWsdlArg(arguments);
File descriptorFile = checkDescriptorArg(arguments);
@@ -247,7 +250,7 @@
Wsdl2Java app = null;
try {
- app = new Wsdl2Java(wsdl, descriptorFile, overwrite);
+ app = new Wsdl2Java(wsdl, descriptorFile, overwrite, generateCustomHeaders);
app.setAnalyzer(analyzer);
app.setSynthesizer(synthesizer);
app.setProjectizer(projectizer);
@@ -264,6 +267,10 @@
}
}
+ private static boolean checkHeadersFlag(CommandLine arguments) {
+ return arguments.hasFlag(Wsdl2JavaConstants.HEADERS_FLAG);
+ }
+
/**
* Wraps the raw command line parameters into a <code>CommandLine</code>
* which will manage finding the flags passed in on the command line.
@@ -307,6 +314,7 @@
OSGI_FLAG,
MINI_FLAG,
PROXY_FLAG,
+ HEADERS_FLAG,
QUIET_FLAG,
VERBOSE_FLAG,
HELP_FLAG,
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java?view=diff&rev=491893&r1=491892&r2=491893
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java Tue Jan 2 10:52:30 2007
@@ -58,5 +58,7 @@
String PROXY_FLAG = "-proxy";
+ String HEADERS_FLAG = "-headers";
+
String MUSE_BASE_DESCRIPTOR = "/resources/common/muse.xml";
}
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java?view=diff&rev=491893&r1=491892&r2=491893
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java Tue Jan 2 10:52:30 2007
@@ -56,7 +56,7 @@
{
static ConfigurationDataDescriptor[] REQUIRED_PARAMETERS =
new ConfigurationDataDescriptor[] {
-
+ ConfigurationData.GENERATE_CUSTOM_HEADERS_CONFIGURATION
};
private static final String TARGET_NS_ATTR = "targetNamespace";
@@ -66,6 +66,8 @@
private int _prefixCounter = 0;
private HashMap _prefixes = new HashMap();
+
+ private boolean _generateCustomHeaders;
private String createProxyClass(ResourceInspector inspector,
String interfaceName,
@@ -445,6 +447,14 @@
writer.append(", ");
}
+ if(_generateCustomHeaders) {
+ if(types.length > 0) {
+ writer.append(", ");
+ }
+
+ writer.append("Element[] customHeaders");
+ }
+
writer.append(")\n");
}
@@ -1077,6 +1087,9 @@
public ConfigurationData synthesize(ConfigurationData data) throws Exception {
Document[] wsdlDocuments = (Document[]) data.getParameter(ConfigurationData.WSDL_DOCUMENT_LIST);
+
+ _generateCustomHeaders = ((Boolean)data.getParameter(ConfigurationData.GENERATE_CUSTOM_HEADERS)).booleanValue();
+
Map[] filesMaps = new HashMap[wsdlDocuments.length];
for(int i = 0; i < wsdlDocuments.length; i++) {
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java?view=diff&rev=491893&r1=491892&r2=491893
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java Tue Jan 2 10:52:30 2007
@@ -33,6 +33,7 @@
import org.apache.muse.tools.inspector.JavaProperty;
import org.apache.muse.util.ReflectUtils;
import org.apache.muse.ws.resource.impl.AbstractWsResourceCapability;
+import org.w3c.dom.Element;
/**
* A <code>Synthesizer</code> implementation that creates
@@ -61,15 +62,20 @@
protected Map[] _filesMaps = null;
+
+ private boolean _generateCustomHeaders;
static ConfigurationDataDescriptor[] REQUIRED_PARAMETERS =
new ConfigurationDataDescriptor[] {
ConfigurationData.CAPABILITIES_MAP_LIST_CONFIGURATION,
+ ConfigurationData.GENERATE_CUSTOM_HEADERS_CONFIGURATION
};
public ConfigurationData synthesize(ConfigurationData configuration) throws Exception {
ConfigurationData.checkConfiguration(this, configuration);
+ _generateCustomHeaders = ((Boolean)configuration.getParameter(ConfigurationData.GENERATE_CUSTOM_HEADERS)).booleanValue();
+
Map[] capabilityMaps = (Map[])configuration.getParameter(ConfigurationData.CAPABILITIES_MAP_LIST);
_filesMaps = new HashMap[capabilityMaps.length];
@@ -275,6 +281,13 @@
+ getParamName(paramNames[j], j));
}
+ if(_generateCustomHeaders) {
+ if(params.length > 0) {
+ code.append(", ");
+ }
+ code.append("Element[] customHeaders");
+ }
+
code.append(") throws Exception");
if(generateBody) {
@@ -403,6 +416,10 @@
for (Iterator i = imports.iterator(); i.hasNext(); ) {
generateImport((Class)i.next(),code);
+ }
+
+ if(_generateCustomHeaders) {
+ generateImport(Element.class, code);
}
newLine(code);
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/ConfigurationData.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/ConfigurationData.java?view=diff&rev=491893&r1=491892&r2=491893
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/ConfigurationData.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/ConfigurationData.java Tue Jan 2 10:52:30 2007
@@ -87,6 +87,13 @@
new ConfigurationDataDescriptor(
TARGET_DIRECTORY,
File.class);
+
+ public static final String GENERATE_CUSTOM_HEADERS = "generate_custom_headers";
+
+ public static final ConfigurationDataDescriptor GENERATE_CUSTOM_HEADERS_CONFIGURATION =
+ new ConfigurationDataDescriptor(
+ GENERATE_CUSTOM_HEADERS,
+ Boolean.class);
private static Messages _MESSAGES = MessagesFactory.get(ConfigurationData.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org