Author: solomax
Date: Tue May 12 16:10:28 2015
New Revision: 1678996
URL: http://svn.apache.org/r1678996
Log:
[OPENMEETINGS-1197] commons-cli and directory.api versions are updated
Modified:
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmHelpFormatter.java
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmOption.java
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1678996&r1=1678995&r2=1678996&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Tue May 12 16:10:28 2015
@@ -302,7 +302,7 @@
<dependency org="org.seleniumhq.selenium" name="selenium-java"
conf="openmeetings->*" rev="2.42.2" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.directory.api" name="api-all"
rev="1.0.0-M29" conf="openmeetings->*" >
+ <dependency org="org.apache.directory.api" name="api-all"
rev="1.0.0-M30" conf="openmeetings->*" >
<include type="jar" />
</dependency>
<!-- BEGIN openjpa -->
@@ -406,7 +406,7 @@
<!-- END OF openlaszlo46 -->
<!-- START OF Command Line Admin -->
- <dependency org="commons-cli" name="commons-cli" rev="1.2"
conf="cmdadmin->*" transitive="false">
+ <dependency org="commons-cli" name="commons-cli" rev="1.3"
conf="cmdadmin->*" transitive="false">
<include type="jar" />
</dependency>
<!-- END OF Command Line Admin -->
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmHelpFormatter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmHelpFormatter.java?rev=1678996&r1=1678995&r2=1678996&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmHelpFormatter.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmHelpFormatter.java
Tue May 12 16:10:28 2015
@@ -21,7 +21,6 @@ package org.apache.openmeetings.cli;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
@@ -40,7 +39,10 @@ public class OmHelpFormatter extends Hel
private List<OmOption> getReqOptions(Options opts) {
//suppose we have only 1 group (for now)
OptionGroup g =
((List<OptionGroup>)opts.getRequiredOptions()).get(0);
- List<OmOption> result = new ArrayList<OmOption>(g.getOptions());
+ List<OmOption> result = new ArrayList<OmOption>();
+ for (Option o : g.getOptions()) {
+ result.add((OmOption)o);
+ }
Collections.sort(result, new Comparator<OmOption>() {
public int compare(OmOption o1, OmOption o2) {
return o1.getOrder() - o2.getOrder();
@@ -49,7 +51,6 @@ public class OmHelpFormatter extends Hel
return result;
}
- @SuppressWarnings("unchecked")
private LinkedHashMap<String, List<OmOption>> getOptions(Options opts,
int leftPad) {
final String longOptSeparator = " ";
final String lpad = createPadding(leftPad);
@@ -60,7 +61,8 @@ public class OmHelpFormatter extends Hel
for (OmOption o : reqOptions) {
map.put(o.getOpt(), new ArrayList<OmOption>());
}
- for (OmOption o : (Collection<OmOption>)opts.getOptions()) {
+ for (Option _o : opts.getOptions()) {
+ OmOption o = (OmOption)_o;
//TODO need better check (required option should go
first and should not be duplicated
boolean skipOption = map.containsKey(o.getOpt());
boolean mainOption = skipOption || o.getGroup() == null;
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmOption.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmOption.java?rev=1678996&r1=1678995&r2=1678996&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmOption.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/OmOption.java
Tue May 12 16:10:28 2015
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.commons.cli.Option;
public class OmOption extends Option {
- private static final long serialVersionUID = -544426769898915573L;
+ private static final long serialVersionUID = 1L;
private String group = null;
private Map<String, Boolean> optional = null;
private int order = 0;
