You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2017/01/08 19:27:09 UTC

svn commit: r1777902 - in /openwebbeans/meecrowave/trunk: meecrowave-core/pom.xml meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java meecrowave-core/src/test/java/org/apache/meecrowave/runner/CliTest.java pom.xml

Author: rmannibucau
Date: Sun Jan  8 19:27:09 2017
New Revision: 1777902

URL: http://svn.apache.org/viewvc?rev=1777902&view=rev
Log:
MEECROWAVE-1 cleaning up CLI options

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java
    openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/runner/CliTest.java
    openwebbeans/meecrowave/trunk/pom.xml

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml?rev=1777902&r1=1777901&r2=1777902&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/pom.xml Sun Jan  8 19:27:09 2017
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
+      <version>${commons-cli.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -303,7 +303,7 @@
           <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-maven</artifactId>
-            <version>1.7.0</version>
+            <version>${openwebbeans.version}</version>
           </dependency>
           <dependency>
             <groupId>com.github.edwgiz</groupId>

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java?rev=1777902&r1=1777901&r2=1777902&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java Sun Jan  8 19:27:09 2017
@@ -21,9 +21,9 @@ package org.apache.meecrowave.runner;
 import org.apache.catalina.connector.Connector;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
 import org.apache.meecrowave.Meecrowave;
 import org.apache.meecrowave.runner.cli.CliOption;
 import org.apache.xbean.recipe.ObjectRecipe;
@@ -53,9 +53,9 @@ public class Cli {
 
     public static void main(final String[] args) {
         final org.apache.commons.cli.Options options = new org.apache.commons.cli.Options();
-        options.addOption("help", false, "Show help");
-        options.addOption("context", true, "The context to use to deploy the webapp");
-        options.addOption("webapp", true, "Location of the webapp, if not set the classpath will be deployed");
+        options.addOption(null, "help", false, "Show help");
+        options.addOption(null, "context", true, "The context to use to deploy the webapp");
+        options.addOption(null, "webapp", true, "Location of the webapp, if not set the classpath will be deployed");
         final List<Field> fields = Stream.of(Meecrowave.Builder.class.getDeclaredFields())
                 .filter(f -> f.isAnnotationPresent(CliOption.class))
                 .collect(toList());
@@ -74,7 +74,7 @@ public class Cli {
             Stream.of(opt.alias()).forEach(a -> options.addOption(null, a, true, description));
         }));
 
-        final CommandLineParser parser = new PosixParser();
+        final CommandLineParser parser = new DefaultParser();
         final CommandLine line;
         try {
             line = parser.parse(options, args, true);
@@ -225,7 +225,7 @@ public class Cli {
     }
 
     private static void help(final org.apache.commons.cli.Options options) {
-        new HelpFormatter().printHelp("java -jar meecrowave.jar", options);
+        new HelpFormatter().printHelp("java -jar meecrowave-runner.jar", options);
     }
 
     public interface Options {

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/runner/CliTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/runner/CliTest.java?rev=1777902&r1=1777901&r2=1777902&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/runner/CliTest.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/test/java/org/apache/meecrowave/runner/CliTest.java Sun Jan  8 19:27:09 2017
@@ -63,11 +63,11 @@ public class CliTest {
             @Override
             public void run() {
                 Cli.main(new String[]{
-                        "--context=app",
-                        "--stop=" + stop,
-                        "--http=" + http,
-                        "--tmp-dir=target/CliTest/simple",
-                        "--my-config=val"
+                        "--context", "app",
+                        "--stop", Integer.toString(stop),
+                        "--http", Integer.toString(http),
+                        "--tmp-dir", "target/CliTest/simple",
+                        "--my-config", "val"
                 });
             }
         };

Modified: openwebbeans/meecrowave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1777902&r1=1777901&r2=1777902&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Sun Jan  8 19:27:09 2017
@@ -56,6 +56,11 @@
     <log4j2.version>2.7</log4j2.version>
     <deltaspike.version>1.7.2</deltaspike.version>
     <jaxb.version>2.2.11</jaxb.version>
+    <openjpa.version>2.4.2</openjpa.version>
+    <jpa-spec.version>1.0-alpha-1</jpa-spec.version>
+    <h2.version>1.4.192</h2.version>
+    <dbcp2.version>2.1</dbcp2.version>
+    <commons-cli.version>1.3.1</commons-cli.version>
   </properties>
 
   <modules>
@@ -69,6 +74,7 @@
     <module>meecrowave-doc</module>
     <module>meecrowave-jta</module>
     <module>integration-tests</module>
+    <module>meecrowave-oauth2</module>
   </modules>
 
   <build>