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/03/13 17:18:08 UTC
svn commit: r517752 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator:
Messages.properties Wsdl2Java.java WsdlMerge.java
util/AbstractCommandLineApp.java
Author: aeberbac
Date: Tue Mar 13 09:18:05 2007
New Revision: 517752
URL: http://svn.apache.org/viewvc?view=rev&rev=517752
Log:
Made sure when we get the parentFile we are doing so from an absolute path perspective. Also added some message fixes and removed imports/includes when doing wsdlmerge
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/WsdlMerge.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.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=517752&r1=517751&r2=517752
==============================================================================
--- 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 Mar 13 09:18:05 2007
@@ -76,12 +76,11 @@
The following arguments are required:\n\
\ \ XXX URI\t\tThe target namespace of the generated WSDL file\n\
\ \ XXX URL\t\tThe address of the generated service\n\
-\ \ XXX FILE\t\tThe file where the merged wsdl will be written\n\n\
-FILES must be at least one WSDL file\n\n\
+\ \ XXX FILE\t\tThe file where the merged wsdl will be written\n\n\
FILES must be at least one WSDL file\n\n\
The following arguments are optional:\n\
-\ \ XXX\t\tThe file where the merged metadata will be written\n\
+\ \ XXX\t\tThe file where the merged metadata will be written\n\
\ \ XXX\t\tOverwrite files that exist\n\
\ \ XXX\t\tPrint out the version\n\
-\ \ XXX\t\t\tDisplay this message\n
+\ \ XXX\t\t\tDisplay this message
CouldNotMakeDir = Could not create the directory XXX.
NotOverwriting = Not Overwriting: XXX. Setting the overwrite parameter will force existing files to be overwritten.
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=517752&r1=517751&r2=517752
==============================================================================
--- 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 Mar 13 09:18:05 2007
@@ -141,7 +141,7 @@
if (file == null) {
InputStream inputStream = FileUtils.loadFromContext(Wsdl2Java.class,
- MUSE_BASE_DESCRIPTOR);
+ MUSE_BASE_DESCRIPTOR);
if (inputStream == null) {
throw new RuntimeException(_MESSAGES.get("FailedLoadingBuiltinDescriptor"));
}
@@ -169,7 +169,7 @@
*
* @throws Exception If anything goes wrong during code generation.
*/
- public void run() throws Exception {
+ public void run() throws Exception {
_projectizer.projectize(
_synthesizer.synthesize(
_analyzer.analyze(_configuration)
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/WsdlMerge.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/WsdlMerge.java?view=diff&rev=517752&r1=517751&r2=517752
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/WsdlMerge.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/WsdlMerge.java Tue Mar 13 09:18:05 2007
@@ -107,7 +107,7 @@
run(files, outputFileName, outputRMDFileName, overwrite, uri, address);
} catch (Exception e) {
- handleErrorAndExit(e.getMessage());
+ handleErrorAndExit(e.getMessage(), e);
}
}
@@ -116,7 +116,7 @@
MetadataDescriptor[] metadatas = new MetadataDescriptor[files.length];;
for(int i=0; i < files.length; i++) {
- Environment env = new WsdlEnvironment(files[i].getParentFile());
+ Environment env = new WsdlEnvironment(files[i].getAbsoluteFile().getParentFile());
wsdls[i] = env.getDocument(files[i].getName());
if(outputRMDFileName != null) {
metadatas[i] = getMetadataDescriptor(files[i].getName(), env, wsdls[i]);
@@ -192,6 +192,14 @@
DefinitionInfo targetDefinition = new DefinitionInfo(namespaceURI);
for (int i = 0; i < wsdlFragments.length; i++) {
+ //
+ // wsdl4j will get angry when it tries to resolve these because we're not
+ // providing the base directory since we've already read them in. So
+ // we remove the imports.
+ //
+ WsdlUtils.removeSchemaReferences(wsdlFragments[i].getDocumentElement());
+ WsdlUtils.removeWsdlReferences(wsdlFragments[i].getDocumentElement());
+
DefinitionInfo definition = new DefinitionInfo(load(wsdlFragments[i]));
copyOperations(definition, targetDefinition);
copyProperties(definition, targetDefinition);
@@ -414,9 +422,9 @@
*/
private static Definition load(Document document) {
Definition definition = null;
-
+ String parent = null;
try {
- definition = _reader.readWSDL(null, document);
+ definition = _reader.readWSDL(parent, document);
} catch (Exception e) {
//TODO fix
handleErrorAndExit(_MESSAGES.get("FailedWSDLParse"),e);
@@ -429,7 +437,7 @@
File metadataDestination = new File(fileName);
if(!metadataDestination.exists() || overwrite) {
try {
- checkParentDirectory(metadataDestination.getParentFile());
+ checkParentDirectory(metadataDestination.getAbsoluteFile().getParentFile());
Element rmdDoc = WsrmdUtils.createMetadataDocument(metadata);
FileWriter fileWriter = new FileWriter(metadataDestination);
@@ -448,7 +456,7 @@
if (!wsdlDestination.exists() || overwrite) {
try {
- checkParentDirectory(wsdlDestination.getParentFile());
+ checkParentDirectory(wsdlDestination.getAbsoluteFile().getParentFile());
Document wsdlDoc = _writer.getDocument(mergedDefinition);
FileWriter fileWriter = new FileWriter(wsdlDestination);
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java?view=diff&rev=517752&r1=517751&r2=517752
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java Tue Mar 13 09:18:05 2007
@@ -140,7 +140,7 @@
Document[] wsdlDocuments = new Document[wsdlFiles.length];
for(int i=0; i < wsdlFiles.length; i++) {
- env = new WsdlEnvironment(wsdlFiles[i].getParentFile());
+ env = new WsdlEnvironment(wsdlFiles[i].getAbsoluteFile().getParentFile());
wsdlDocuments[i] = getWSDLDocument(wsdlFiles[i].getName(), env);
}
@@ -155,7 +155,7 @@
MetadataDescriptor[] metadatas = new MetadataDescriptor[wsdlFiles.length];
for(int i=0; i < wsdlFiles.length; i++) {
- env = new WsdlEnvironment(wsdlFiles[i].getParentFile());
+ env = new WsdlEnvironment(wsdlFiles[i].getAbsoluteFile().getParentFile());
metadatas[i] = getMetadataDescriptor(wsdlFiles[i].getName(), env);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org