You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2015/11/06 17:57:38 UTC
[1/4] syncope git commit: Fixed SYNCOPE-723,
tested on Windows environment, added zip plugin, SYNCOPE-158
Repository: syncope
Updated Branches:
refs/heads/master 03b341e11 -> a61f60363
Fixed SYNCOPE-723, tested on Windows environment, added zip plugin, SYNCOPE-158
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a61f6036
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a61f6036
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a61f6036
Branch: refs/heads/master
Commit: a61f603634eb10a131b03b18696487f05ee199f3
Parents: 474e732
Author: massi <ma...@tirasa.net>
Authored: Fri Nov 6 17:57:11 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Fri Nov 6 17:57:22 2015 +0100
----------------------------------------------------------------------
client/cli/pom.xml | 70 +++++++++++++++++++-
client/cli/src/assemble/cli-zip.xml | 36 ++++++++++
.../apache/syncope/client/cli/ArgsManager.java | 2 +-
.../org/apache/syncope/client/cli/Input.java | 14 ++++
.../apache/syncope/client/cli/SyncopeAdm.java | 2 +
.../syncope/client/cli/SyncopeServices.java | 2 +-
.../client/cli/commands/info/InfoCommand.java | 3 +-
.../install/InstallConfigFileTemplate.java | 34 ++++++++--
.../commands/install/InstallResultManager.java | 2 +
.../cli/commands/install/InstallSetup.java | 24 +++----
.../client/cli/util/FileSystemUtils.java | 39 +++++++++++
.../syncope/client/cli/view/Messages.java | 2 +-
.../src/main/resources/configuration.properties | 7 +-
.../cli/src/main/resources/messages.properties | 16 +++++
client/cli/src/main/resources/syncopeadm.bat | 19 ++++++
client/cli/src/main/resources/syncopeadm.sh | 19 ++++++
16 files changed, 259 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/pom.xml
----------------------------------------------------------------------
diff --git a/client/cli/pom.xml b/client/cli/pom.xml
index 7872ca6..d63f679 100644
--- a/client/cli/pom.xml
+++ b/client/cli/pom.xml
@@ -37,6 +37,8 @@ under the License.
<properties>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
+
+ <work.dir>${project.build.directory}/cli</work.dir>
</properties>
<dependencies>
@@ -150,6 +152,51 @@ under the License.
<resourceIncludes>src/main/resources/**/*.properties</resourceIncludes>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-cli</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>verify</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${work.dir}" />
+
+ <copy file="LICENSE" todir="${work.dir}" />
+ <copy file="NOTICE" todir="${work.dir}" />
+
+ <copy file="target/syncope-client-cli-${project.version}.jar" todir="${work.dir}" />
+ <copy file="target/classes/syncopeadm.bat" todir="${work.dir}" />
+ <copy file="target/classes/syncopeadm.sh" todir="${work.dir}" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/cli-zip.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-cli-zip</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
@@ -173,16 +220,33 @@ under the License.
<profiles>
<profile>
<id>apache-release</id>
-
+
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>doc</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/assemble/cli-zip.xml
----------------------------------------------------------------------
diff --git a/client/cli/src/assemble/cli-zip.xml b/client/cli/src/assemble/cli-zip.xml
new file mode 100644
index 0000000..be2a254
--- /dev/null
+++ b/client/cli/src/assemble/cli-zip.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+ http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <id>cli</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${work.dir}</directory>
+ <outputDirectory>${project.build.finalName}</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/ArgsManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/ArgsManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/ArgsManager.java
index 926b4dd..3ec222a 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/ArgsManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/ArgsManager.java
@@ -27,7 +27,7 @@ public final class ArgsManager {
if (args.length == 0) {
throw new IllegalArgumentException("Syntax error: no options");
} else if (!"install".equalsIgnoreCase(args[0])) {
- final File configFile = new File(InstallConfigFileTemplate.FILE_PATH);
+ final File configFile = new File(InstallConfigFileTemplate.configurationFilePath());
if (!configFile.exists()) {
throw new IllegalArgumentException(
"It seems you need to setup the CLI client before. Run install --setup.");
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/Input.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/Input.java b/client/cli/src/main/java/org/apache/syncope/client/cli/Input.java
index 7b417ea..a5f4fe5 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/Input.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/Input.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.cli;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.syncope.client.cli.commands.AbstractCommand;
@@ -31,19 +32,24 @@ public class Input {
private final String[] parameters;
+ private final List<String> commandFields = new ArrayList<>();
+
public Input(final String[] args)
throws InstantiationException, IllegalAccessException, IllegalArgumentException {
command = CommandUtils.fromArgs(args[0]);
+ commandFields.add(args[0]);
if (args.length > 1) {
option = args[1];
+ commandFields.add(args[1]);
}
if (args.length > 2) {
parameters = new String[args.length - 2];
for (int i = 0; i < parameters.length; i++) {
parameters[i] = args[i + 2];
+ commandFields.add(args[i + 2]);
}
} else {
parameters = new String[0];
@@ -98,6 +104,14 @@ public class Input {
return new PairParameter(pairParameterArray[0], pairParameterArray[1]);
}
+ public String printCommandFields() {
+ final StringBuilder commandBuilder = new StringBuilder();
+ for (String commandField : commandFields) {
+ commandBuilder.append(commandField).append(" ");
+ }
+ return commandBuilder.toString();
+ }
+
public class PairParameter {
private final String key;
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
index 7f09c68..5c7ef20 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java
@@ -45,6 +45,8 @@ public final class SyncopeAdm {
LOG.debug(" > " + parameter);
}
+ System.out.println("");
+ System.out.println("You are runnig: " + input.printCommandFields());
command.execute(input);
} catch (final IllegalAccessException | InstantiationException e) {
System.out.println(helpMessage());
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
index 0fc5b33..5cfcefa 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeServices.java
@@ -37,7 +37,7 @@ public final class SyncopeServices {
public static <T> T get(final Class<T> claz) {
final Properties properties = new Properties();
try {
- properties.load(new FileInputStream(InstallConfigFileTemplate.FILE_PATH));
+ properties.load(new FileInputStream(InstallConfigFileTemplate.configurationFilePath()));
} catch (final IOException e) {
LOG.error("Error opening properties file", e);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java
index a5c7cd8..b2882d3 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java
@@ -29,10 +29,9 @@ import org.apache.syncope.client.cli.util.CommandUtils;
@Command(name = "info")
public class InfoCommand extends AbstractCommand {
- private final Info info = new Info();
-
@Override
public void execute(final Input input) {
+ final Info info = new Info();
if (StringUtils.isBlank(input.getOption())) {
input.setOption(Options.HELP.getOptionName());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallConfigFileTemplate.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallConfigFileTemplate.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallConfigFileTemplate.java
index 6ef5cc0..6da4e8e 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallConfigFileTemplate.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallConfigFileTemplate.java
@@ -19,26 +19,22 @@
package org.apache.syncope.client.cli.commands.install;
import java.util.ResourceBundle;
+import org.apache.syncope.client.cli.util.FileSystemUtils;
public final class InstallConfigFileTemplate {
private static final ResourceBundle CONF = ResourceBundle.getBundle("configuration");
- public static final String DIR_PATH
- = CONF.getString("cli.installation.directory");
-
- public static final String FILE_NAME
+ public static final String CONFIGURATION_FILE_NAME
= CONF.getString("cli.installation.filename");
- public static final String FILE_PATH = DIR_PATH + FILE_NAME;
-
private static final String SYNCOPE_REST_SERVICES = "syncope.rest.services=%s://%s:%s%s";
private static final String SYNCOPE_ADMIN_USER = "syncope.admin.user=%s";
private static final String SYNCOPE_ADMIN_PASSWORD = "syncope.admin.password=%s";
- public static String createFile(
+ public static String cliPropertiesFile(
final String schema,
final String hostname,
final String port,
@@ -52,6 +48,30 @@ public final class InstallConfigFileTemplate {
return syncopeRestServices + "\n" + syncopeAdminUser + "\n" + syncopeAdminPassword;
}
+ public static String dirPath() {
+ if (FileSystemUtils.isWindows()) {
+ return CONF.getString("cli.installation.directory.windows");
+ } else {
+ return CONF.getString("cli.installation.directory.linux");
+ }
+ }
+
+ public static String configurationFilePath() {
+ return dirPath() + CONFIGURATION_FILE_NAME;
+ }
+
+ private static String scriptFileName() {
+ if (FileSystemUtils.isWindows()) {
+ return CONF.getString("script.file.name.windows");
+ } else {
+ return CONF.getString("script.file.name.linux");
+ }
+ }
+
+ public static String scriptFilePath() {
+ return dirPath() + scriptFileName();
+ }
+
private InstallConfigFileTemplate() {
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallResultManager.java
index 39837bf..32b6cf2 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallResultManager.java
@@ -95,6 +95,8 @@ public class InstallResultManager extends CommonsResultManager {
System.out.println("# #");
System.out.println("###############################################");
System.out.println("");
+ System.out.println(e.getMessage());
+ System.out.println("");
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
index d14a3fd..716f60f 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
@@ -20,7 +20,6 @@ package org.apache.syncope.client.cli.commands.install;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.util.Scanner;
import javax.ws.rs.ProcessingException;
import org.apache.commons.lang3.StringUtils;
@@ -53,14 +52,14 @@ public class InstallSetup {
installResultManager.printWelcome();
System.out.println("Path to config files of Syncope CLI client will be: "
- + InstallConfigFileTemplate.DIR_PATH);
+ + InstallConfigFileTemplate.dirPath());
- if (!FileSystemUtils.exists(InstallConfigFileTemplate.DIR_PATH)) {
- throw new FileNotFoundException("Directory: " + InstallConfigFileTemplate.DIR_PATH + " does not exists!");
+ if (!FileSystemUtils.exists(InstallConfigFileTemplate.dirPath())) {
+ throw new FileNotFoundException("Directory: " + InstallConfigFileTemplate.dirPath() + " does not exists!");
}
- if (!FileSystemUtils.canWrite(InstallConfigFileTemplate.DIR_PATH)) {
- throw new IllegalAccessException("Permission denied on " + InstallConfigFileTemplate.DIR_PATH);
+ if (!FileSystemUtils.canWrite(InstallConfigFileTemplate.dirPath())) {
+ throw new IllegalAccessException("Permission denied on " + InstallConfigFileTemplate.dirPath());
}
System.out.println("- File system permission checked");
System.out.println("");
@@ -154,31 +153,26 @@ public class InstallSetup {
final JasyptUtils jasyptUtils = JasyptUtils.getJasyptUtils();
try {
- FileSystemUtils.createNewDirectory(InstallConfigFileTemplate.DIR_PATH);
- final String contentCliPropertiesFile = InstallConfigFileTemplate.createFile(
+
+ final String contentCliPropertiesFile = InstallConfigFileTemplate.cliPropertiesFile(
syncopeServerSchema,
syncopeServerHostname,
syncopeServerPort,
syncopeServerRestContext,
syncopeAdminUser,
jasyptUtils.encrypt(syncopeAdminPassword));
- FileSystemUtils.createFileWith(InstallConfigFileTemplate.FILE_PATH, contentCliPropertiesFile);
-
- } catch (final FileNotFoundException | UnsupportedEncodingException ex) {
+ FileSystemUtils.createFileWith(InstallConfigFileTemplate.configurationFilePath(), contentCliPropertiesFile);
+ } catch (final IOException ex) {
System.out.println(ex.getMessage());
}
try {
final SyncopeService syncopeService = SyncopeServices.get(SyncopeService.class);
final String syncopeVersion = syncopeService.info().getVersion();
- FileSystemUtils.createScriptFile();
installResultManager.installationSuccessful(syncopeVersion);
} catch (final ProcessingException ex) {
LOG.error("Error installing CLI", ex);
installResultManager.manageProcessingException(ex);
- } catch (final FileNotFoundException | UnsupportedEncodingException e) {
- LOG.error("Error writing script file", e);
- installResultManager.manageException(e);
} catch (final Exception e) {
LOG.error("Error installing CLI", e);
installResultManager.manageException(e);
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/util/FileSystemUtils.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/FileSystemUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/FileSystemUtils.java
index aed3bd5..8fc779c 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/util/FileSystemUtils.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/util/FileSystemUtils.java
@@ -18,13 +18,25 @@
*/
package org.apache.syncope.client.cli.util;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashSet;
+import java.util.ResourceBundle;
+import java.util.Set;
+import org.apache.syncope.client.cli.commands.install.InstallConfigFileTemplate;
public final class FileSystemUtils {
+ private static final ResourceBundle CONF = ResourceBundle.getBundle("configuration");
+
public static void createNewDirectory(final String directoryToCreate) {
final File directory = new File(directoryToCreate);
directory.mkdirs();
@@ -47,6 +59,33 @@ public final class FileSystemUtils {
return installationDirectory.exists();
}
+ public static void createScriptFile() throws FileNotFoundException, UnsupportedEncodingException, IOException {
+ final File file = new File(InstallConfigFileTemplate.scriptFilePath());
+ file.setExecutable(true);
+ file.setReadable(true);
+ file.setWritable(true);
+ file.createNewFile();
+ final FileWriter fw = new FileWriter(file.getAbsoluteFile());
+ final BufferedWriter bw = new BufferedWriter(fw);
+ if (isWindows()) {
+ bw.write(CONF.getString("script.file.windows"));
+ } else {
+ bw.write(CONF.getString("script.file.linux"));
+ final Set<PosixFilePermission> perms = new HashSet<>();
+ perms.add(PosixFilePermission.OWNER_READ);
+ perms.add(PosixFilePermission.OWNER_WRITE);
+ perms.add(PosixFilePermission.OWNER_EXECUTE);
+ perms.add(PosixFilePermission.GROUP_READ);
+ perms.add(PosixFilePermission.OTHERS_READ);
+ Files.setPosixFilePermissions(Paths.get(file.getAbsolutePath()), perms);
+ }
+ bw.close();
+ }
+
+ public static boolean isWindows() {
+ return (System.getProperty("os.name").toLowerCase().contains("win"));
+ }
+
private FileSystemUtils() {
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java b/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
index c634f84..e6592e2 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
@@ -97,7 +97,7 @@ public final class Messages {
printMessage("Unnecessary parameter: " + parameters, "Usage: " + helpMessage);
}
- public static String commandHelpMessage(String name) {
+ public static String commandHelpMessage(final String name) {
return MESSAGES.getString(name + ".help.message");
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/resources/configuration.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/configuration.properties b/client/cli/src/main/resources/configuration.properties
index 245a781..bfee69c 100644
--- a/client/cli/src/main/resources/configuration.properties
+++ b/client/cli/src/main/resources/configuration.properties
@@ -14,5 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-cli.installation.directory=/var/tmp/syncope/conf/
-cli.installation.filename=cli.properties
+#cli.installation.directory.linux=/var/tmp/syncope/conf/
+#cli.installation.directory.windows=c:\\Windows\\syncope\\conf\\
+cli.installation.directory.linux=./
+cli.installation.directory.windows=.\\
+cli.installation.filename=cli.properties
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
index 9c3a38f..82bca55 100644
--- a/client/cli/src/main/resources/messages.properties
+++ b/client/cli/src/main/resources/messages.properties
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
any.help.message=\nUsage: any [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {ANY-ID} {ANY-ID} [...]\n --read-attr-by-schema-type {ANY-ID} {SCHEMA-TYPE}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --read-attr-by-schema {ANY-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --delete \n Syntax: --delete {ANY-ID} {ANY-ID} [...]\n
configuration.help.message=\nUsage: configuration [options]\n Options:\n --help \n --get \n --read \n Syntax: --read {CONF-NAME} {CONF-NAME} [...] \n --update \n Syntax: --update {CONF-NAME}={CONF-VALUE} {CONF-NAME}={CONF-VALUE} [...]\n --delete \n Syntax: --delete {CONF-NAME} {CONF-NAME} [...]\n --export \n Syntax: --export {WHERE-DIR}\n
connector.help.message=\nUsage: connector [options]\n Options:\n --help \n --details \n --list \n --list-bundles \n --list-configuration-properties\n Syntax: --list-configuration-properties {CONNECTOR-ID} {CONNECTOR-ID} [...]\n --read \n Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n --delete \n Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/resources/syncopeadm.bat
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/syncopeadm.bat b/client/cli/src/main/resources/syncopeadm.bat
new file mode 100644
index 0000000..98dfbaa
--- /dev/null
+++ b/client/cli/src/main/resources/syncopeadm.bat
@@ -0,0 +1,19 @@
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+
+@ECHO OFF
+java -jar -Xms256m -Xmx512m syncope-client-cli-${project.version}.jar %*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/a61f6036/client/cli/src/main/resources/syncopeadm.sh
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/syncopeadm.sh b/client/cli/src/main/resources/syncopeadm.sh
new file mode 100755
index 0000000..4889a25
--- /dev/null
+++ b/client/cli/src/main/resources/syncopeadm.sh
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#!/bin/bash
+args=`echo $@`
+java -jar -Xms256m -Xmx512m syncope-client-cli-${project.version}.jar $args
\ No newline at end of file
[2/4] syncope git commit: prevent Java JCE installation, SYNCOPE-158
Posted by ma...@apache.org.
prevent Java JCE installation, SYNCOPE-158
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ea56dc91
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ea56dc91
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ea56dc91
Branch: refs/heads/master
Commit: ea56dc9179b880f79d0eabf726ac55ddb23edcc7
Parents: d59380a
Author: massi <ma...@tirasa.net>
Authored: Fri Nov 6 12:57:31 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Fri Nov 6 17:57:22 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/syncope/client/cli/util/JasyptUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea56dc91/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java
index c0af3b0..0f9d592 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java
@@ -18,11 +18,11 @@
*/
package org.apache.syncope.client.cli.util;
-import org.jasypt.util.text.StrongTextEncryptor;
+import org.jasypt.util.text.BasicTextEncryptor;
public final class JasyptUtils {
- private final StrongTextEncryptor textEncryptor;
+ private final BasicTextEncryptor textEncryptor;
private static JasyptUtils JASYPT_UTILS = null;
@@ -34,7 +34,7 @@ public final class JasyptUtils {
}
private JasyptUtils() {
- textEncryptor = new StrongTextEncryptor();
+ textEncryptor = new BasicTextEncryptor();
textEncryptor.setPassword("Ka9s8yadaisj9mud87ssdaifansy");
}
[3/4] syncope git commit: Fixed SYNCOPE-158
Posted by ma...@apache.org.
Fixed SYNCOPE-158
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/474e7327
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/474e7327
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/474e7327
Branch: refs/heads/master
Commit: 474e7327444d3d9e0e472f355446f0b90deb8c9a
Parents: ea56dc9
Author: massi <ma...@tirasa.net>
Authored: Fri Nov 6 17:42:13 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Fri Nov 6 17:57:22 2015 +0100
----------------------------------------------------------------------
client/cli/LICENSE | 1112 +++++++++++++++++++++++++++++++++++++++++++++++
client/cli/NOTICE | 73 ++++
2 files changed, 1185 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/474e7327/client/cli/LICENSE
----------------------------------------------------------------------
diff --git a/client/cli/LICENSE b/client/cli/LICENSE
new file mode 100644
index 0000000..2e16fbf
--- /dev/null
+++ b/client/cli/LICENSE
@@ -0,0 +1,1112 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+==
+
+For Activiti BPM Platform (http://www.activiti.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For javax.annotation-api (http://www.oracle.com/):
+This is licensed under CDDL 1.0.
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. "Contributor" means each individual or entity that
+creates or contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the
+Original Software, prior Modifications used by a
+Contributor (if any), and the Modifications made by that
+particular Contributor.
+
+1.3. "Covered Software" means (a) the Original Software, or
+(b) Modifications, or (c) the combination of files
+containing Original Software with files containing
+Modifications, in each case including portions thereof.
+
+1.4. "Executable" means the Covered Software in any form
+other than Source Code.
+
+1.5. "Initial Developer" means the individual or entity
+that first makes Original Software available under this
+License.
+
+1.6. "Larger Work" means a work which combines Covered
+Software or portions thereof with code not governed by the
+terms of this License.
+
+1.7. "License" means this document.
+
+1.8. "Licensable" means having the right to grant, to the
+maximum extent possible, whether at the time of the initial
+grant or subsequently acquired, any and all of the rights
+conveyed herein.
+
+1.9. "Modifications" means the Source Code and Executable
+form of any of the following:
+
+A. Any file that results from an addition to,
+deletion from or modification of the contents of a
+file containing Original Software or previous
+Modifications;
+
+B. Any new file that contains any part of the
+Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made
+available under the terms of this License.
+
+1.10. "Original Software" means the Source Code and
+Executable form of computer software code that is
+originally released under this License.
+
+1.11. "Patent Claims" means any patent claim(s), now owned
+or hereafter acquired, including without limitation,
+method, process, and apparatus claims, in any patent
+Licensable by grantor.
+
+1.12. "Source Code" means (a) the common form of computer
+software code in which modifications are made and (b)
+associated documentation included in or with such code.
+
+1.13. "You" (or "Your") means an individual or a legal
+entity exercising rights under, and complying with all of
+the terms of, this License. For legal entities, "You"
+includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this
+definition, "control" means (a) the power, direct or
+indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (b) ownership
+of more than fifty percent (50%) of the outstanding shares
+or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide,
+royalty-free, non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Initial Developer,
+to use, reproduce, modify, display, perform,
+sublicense and distribute the Original Software (or
+portions thereof), with or without Modifications,
+and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using or selling of Original Software, to make, have
+made, use, practice, sell, and offer for sale, and/or
+otherwise dispose of the Original Software (or
+portions thereof).
+
+(c) The licenses granted in Sections 2.1(a) and (b)
+are effective on the date Initial Developer first
+distributes or otherwise makes the Original Software
+available to a third party under the terms of this
+License.
+
+(d) Notwithstanding Section 2.1(b) above, no patent
+license is granted: (1) for code that You delete from
+the Original Software, or (2) for infringements
+caused by: (i) the modification of the Original
+Software, or (ii) the combination of the Original
+Software with other software or devices.
+
+2.2. Contributor Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, each
+Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Contributor to
+use, reproduce, modify, display, perform, sublicense
+and distribute the Modifications created by such
+Contributor (or portions thereof), either on an
+unmodified basis, with other Modifications, as
+Covered Software and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using, or selling of Modifications made by that
+Contributor either alone and/or in combination with
+its Contributor Version (or portions of such
+combination), to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of: (1)
+Modifications made by that Contributor (or portions
+thereof); and (2) the combination of Modifications
+made by that Contributor with its Contributor Version
+(or portions of such combination).
+
+(c) The licenses granted in Sections 2.2(a) and
+2.2(b) are effective on the date Contributor first
+distributes or otherwise makes the Modifications
+available to a third party.
+
+(d) Notwithstanding Section 2.2(b) above, no patent
+license is granted: (1) for any code that Contributor
+has deleted from the Contributor Version; (2) for
+infringements caused by: (i) third party
+modifications of Contributor Version, or (ii) the
+combination of Modifications made by that Contributor
+with other software (except as part of the
+Contributor Version) or other devices; or (3) under
+Patent Claims infringed by Covered Software in the
+absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make
+available in Executable form must also be made available in
+Source Code form and that Source Code form must be
+distributed only under the terms of this License. You must
+include a copy of this License with every copy of the
+Source Code form of the Covered Software You distribute or
+otherwise make available. You must inform recipients of any
+such Covered Software in Executable form as to how they can
+obtain such Covered Software in Source Code form in a
+reasonable manner on or through a medium customarily used
+for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You
+contribute are governed by the terms of this License. You
+represent that You believe Your Modifications are Your
+original creation(s) and/or You have sufficient rights to
+grant the rights conveyed by this License.
+
+3.3. Required Notices.
+
+You must include a notice in each of Your Modifications
+that identifies You as the Contributor of the Modification.
+You may not remove or alter any copyright, patent or
+trademark notices contained within the Covered Software, or
+any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+
+You may not offer or impose any terms on any Covered
+Software in Source Code form that alters or restricts the
+applicable version of this License or the recipients'
+rights hereunder. You may choose to offer, and to charge a
+fee for, warranty, support, indemnity or liability
+obligations to one or more recipients of Covered Software.
+However, you may do so only on Your own behalf, and not on
+behalf of the Initial Developer or any Contributor. You
+must make it absolutely clear that any such warranty,
+support, indemnity or liability obligation is offered by
+You alone, and You hereby agree to indemnify the Initial
+Developer and every Contributor for any liability incurred
+by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+
+You may distribute the Executable form of the Covered
+Software under the terms of this License or under the terms
+of a license of Your choice, which may contain terms
+different from this License, provided that You are in
+compliance with the terms of this License and that the
+license for the Executable form does not attempt to limit
+or alter the recipient's rights in the Source Code form
+from the rights set forth in this License. If You
+distribute the Covered Software in Executable form under a
+different license, You must make it absolutely clear that
+any terms which differ from this License are offered by You
+alone, not by the Initial Developer or Contributor. You
+hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial
+Developer or such Contributor as a result of any such terms
+You offer.
+
+3.6. Larger Works.
+
+You may create a Larger Work by combining Covered Software
+with other code not governed by the terms of this License
+and distribute the Larger Work as a single product. In such
+a case, You must make sure the requirements of this License
+are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+
+Sun Microsystems, Inc. is the initial license steward and
+may publish revised and/or new versions of this License
+from time to time. Each version will be given a
+distinguishing version number. Except as provided in
+Section 4.3, no one other than the license steward has the
+right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. If the Initial Developer includes a
+notice in the Original Software prohibiting it from being
+distributed or otherwise made available under any
+subsequent version of the License, You must distribute and
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. Otherwise, You may also choose to
+use, distribute or otherwise make the Covered Software
+available under the terms of any subsequent version of the
+License published by the license steward.
+
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a
+new license for Your Original Software, You may create and
+use a modified version of this License if You: (a) rename
+the license and remove any references to the name of the
+license steward (except to note that the license differs
+from this License); and (b) otherwise make it clear that
+the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will
+terminate automatically if You fail to comply with terms
+herein and fail to cure such breach within 30 days of
+becoming aware of the breach. Provisions which, by their
+nature, must remain in effect beyond the termination of
+this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding
+declaratory judgment actions) against Initial Developer or
+a Contributor (the Initial Developer or Contributor against
+whom You assert such claim is referred to as "Participant")
+alleging that the Participant Software (meaning the
+Contributor Version where the Participant is a Contributor
+or the Original Software where the Participant is the
+Initial Developer) directly or indirectly infringes any
+patent, then any and all rights granted directly or
+indirectly to You by such Participant, the Initial
+Developer (if the Initial Developer is not the Participant)
+and all Contributors under Sections 2.1 and/or 2.2 of this
+License shall, upon 60 days notice from Participant
+terminate prospectively and automatically at the expiration
+of such 60 day notice period, unless if within such 60 day
+period You withdraw Your claim with respect to the
+Participant Software against such Participant either
+unilaterally or pursuant to a written agreement with
+Participant.
+
+6.3. In the event of termination under Sections 6.1 or 6.2
+above, all end user licenses that have been validly granted
+by You or any distributor hereunder prior to termination
+(excluding licenses granted to You by any distributor)
+shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a "commercial item," as that term is
+defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" (as that term is defined at 48 C.F.R. $
+252.227-7014(a)(1)) and "commercial computer software
+documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Software with only those rights set forth herein.
+This U.S. Government Rights clause is in lieu of, and supersedes,
+any other FAR, DFAR, or other clause or provision that addresses
+Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the
+extent necessary to make it enforceable. This License shall be
+governed by the law of the jurisdiction specified in a notice
+contained within the Original Software (except to the extent
+applicable law, if any, provides otherwise), excluding such
+jurisdiction's conflict-of-law provisions. Any litigation
+relating to this License shall be subject to the jurisdiction of
+the courts located in the jurisdiction and venue specified in a
+notice contained within the Original Software, with the losing
+party responsible for costs, including, without limitation, court
+costs and reasonable attorneys' fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or
+regulation which provides that the language of a contract shall
+be construed against the drafter shall not apply to this License.
+You agree that You alone are responsible for compliance with the
+United States export administration regulations (and the export
+control laws and regulation of any other countries) when You use,
+distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or
+indirectly, out of its utilization of rights under this License
+and You agree to work with Initial Developer and Contributors to
+distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission
+of liability.
+
+==
+
+For AOP Alliance (http://aopalliance.sourceforge.net/):
+This is Public Domain.
+
+==
+
+For ASM (http://asm.ow2.org/):
+This is licensed under the BSD license.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of
+ conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ * Neither the name of the author nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written
+ permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==
+
+For AspectJ (http://www.eclipse.org/aspectj/):
+
+This program and the accompanying materials are licensed under
+the terms of the Eclipse Public License v 1.0.
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+1. DEFINITIONS
+"Contribution" means:
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+"Contributor" means any person or entity that distributes the Program.
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+"Program" means the Contributions distributed in accordance with this Agreement.
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+2. GRANT OF RIGHTS
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+4. COMMERCIAL DISTRIBUTION
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Los
ses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+5. NO WARRANTY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+6. DISCLAIMER OF LIABILITY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+7. GENERAL
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b)
above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+==
+
+For cglib (https://github.com/cglib/cglib):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For ClassMate (https://github.com/cowtowncoder/java-classmate):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For CodeMirror (http://codemirror.net/):
+This is licensed under the terms of the MIT license.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+==
+
+For ConnId (http://connid.tirasa.net/):
+This is licensed under CDDL 1.0, see above.
+
+==
+
+For LMAX Disruptor (https://lmax-exchange.github.io/disruptor/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For dom4j (http://dom4j.sourceforge.net/):
+This is licensed under BSD style license.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+
+2. Redistributions in binary form must reproduce the
+ above copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+3. The name "DOM4J" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of MetaStuff, Ltd. For written permission,
+ please contact dom4j-info@metastuff.com.
+
+4. Products derived from this Software may not be called "DOM4J"
+ nor may "DOM4J" appear in their names without prior written
+ permission of MetaStuff, Ltd. DOM4J is a registered
+ trademark of MetaStuff, Ltd.
+
+5. Due credit should be given to the DOM4J Project -
+ http://dom4j.sourceforge.net
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==
+
+For H2 (http://www.h2database.com/):
+This is licensed under the Eclipse Public License v 1.0, see above.
+
+==
+
+For Hibernate Validator (http://hibernate.org/validator/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For highlight.js (http://highlightjs.org/):
+This is licensed under the BSD license, see above.
+
+==
+
+For javax.inject (http://code.google.com/p/atinject/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Jackson (http://wiki.fasterxml.com/JacksonHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For jasypt (http://www.jasypt.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For javax.ws.rs-api (http://www.oracle.com/):
+This is licensed under CDDL 1.0, see above.
+
+==
+
+For JAX-B (http://jaxb.java.net/):
+This is licensed under CDDL 1.0, see above.
+
+==
+
+For the JBoss Logging Framework (https://github.com/jboss-logging/jboss-logging):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Joda Time (http://www.joda.org/joda-time/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For jQuery (http://jquery.com/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For jQuery UI (http://jqueryui.com/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For Admin LTE (https://github.com/almasaeed2010/AdminLTE/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For Bootstrap (http://getbootstrap.com/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For Bootstrap-select (https://silviomoreto.github.io/bootstrap-select/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For Font Awesome (https://fortawesome.github.io/Font-Awesome/icons/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For ionicons (http://ionicons.com/):
+This is licensed under the terms of the MIT license, see above.
+
+==
+
+For jstl (http://www.oracle.com/)
+This is licensed under CDDL 1.0, see above.
+
+==
+
+For MyBatis (http://www.mybatis.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Quartz Scheduler (http://quartz-scheduler.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For SERP (http://serp.sourceforge.net/):
+This is licensed under the BSD license, see above.
+
+==
+
+For Simple Logging Facade for Java - SLF4J (http://www.slf4j.org/):
+This is licensed under the MIT license, see above.
+
+==
+
+For Spring Framework (http://projects.spring.io/spring-framework/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For StAX2 API (http://woodstox.codehaus.org/StAX2):
+This is licensed under the BSD license, see above.
+
+==
+
+For Bean Validation API (http://beanvalidation.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Woodstox (http://woodstox.codehaus.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For WDL4J (http://wsdl4j.sourceforge.net/):
+This is licensed under the Common Public License 1.0.
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license set
+forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to
+control, and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may participate in
+any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement, including but not limited to the risks and costs of
+program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
+as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the Agreement
+is published, Contributor may elect to distribute the Program (including its
+Contributions) under the new version. Except as expressly stated in Sections
+2(a) and 2(b) above, Recipient receives no rights or licenses to the
+intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
http://git-wip-us.apache.org/repos/asf/syncope/blob/474e7327/client/cli/NOTICE
----------------------------------------------------------------------
diff --git a/client/cli/NOTICE b/client/cli/NOTICE
new file mode 100644
index 0000000..1c07583
--- /dev/null
+++ b/client/cli/NOTICE
@@ -0,0 +1,73 @@
+Apache Syncope
+Copyright 2012-2014 The Apache Software Foundation
+
+This product includes software developed by:
+The Apache Software Foundation (http://www.apache.org/).
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
+==
+
+This product includes software developed by the ASM project (http://asm.ow2.org/).
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+==
+
+This product includes software developed by the IzPack project (http://izpack.org/).
+Copyright 2001-2008 Julien Ponge
+All rights reserved.
+
+==
+
+This product includes software developed by the Jackson project (http://wiki.fasterxml.com/JacksonHome).
+
+==
+
+This product includes software developed by the JDOM project (http://www.jdom.org/).
+Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
+All rights reserved.
+
+==
+
+This product includes software developed by the Laf-widget project (https://java.net/projects/laf-widget/).
+
+==
+
+This product includes software developed by the Jgoodies project (https://java.net/projects/jgoodies/).
+
+==
+
+This product includes software developed by the NanoXML project (http://nanoxml.sourceforge.net/orig/).
+Copyright (C) 2000-2002 Marc De Scheemaecker.
+All Rights Reserved
+
+==
+
+This product includes software developed by the PicoContainer project (http://picocontainer.codehaus.org/).
+
+==
+
+This product includes software developed by the Plexus project (http://plexus.codehaus.org/).
+
+==
+
+This product includes software developed by the Insubstantial project (http://insubstantial.github.io/insubstantial/).
+Copyright (c) 2006-2007 Nigel Hughes
+
+==
+
+This product includes software developed by the Eclipse Software Foundation (http://www.eclipse.org/swt/).
+This software is included in binary form only.
+
+==
+
+This product includes software developed by the Trident project (https://github.com/kirillcool/trident).
+This software is included in binary form only.
+
+==
+
+This product includes software developed by the Indiana University Extreme! Lab.
+Copyright (c) 2002 Extreme! Lab, Indiana University.
+All rights reserved.
\ No newline at end of file
[4/4] syncope git commit: Fixed SYNCOPE-724
Posted by ma...@apache.org.
Fixed SYNCOPE-724
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d59380af
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d59380af
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d59380af
Branch: refs/heads/master
Commit: d59380af6f3be5412fa283c7c59e759f34ae71f1
Parents: 03b341e
Author: massi <ma...@tirasa.net>
Authored: Fri Nov 6 12:00:43 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Fri Nov 6 17:57:22 2015 +0100
----------------------------------------------------------------------
.../cli/commands/CommonsResultManager.java | 7 ++++-
.../client/cli/commands/any/AnyCommand.java | 20 +++-----------
.../configuration/ConfigurationCommand.java | 19 +++----------
.../commands/connector/ConnectorCommand.java | 19 +++----------
.../cli/commands/domain/DomainCommand.java | 14 +++-------
.../entitlement/EntitlementCommand.java | 21 ++++-----------
.../client/cli/commands/group/GroupCommand.java | 20 +++-----------
.../cli/commands/install/InstallSetup.java | 8 +++++-
.../cli/commands/logger/LoggerCommand.java | 22 +++------------
.../notification/NotificationCommand.java | 15 +++--------
.../cli/commands/policy/PolicyCommand.java | 18 +++----------
.../cli/commands/question/QuestionCommand.java | 15 +++--------
.../client/cli/commands/realm/RealmCommand.java | 12 +++------
.../cli/commands/report/ReportCommand.java | 26 +++---------------
.../cli/commands/resource/ResourceCommand.java | 16 +++--------
.../client/cli/commands/role/RoleCommand.java | 16 +++--------
.../cli/commands/schema/SchemaCommand.java | 19 +++----------
.../cli/commands/self/WorkflowCommand.java | 14 +++-------
.../client/cli/commands/task/TaskCommand.java | 27 +++----------------
.../client/cli/commands/user/UserCommand.java | 28 ++++----------------
.../syncope/client/cli/view/Messages.java | 10 ++++++-
.../cli/src/main/resources/messages.properties | 18 +++++++++++++
22 files changed, 114 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
index e0f7986..c3f553a 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/CommonsResultManager.java
@@ -23,6 +23,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.syncope.client.cli.Command;
import org.apache.syncope.client.cli.view.Messages;
import org.apache.syncope.client.cli.view.Table;
import org.apache.syncope.common.lib.types.ConnConfProperty;
@@ -69,6 +70,10 @@ public abstract class CommonsResultManager {
Messages.printMessage("Error: " + error);
}
+ public String commandHelpMessage(final Class name) {
+ return Messages.commandHelpMessage(((Command) name.getAnnotation(Command.class)).name());
+ }
+
protected void printConfiguration(final Set<ConnConfProperty> configurationPropertys) {
for (final ConnConfProperty configuration : configurationPropertys) {
System.out.println(" name: " + configuration.getSchema().getName());
@@ -84,7 +89,7 @@ public abstract class CommonsResultManager {
System.out.println("");
}
}
-
+
protected void printDetails(final String title, final Map<String, String> details) {
final Table.TableBuilder tableBuilder
= new Table.TableBuilder(title).header("detail").header("value");
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/any/AnyCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/any/AnyCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/any/AnyCommand.java
index a8bed99..c4b2159 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/any/AnyCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/any/AnyCommand.java
@@ -28,19 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "any")
public class AnyCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: any [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {ANY-ID} {ANY-ID} [...]\n"
- + " --read-attr-by-schema-type {ANY-ID} {SCHEMA-TYPE}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL\n"
- + " --read-attr-by-schema {ANY-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL\n"
- + " --delete \n"
- + " Syntax: --delete {ANY-ID} {ANY-ID} [...]\n";
+ private final AnyResultManager anyResultManager = new AnyResultManager();
@Override
public void execute(final Input input) {
@@ -66,16 +54,16 @@ public class AnyCommand extends AbstractCommand {
new AnyDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new AnyResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ anyResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return anyResultManager.commandHelpMessage(getClass());
}
private enum AnyOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java
index 4ab4a38..00fcdfd 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java
@@ -28,18 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "configuration")
public class ConfigurationCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: configuration [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --get \n"
- + " --read \n"
- + " Syntax: --read {CONF-NAME} {CONF-NAME} [...] \n"
- + " --update \n"
- + " Syntax: --update {CONF-NAME}={CONF-VALUE} {CONF-NAME}={CONF-VALUE} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {CONF-NAME} {CONF-NAME} [...]\n"
- + " --export \n"
- + " Syntax: --export {WHERE-DIR}\n";
+ private final ConfigurationResultManager configurationResultManager = new ConfigurationResultManager();
@Override
public void execute(final Input input) {
@@ -63,17 +52,17 @@ public class ConfigurationCommand extends AbstractCommand {
case EXPORT:
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new ConfigurationResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ new ConfigurationResultManager().defaultOptionMessage(input.getOption(), getHelpMessage());
break;
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return configurationResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java
index 22892a9..b08ecd5 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java
@@ -28,18 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "connector")
public class ConnectorCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: connector [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --list-bundles \n"
- + " --list-configuration-properties\n"
- + " Syntax: --list-configuration-properties {CONNECTOR-ID} {CONNECTOR-ID} [...]\n"
- + " --read \n"
- + " Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n";
+ private final ConnectorResultManager connectorResultManager = new ConnectorResultManager();
@Override
public void execute(final Input input) {
@@ -70,16 +59,16 @@ public class ConnectorCommand extends AbstractCommand {
new ConnectorDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new ConnectorResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ connectorResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return connectorResultManager.commandHelpMessage(getClass());
}
private enum ConnectorOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java
index ee3213e..c3a023a 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java
@@ -28,13 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "domain")
public class DomainCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: domain [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --delete \n"
- + " Syntax: --delete {DOMAIN-NAME} {DOMAIN-NAME} [...]\n";
+ private final DomainResultManager domainResultManager = new DomainResultManager();
@Override
public void execute(final Input input) {
@@ -52,16 +46,16 @@ public class DomainCommand extends AbstractCommand {
new DomainDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new DomainResultManager().deletedMessage(input.getOption(), HELP_MESSAGE);
+ new DomainResultManager().deletedMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return domainResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
index d380bd4..de35fc3 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
@@ -28,19 +28,8 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "entitlement")
public class EntitlementCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: entitlement [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --list\n"
- + " --list-role\n"
- + " Syntax: --list-role {ENTITLEMENT-NAME}\n"
- + " --read-by-username\n"
- + " Syntax: --read-by-username {USERNAME}\n"
- + " --read-by-userid\n"
- + " Syntax: --read-by-userid {USER-ID}\n"
- + " --search-by-role\n"
- + " Syntax: --search-by-role {ROLE-ID}\n";
-
+ private final EntitlementResultManager entitlementResultManager = new EntitlementResultManager();
+
@Override
public void execute(final Input input) {
if (StringUtils.isBlank(input.getOption())) {
@@ -64,16 +53,16 @@ public class EntitlementCommand extends AbstractCommand {
new EntitlementListRole(input).list();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new EntitlementResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ entitlementResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return entitlementResultManager.commandHelpMessage(getClass());
}
private enum EntitlementOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
index 97edbc5..e5d4e39 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
@@ -28,19 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "group")
public class GroupCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: group [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {GROUP-ID} {GROUP-ID} [...]\n"
- + " --read-attr-by-schema-type {GROUP-ID} {SCHEMA-TYPE}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL\n"
- + " --read-attr-by-schema {GROUP-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL\n"
- + " --delete \n"
- + " Syntax: --delete {GROUP-ID} {GROUP-ID} [...]\n";
+ private final GroupResultManager groupResultManager = new GroupResultManager();
@Override
public void execute(final Input input) {
@@ -67,16 +55,16 @@ public class GroupCommand extends AbstractCommand {
new GroupDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new GroupResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ groupResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return groupResultManager.commandHelpMessage(getClass());
}
private enum GroupOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
index 003540e..d14a3fd 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallSetup.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.cli.commands.install;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Scanner;
import javax.ws.rs.ProcessingException;
@@ -169,10 +170,15 @@ public class InstallSetup {
try {
final SyncopeService syncopeService = SyncopeServices.get(SyncopeService.class);
- installResultManager.installationSuccessful(syncopeService.info().getVersion());
+ final String syncopeVersion = syncopeService.info().getVersion();
+ FileSystemUtils.createScriptFile();
+ installResultManager.installationSuccessful(syncopeVersion);
} catch (final ProcessingException ex) {
LOG.error("Error installing CLI", ex);
installResultManager.manageProcessingException(ex);
+ } catch (final FileNotFoundException | UnsupportedEncodingException e) {
+ LOG.error("Error writing script file", e);
+ installResultManager.manageException(e);
} catch (final Exception e) {
LOG.error("Error installing CLI", e);
installResultManager.manageException(e);
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java
index 482c14e..7452726 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java
@@ -28,21 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "logger")
public class LoggerCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: logger [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {LOG-NAME} {LOG-NAME} [...]\n"
- + " --update \n"
- + " Syntax: --update {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n"
- + " --update-all \n"
- + " Syntax: --update-all {LOG-LEVEL} \n"
- + " --create \n"
- + " Syntax: --create {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {LOG-NAME} {LOG-NAME} [...]\n";
+ private final LoggerResultManager loggerResultManager = new LoggerResultManager();
@Override
public void execute(final Input input) {
@@ -73,16 +59,16 @@ public class LoggerCommand extends AbstractCommand {
new LoggerDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new LoggerResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ loggerResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return loggerResultManager.commandHelpMessage(getClass());
}
private enum LoggerOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java
index 36c4b3d..3acbda3 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java
@@ -28,14 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "notification")
public class NotificationCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: notification [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {NOTIFICATION-ID} \n"
- + " --delete \n"
- + " Syntax: --delete {NOTIFICATION-ID}\n";
+ private final NotificationResultManager notificationResultManager = new NotificationResultManager();
@Override
public void execute(final Input input) {
@@ -54,16 +47,16 @@ public class NotificationCommand extends AbstractCommand {
new NotificationDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new NotificationResultManager().deletedMessage(input.getOption(), HELP_MESSAGE);
+ notificationResultManager.deletedMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return notificationResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java
index 6403049..bceb0d6 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java
@@ -28,17 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "policy")
public class PolicyCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: policy [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " Syntax: --list-policy {POLICY-TYPE} \n"
- + " Policy type: ACCOUNT / PASSWORD / SYNC / PUSH\n"
- + " --read \n"
- + " Syntax: --read {POLICY-ID} {POLICY-ID} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {POLICY-ID} {POLICY-ID} [...]\n";
+ private final PolicyResultManager policyResultManager = new PolicyResultManager();
@Override
public void execute(final Input input) {
@@ -60,16 +50,16 @@ public class PolicyCommand extends AbstractCommand {
new PolicyDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new PolicyResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ policyResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return policyResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java
index 9ed995b..bcb2a5f 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java
@@ -28,14 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "question")
public class QuestionCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: question [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {QUESTION-ID} {QUESTION-ID} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]\n";
+ private final QuestionResultManager questionResultManager = new QuestionResultManager();
@Override
public void execute(final Input input) {
@@ -53,16 +46,16 @@ public class QuestionCommand extends AbstractCommand {
case DELETE:
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new QuestionResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ questionResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return questionResultManager.commandHelpMessage(getClass());
}
private enum QuestionOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java
index 1fcf380..db62d91 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java
@@ -28,11 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "realm")
public class RealmCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: realm [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n";
+ private final RealmResultManager realmResultManager = new RealmResultManager();
@Override
public void execute(final Input input) {
@@ -47,16 +43,16 @@ public class RealmCommand extends AbstractCommand {
new RealmList(input).list();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new RealmResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ realmResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return realmResultManager.commandHelpMessage(getClass());
}
private enum RealmOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java
index 560cf25..fcbf1ae 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java
@@ -28,25 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "report")
public class ReportCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: report [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details\n"
- + " --list \n"
- + " --list-jobs \n"
- + " --read \n"
- + " Syntax: --read {REPORT-ID} {REPORT-ID} [...] \n"
- + " --delete \n"
- + " Syntax: --delete {REPORT-ID} {REPORT-ID} [...]\n"
- + " --execute \n"
- + " Syntax: --execute {REPORT-ID} \n"
- + " --read-execution \n"
- + " Syntax: --read-execution {EXECUTION-ID} {EXECUTION-ID} [...]\n"
- + " --delete-execution \n"
- + " Syntax: --delete-execution {EXECUTION-ID} {EXECUTION-ID} [...]\n"
- + " --export-execution-result \n"
- + " Syntax: --export-execution-result {EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}\n"
- + " Format: CSV / HTML / PDF / XML / RTF\n";
+ private final ReportResultManager reportResultManager = new ReportResultManager();
@Override
public void execute(final Input input) {
@@ -83,16 +65,16 @@ public class ReportCommand extends AbstractCommand {
new ReportExportExecution(input).export();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new ReportResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ reportResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return reportResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java
index 4c137c0..ee7a252 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java
@@ -28,15 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "resource")
public class ResourceCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: resource [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n";
+ private final ResourceResultManager resourceResultManager = new ResourceResultManager();
@Override
public void execute(final Input input) {
@@ -58,16 +50,16 @@ public class ResourceCommand extends AbstractCommand {
new ResourceDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new ResourceResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ resourceResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return resourceResultManager.commandHelpMessage(getClass());
}
private enum ResourceOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java
index 9d73020..818d707 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java
@@ -28,15 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "role")
public class RoleCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: role [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list \n"
- + " --read \n"
- + " Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n";
+ private final RoleResultManager roleResultManager = new RoleResultManager();
@Override
public void execute(final Input input) {
@@ -58,16 +50,16 @@ public class RoleCommand extends AbstractCommand {
new RoleDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new RoleResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ roleResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return roleResultManager.commandHelpMessage(getClass());
}
private enum RoleOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java
index 8e7f146..c4a44ac 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java
@@ -28,18 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "schema")
public class SchemaCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: schema [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details \n"
- + " --list-all\n"
- + " --list-plain\n"
- + " --list-derived\n"
- + " --list-virtual\n"
- + " --read {SCHEMA-TYPE} {SCHEMA-KEY}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL\n"
- + " --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL\n";
+ private final SchemaResultManager schemaResultManager = new SchemaResultManager();
@Override
public void execute(final Input input) {
@@ -73,16 +62,16 @@ public class SchemaCommand extends AbstractCommand {
new SchemaDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new SchemaResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ schemaResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return schemaResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java
index 96643ea..215c865 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java
@@ -28,13 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "workflow")
public class WorkflowCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: workflow [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --export-diagram {ANY-TYPE-KIND}\n"
- + " Any type kind: ANY_OBJECT / USER / GROUP\n"
- + " --export-definition {ANY-TYPE-KIND}\n"
- + " Any type kind: ANY_OBJECT / USER / GROUP\n";
+ private final WorkflowResultManager workflowResultManager = new WorkflowResultManager();
@Override
public void execute(final Input input) {
@@ -50,16 +44,16 @@ public class WorkflowCommand extends AbstractCommand {
new WorkflowExportDefinition(input).export();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new WorkflowResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ workflowResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return workflowResultManager.commandHelpMessage(getClass());
}
private enum UserWorkflowOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java
index 6794667..074e17c 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java
@@ -28,26 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "task")
public class TaskCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: task [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --details\n"
- + " --list\n"
- + " Syntax: --list {TASK-TYPE} \n"
- + " Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n"
- + " --list-running-jobs \n"
- + " --list-scheduled-jobs \n"
- + " --read \n"
- + " Syntax: --read {TASK-ID} {TASK-ID} [...]\n"
- + " --read-execution \n"
- + " Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n"
- + " --delete \n"
- + " Syntax: --delete {TASK-ID} {TASK-ID} [...]\n"
- + " --delete-execution \n"
- + " Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n"
- + " --execute \n"
- + " Syntax: --execute {TASK-ID} {DRY-RUN}\n"
- + " Dry run: true / false\n";
+ private final TaskResultManager taskResultManager = new TaskResultManager();
@Override
public void execute(final Input input) {
@@ -84,16 +65,16 @@ public class TaskCommand extends AbstractCommand {
new TaskExecute(input).execute();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new TaskResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ taskResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return taskResultManager.commandHelpMessage(getClass());
}
private enum Options {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
index 2637c20..7339f25 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
@@ -28,26 +28,8 @@ import org.apache.syncope.client.cli.commands.AbstractCommand;
@Command(name = "user")
public class UserCommand extends AbstractCommand {
- private static final String HELP_MESSAGE = "\nUsage: user [options]\n"
- + " Options:\n"
- + " --help \n"
- + " --list \n"
- + " --details \n"
- + " --get-user-key\n"
- + " Syntax: --get-user-key {USERNAME} {USERNAME} [...]\n"
- + " --get-username\n"
- + " Syntax: --get-username {USER-ID} {USER-ID} [...]\n"
- + " --read \n"
- + " Syntax: --read {USER-ID} {USER-ID} [...]\n"
- + " --search-by-attribute \n"
- + " Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n"
- + " --search-by-role \n"
- + " Syntax: --search-by-role {REALM} {ROLE-ID}\n"
- + " --search-by-resource \n"
- + " Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n"
- + " --delete \n"
- + " Syntax: --delete {USER-ID} {USER-ID} [...]\n";
-
+ private final UserResultManager userResultManager = new UserResultManager();
+
@Override
public void execute(final Input input) {
if (StringUtils.isBlank(input.getOption())) {
@@ -83,16 +65,16 @@ public class UserCommand extends AbstractCommand {
new UserDelete(input).delete();
break;
case HELP:
- System.out.println(HELP_MESSAGE);
+ System.out.println(getHelpMessage());
break;
default:
- new UserResultManager().defaultOptionMessage(input.getOption(), HELP_MESSAGE);
+ userResultManager.defaultOptionMessage(input.getOption(), getHelpMessage());
}
}
@Override
public String getHelpMessage() {
- return HELP_MESSAGE;
+ return userResultManager.commandHelpMessage(getClass());
}
private enum UserOptions {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java b/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
index c062524..c634f84 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/view/Messages.java
@@ -19,9 +19,12 @@
package org.apache.syncope.client.cli.view;
import java.util.List;
+import java.util.ResourceBundle;
public final class Messages {
+ private static final ResourceBundle MESSAGES = ResourceBundle.getBundle("messages");
+
private static final String OPTION_COMMAND_MESSAGE_TEMPLATE = "\n - Usage: %s\n";
private static final String CREATED_MESSAGE_TEMPLATE = "%s %s successfully created";
@@ -89,10 +92,15 @@ public final class Messages {
public static void printDefaultMessage(final String option, final String helpMessage) {
printMessage(String.format(DEFAULT_MESSAGE_TEMPLATE, option, helpMessage));
}
-
+
public static void printUnnecessaryParameters(final List<String> parameters, final String helpMessage) {
printMessage("Unnecessary parameter: " + parameters, "Usage: " + helpMessage);
}
+
+ public static String commandHelpMessage(String name) {
+ return MESSAGES.getString(name + ".help.message");
+ }
+
private Messages() {
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d59380af/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
new file mode 100644
index 0000000..9c3a38f
--- /dev/null
+++ b/client/cli/src/main/resources/messages.properties
@@ -0,0 +1,18 @@
+any.help.message=\nUsage: any [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {ANY-ID} {ANY-ID} [...]\n --read-attr-by-schema-type {ANY-ID} {SCHEMA-TYPE}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --read-attr-by-schema {ANY-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --delete \n Syntax: --delete {ANY-ID} {ANY-ID} [...]\n
+configuration.help.message=\nUsage: configuration [options]\n Options:\n --help \n --get \n --read \n Syntax: --read {CONF-NAME} {CONF-NAME} [...] \n --update \n Syntax: --update {CONF-NAME}={CONF-VALUE} {CONF-NAME}={CONF-VALUE} [...]\n --delete \n Syntax: --delete {CONF-NAME} {CONF-NAME} [...]\n --export \n Syntax: --export {WHERE-DIR}\n
+connector.help.message=\nUsage: connector [options]\n Options:\n --help \n --details \n --list \n --list-bundles \n --list-configuration-properties\n Syntax: --list-configuration-properties {CONNECTOR-ID} {CONNECTOR-ID} [...]\n --read \n Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n --delete \n Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n
+domain.help.message=\nUsage: domain [options]\n Options:\n --help \n --details \n --list \n --delete \n Syntax: --delete {DOMAIN-NAME} {DOMAIN-NAME} [...]\n
+entitlement.help.message=\nUsage: entitlement [options]\n Options:\n --help \n --list\n --list-role\n Syntax: --list-role {ENTITLEMENT-NAME}\n --read-by-username\n Syntax: --read-by-username {USERNAME}\n --read-by-userid\n Syntax: --read-by-userid {USER-ID}\n --search-by-role\n Syntax: --search-by-role {ROLE-ID}\n
+group.help.message=\nUsage: group [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {GROUP-ID} {GROUP-ID} [...]\n --read-attr-by-schema-type {GROUP-ID} {SCHEMA-TYPE}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --read-attr-by-schema {GROUP-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --delete \n Syntax: --delete {GROUP-ID} {GROUP-ID} [...]\n
+logger.help.message=\nUsage: logger [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {LOG-NAME} {LOG-NAME} [...]\n --update \n Syntax: --update {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n --update-all \n Syntax: --update-all {LOG-LEVEL} \n --create \n Syntax: --create {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n --delete \n Syntax: --delete {LOG-NAME} {LOG-NAME} [...]\n
+notification.help.message=\nUsage: notification [options]\n Options:\n --help \n --list \n --read \n Syntax: --read {NOTIFICATION-ID} \n --delete \n Syntax: --delete {NOTIFICATION-ID}\n
+policy.help.message=\nUsage: policy [options]\n Options:\n --help \n --details \n --list \n Syntax: --list-policy {POLICY-TYPE} \n Policy type: ACCOUNT / PASSWORD / SYNC / PUSH\n --read \n Syntax: --read {POLICY-ID} {POLICY-ID} [...]\n --delete \n Syntax: --delete {POLICY-ID} {POLICY-ID} [...]\n
+question.help.message=\nUsage: question [options]\n Options:\n --help \n --list \n --read \n Syntax: --read {QUESTION-ID} {QUESTION-ID} [...]\n --delete \n Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]\n
+realm.help.message=\nUsage: realm [options]\n Options:\n --help \n --details \n --list \n
+report.help.message=\nUsage: report [options]\n Options:\n --help \n --details\n --list \n --list-jobs \n --read \n Syntax: --read {REPORT-ID} {REPORT-ID} [...] \n --delete \n Syntax: --delete {REPORT-ID} {REPORT-ID} [...]\n --execute \n Syntax: --execute {REPORT-ID} \n --read-execution \n Syntax: --read-execution {EXECUTION-ID} {EXECUTION-ID} [...]\n --delete-execution \n Syntax: --delete-execution {EXECUTION-ID} {EXECUTION-ID} [...]\n --export-execution-result \n Syntax: --export-execution-result {EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}\n Format: CSV / HTML / PDF / XML / RTF\n
+resource.help.message=\nUsage: resource [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n --delete \n Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n
+role.help.message=\nUsage: role [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n --delete \n Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n
+schema.help.message=\nUsage: schema [options]\n Options:\n --help \n --details \n --list-all\n --list-plain\n --list-derived\n --list-virtual\n --read {SCHEMA-TYPE} {SCHEMA-KEY}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n Schema type: PLAIN / DERIVED / VIRTUAL\n
+task.help.message=\nUsage: task [options]\n Options:\n --help \n --details\n --list\n Syntax: --list {TASK-TYPE} \n Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n --list-running-jobs \n --list-scheduled-jobs \n --read \n Syntax: --read {TASK-ID} {TASK-ID} [...]\n --read-execution \n Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n --delete \n Syntax: --delete {TASK-ID} {TASK-ID} [...]\n --delete-execution \n Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n --execute \n Syntax: --execute {TASK-ID} {DRY-RUN}\n Dry run: true / false\n
+user.help.message=\nUsage: user [options]\n Options:\n --help \n --list \n --details \n --get-user-key\n Syntax: --get-user-key {USERNAME} {USERNAME} [...]\n --get-username\n Syntax: --get-username {USER-ID} {USER-ID} [...]\n --read \n Syntax: --read {USER-ID} {USER-ID} [...]\n --search-by-attribute \n Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n --search-by-role \n Syntax: --search-by-role {REALM} {ROLE-ID}\n --search-by-resource \n Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n --delete \n Syntax: --delete {USER-ID} {USER-ID} [...]\n
+workflow.help.message=\nUsage: workflow [options]\n Options:\n --help \n --export-diagram {ANY-TYPE-KIND}\n Any type kind: ANY_OBJECT / USER / GROUP\n --export-definition {ANY-TYPE-KIND}\n Any type kind: ANY_OBJECT / USER / GROUP\n
\ No newline at end of file