You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/11/19 21:29:36 UTC
svn commit: r719058 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate/src/main/assembly/
plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/
plugins/cxf/geronimo-cxf-tools/src/main/resources/
Author: gawor
Date: Wed Nov 19 12:29:35 2008
New Revision: 719058
URL: http://svn.apache.org/viewvc?rev=719058&view=rev
Log:
rename java2wsdl to java2ws command to match cxf name (part of GERONIMO-4351)
Added:
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java (contents, props changed)
- copied, changed from r719035, geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSDLCommand.java
Removed:
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSDLCommand.java
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/JAXWSToolsCLI.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=719058&r1=719057&r2=719058&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml Wed Nov 19 12:29:35 2008
@@ -64,6 +64,7 @@
<include>com.thoughtworks.xstream:xstream</include>
<include>org.apache.geronimo.framework:geronimo-cli</include>
<include>org.apache.geronimo.framework:geronimo-kernel</include>
+ <include>org.apache.geronimo.framework:geronimo-system</include>
<include>org.apache.geronimo.framework:geronimo-deploy-jsr88-bootstrapper</include>
<include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>
<include>org.apache.geronimo.framework:geronimo-transformer</include>
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/JAXWSToolsCLI.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/JAXWSToolsCLI.java?rev=719058&r1=719057&r2=719058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/JAXWSToolsCLI.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/JAXWSToolsCLI.java Wed Nov 19 12:29:35 2008
@@ -43,12 +43,12 @@
private static final String CONFIG_ID = "org.apache.geronimo.configs/cxf-tools//car";
- enum Command { JAVA2WSDL, WSDL2JAVA };
+ enum Command { JAVA2WS, WSDL2JAVA };
private static final String USAGE_MSG =
"Usage: jaxws-tools <toolName> <tool options>\n\n" +
"where <toolName> is:\n" +
- " java2wsdl - generate portable artifacts from class\n" +
+ " java2ws - generate portable artifacts from class\n" +
" wsdl2java - generate portable artifacts from WSDL\n";
public static void main(String[] args) throws Throwable {
@@ -59,7 +59,7 @@
Command cmd = null;
if (args[0].equalsIgnoreCase("java2wsdl")) {
- cmd = Command.JAVA2WSDL;
+ cmd = Command.JAVA2WS;
} else if (args[0].equalsIgnoreCase("wsdl2java")) {
cmd = Command.WSDL2JAVA;
} else {
@@ -101,8 +101,8 @@
System.setProperty("java.class.path", classPath);
try {
- if (cmd.equals(Command.JAVA2WSDL)) {
- invokeJava2WSDL(classLoader, args);
+ if (cmd.equals(Command.JAVA2WS)) {
+ invokeJava2WS(classLoader, args);
} else if (cmd.equals(Command.WSDL2JAVA)) {
invokeWSDL2Java(classLoader, args);
} else {
@@ -125,7 +125,7 @@
return true;
}
- private static void invokeJava2WSDL(ClassLoader classLoader, String [] args) throws Exception {
+ private static void invokeJava2WS(ClassLoader classLoader, String [] args) throws Exception {
Class clazz = classLoader.loadClass("org.apache.cxf.tools.java2ws.JavaToWS");
Method method = clazz.getMethod("main", new Class[] {String[].class});
method.invoke(null, new Object [] {args});
Copied: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java (from r719035, geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSDLCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java?p2=geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java&p1=geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSDLCommand.java&r1=719035&r2=719058&rev=719058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSDLCommand.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java Wed Nov 19 12:29:35 2008
@@ -28,8 +28,8 @@
/**
* GShell command for java2wsdl tool.
*/
-@CommandComponent(id="geronimo-cxf-tools:java2wsdl", description="Generate JAX-WS artifacts from class")
-public class Java2WSDLCommand extends CommandSupport {
+@CommandComponent(id="geronimo-cxf-tools:java2ws", description="Generate JAX-WS artifacts from class")
+public class Java2WSCommand extends CommandSupport {
@Requirement
ShellInfo shellInfo;
@@ -39,7 +39,7 @@
init(context);
String[] arguments = toString(args);
- return JAXWSToolsCLI.run(JAXWSToolsCLI.Command.JAVA2WSDL,
+ return JAXWSToolsCLI.run(JAXWSToolsCLI.Command.JAVA2WS,
shellInfo.getHomeDir().getAbsolutePath(),
arguments);
}
Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties?rev=719058&r1=719057&r2=719058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/gsh-cxf-tools.properties Wed Nov 19 12:29:35 2008
@@ -19,4 +19,4 @@
classworldsRegExTest = .*${artifactId}.*
classworldsEntry = load ${gshell.home}/lib/${artifactId}-*.jar
-layout = addCommand java2wsdl ${artifactId}:java2wsdl jaxws, addCommand wsdl2java ${artifactId}:wsdl2java jaxws
+layout = addCommand java2ws ${artifactId}:java2ws jaxws, addCommand wsdl2java ${artifactId}:wsdl2java jaxws