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/06 17:01:17 UTC
svn commit: r493494 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator:
Wsdl2Java.java Wsdl2JavaConstants.java WsdlMerge.java
util/AbstractCommandLineApp.java util/Messages.properties
Author: aeberbac
Date: Sat Jan 6 08:01:16 2007
New Revision: 493494
URL: http://svn.apache.org/viewvc?view=rev&rev=493494
Log:
MUSE-126: added version flag to both command line apps.
Modified:
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/WsdlMerge.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties
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=493494&r1=493493&r2=493494
==============================================================================
--- 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 Sat Jan 6 08:01:16 2007
@@ -236,6 +236,8 @@
createLogger(arguments);
checkHelpArg(arguments);
+
+ checkVersionArg(arguments);
checkBaseDescriptorArg(arguments);
@@ -267,6 +269,25 @@
}
}
+ /**
+ * Print the version and exit.
+ *
+ * @param arguments Command line arguments
+ */
+ private static void checkVersionArg(CommandLine arguments) {
+ if(arguments.hasFlag(Wsdl2JavaConstants.VERSION_FLAG)) {
+ handleMessage(getVersion());
+ handleExit();
+ }
+ }
+
+ /**
+ * Check to see if the flag was given to generate parameters
+ * for customer headers.
+ *
+ * @param arguments Command line arguments
+ * @return True if the arguments contain the headers flag
+ */
private static boolean checkHeadersFlag(CommandLine arguments) {
return arguments.hasFlag(Wsdl2JavaConstants.HEADERS_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=493494&r1=493493&r2=493494
==============================================================================
--- 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 Sat Jan 6 08:01:16 2007
@@ -60,5 +60,7 @@
String HEADERS_FLAG = "-headers";
+ String VERSION_FLAG = "-version";
+
String MUSE_BASE_DESCRIPTOR = "/resources/common/muse.xml";
}
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=493494&r1=493493&r2=493494
==============================================================================
--- 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 Sat Jan 6 08:01:16 2007
@@ -86,6 +86,8 @@
checkHelpArg(arguments);
+ checkVersionArg(arguments);
+
String uri = checkUriArg(arguments);
String address = checkAddressArg(arguments);
String outputFileName = checkOutputArg(arguments);
@@ -110,6 +112,18 @@
} catch (Exception e) {
Object[] filler = { output.getAbsolutePath() };
handleErrorAndExit(_MESSAGES.get("FailedWSDLWrite",filler), e);
+ }
+ }
+
+ /**
+ * Print the version and exit.
+ *
+ * @param arguments Command line arguments
+ */
+ private static void checkVersionArg(CommandLine arguments) {
+ if(arguments.hasFlag(Wsdl2JavaConstants.VERSION_FLAG)) {
+ handleMessage(getVersion());
+ handleExit();
}
}
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=493494&r1=493493&r2=493494
==============================================================================
--- 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 Sat Jan 6 08:01:16 2007
@@ -17,6 +17,9 @@
package org.apache.muse.tools.generator.util;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -24,6 +27,7 @@
import org.apache.muse.core.Environment;
import org.apache.muse.tools.generator.Wsdl2JavaConstants;
import org.apache.muse.util.CommandLine;
+import org.apache.muse.util.FileUtils;
import org.apache.muse.util.messages.Messages;
import org.apache.muse.util.messages.MessagesFactory;
import org.apache.muse.ws.wsdl.WsdlUtils;
@@ -40,6 +44,10 @@
public class AbstractCommandLineApp {
public static final String TOP_LEVEL_PACKAGE = "org.apache.muse.tools";
+
+ public static final String PATH_TO_POM_PROPERTIES = "/META-INF/maven/muse/muse-tools/pom.properties";
+
+ public static final String VERSION_PROPERTY = "version";
private static Messages _MESSAGES = MessagesFactory.get(AbstractCommandLineApp.class);
@@ -227,4 +235,28 @@
protected static boolean checkOverwriteArg(CommandLine arguments) {
return arguments.hasFlag(Wsdl2JavaConstants.OVERWRITE_FLAG);
}
-}
+
+ /**
+ * Get the version out of maven metadata that's left
+ * from the build. If it isn't available or something else
+ * goes wrong it will return a default message.
+ *
+ * @return The version of this code
+ */
+ public static String getVersion() {
+ String version = _MESSAGES.get("DefaultVersion");
+ InputStream versionIS = FileUtils.loadFromContext(AbstractCommandLineApp.class, PATH_TO_POM_PROPERTIES);
+
+ if(versionIS != null) {
+ Properties properties = new Properties();
+ try {
+ properties.load(versionIS);
+ return properties.getProperty(VERSION_PROPERTY);
+ } catch (IOException e) {
+ //fall through to return
+ }
+ }
+
+ return version;
+ }
+}
\ No newline at end of file
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties?view=diff&rev=493494&r1=493493&r2=493494
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties Sat Jan 6 08:01:16 2007
@@ -14,6 +14,7 @@
FailedLoadingWSDL = Got exception loading WSDL: XXX.
GotException = Caught an exception: XXX.
NullWSDLBuiltinDescriptor = You cannot specify no WSDL file and no descriptor file. You must specify at least one of the two.
+DefaultVersion = No version information is available. This is probably a custom build.
NoPortType = No portType element found in the WSDL document.
NoPortTypeName = No "name" attribute on the portType.
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org