[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16194105#comment-16194105
 ] 

ASF subversion and git services commented on OPENMEETINGS-980:
--

Commit 2fcaff5c0779b23711d7f03a5a60c00fe5fcab6e in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=2fcaff5 ]

[OPENMEETINGS-980] plugin versions are updated, wicket-jquery-ui version is 
updated


> Library versions should be updated
> --
>
> Key: OPENMEETINGS-980
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-980
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Library versions should be keep up to date (continuous task)



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-980] plugin versions are updated, wicket-jquery-ui version is updated

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 90a7ecddf -> 2fcaff5c0


[OPENMEETINGS-980] plugin versions are updated, wicket-jquery-ui version is 
updated


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2fcaff5c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2fcaff5c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2fcaff5c

Branch: refs/heads/master
Commit: 2fcaff5c0779b23711d7f03a5a60c00fe5fcab6e
Parents: 90a7ecd
Author: Maxim Solodovnik 
Authored: Fri Oct 6 10:44:42 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Oct 6 10:44:42 2017 +0700

--
 openmeetings-server/pom.xml |  2 +-
 openmeetings-web/pom.xml|  2 +-
 pom.xml | 58 +---
 3 files changed, 39 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2fcaff5c/openmeetings-server/pom.xml
--
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index c824813..7907c5c 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -150,7 +150,7 @@

org.codehaus.mojo
exec-maven-plugin
-   1.6.0
+   ${exec-maven-plugin.version}



generate-configs-xml-site

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2fcaff5c/openmeetings-web/pom.xml
--
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 08a4050..535a46b 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -88,7 +88,7 @@

com.samaxes.maven
minify-maven-plugin
-   1.7.6
+   
${minify-maven-plugin.version}


theme-minify

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2fcaff5c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7b19f38..4c119f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,10 +36,26 @@
DEPLOYMENT
false
derby
+   
+   
3.0.0-M1
+   
2.20.1
+   3.3
+   1.6.0
+   1.7.6
+   
3.0.0-M1
+   3.0.1
+   
1.6
+   1.6
+   
1.14
+   
1.1.1
+   
3.7.0
+   
2.9
+   3.0.2
+   
3.1.0
+   
3.0.2
+   3.3.0
+   
4.12
-   2.10.3
-   2.20
-   3.3
8.0.0-SNAPSHOT
8.0.0-SNAPSHOT
8.0.0-M7
@@ -103,7 +119,7 @@


org.apache.maven.plugins

maven-enforcer-plugin
-   1.4.1
+   
${maven-enforcer-plugin.version}



enforce-versions
@@ -124,7 +140,7 @@


org.apache.maven.plugins

maven-source-plugin
-   3.0.1
+   
${maven-source-plugin.version}



attach-sources
@@ -149,7 +165,7 @@


net.nicoulaj.maven.plugins

checksum-maven-plugin
-   1.5
+   
${checksum-maven-plugin.version}



@@

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16194068#comment-16194068
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit 90a7ecddf1397b664c46d9a0bc9d159cb4f5c3ad in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=90a7ecd ]

[OPENMEETINGS-1714] coverage is improved


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1714] coverage is improved

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 699e03608 -> 90a7ecddf


[OPENMEETINGS-1714] coverage is improved


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/90a7ecdd
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/90a7ecdd
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/90a7ecdd

Branch: refs/heads/master
Commit: 90a7ecddf1397b664c46d9a0bc9d159cb4f5c3ad
Parents: 699e036
Author: Maxim Solodovnik 
Authored: Fri Oct 6 10:10:11 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Oct 6 10:10:11 2017 +0700

--
 .../org/apache/openmeetings/web/pages/install/TestInstall.java   | 4 +++-
 pom.xml  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/90a7ecdd/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index 5ee85a8..2c91432 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -120,8 +120,10 @@ public class TestInstall {
tester.executeBehavior(next); //crypt step
// not checking errors
if (countErrors(tester) > 0) {
-   tester.executeBehavior(next); //skip errors
tester.cleanupFeedbackMessages();
+   wizardTester.setValue("view:docDpi", "150");
+   wizardTester.setValue("view:docQuality", "90");
+   tester.executeBehavior(next); //skip errors
}
wizardTester.setValue("view:cryptClassName", 
SCryptImplementation.class.getName());
tester.executeBehavior(next); //install step

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/90a7ecdd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2429fe3..7b19f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
2.20
3.3
8.0.0-SNAPSHOT
-   8.0.0-M7
+   8.0.0-SNAPSHOT
8.0.0-M7
1.0.10-M4
1.0.10-M4

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16192870#comment-16192870
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit 699e0360860662f75f2a069b467dc88e8260384e in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=699e036 ]

[OPENMEETINGS-1714] coverage is improved


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1714] coverage is improved

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 21caf9d88 -> 699e03608


[OPENMEETINGS-1714] coverage is improved


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/699e0360
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/699e0360
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/699e0360

Branch: refs/heads/master
Commit: 699e0360860662f75f2a069b467dc88e8260384e
Parents: 21caf9d
Author: Maxim Solodovnik 
Authored: Thu Oct 5 20:26:29 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Oct 5 20:26:29 2017 +0700

--
 .../core/converter/BaseConverter.java   |  16 +--
 .../core/converter/DocumentConverter.java   |  16 +--
 .../core/converter/FlvExplorerConverter.java|  10 +-
 .../core/converter/ImageConverter.java  |  26 ++---
 .../core/converter/InterviewConverter.java  |   8 +-
 .../core/converter/RecordingConverter.java  |   4 +-
 .../core/data/file/FileProcessor.java   |  23 ++--
 .../db/dao/file/FileItemLogDao.java |   4 +-
 .../db/entity/file/FileItemLog.java |   2 +-
 .../util/process/ConverterProcessResult.java| 116 ---
 .../process/ConverterProcessResultList.java | 106 -
 .../util/process/FileImportError.java   |  52 -
 .../util/process/ProcessHelper.java |  10 +-
 .../util/process/ProcessResult.java | 116 +++
 .../util/process/ProcessResultList.java |  87 ++
 .../web/pages/install/InstallWizard.java|   4 +-
 .../web/room/sidebar/UploadDialog.java  |   8 +-
 .../core/file/TestFileProcessor.java|   4 +-
 .../webservice/TestErrorService.java|  49 +++-
 .../openmeetings/webservice/FileWebService.java |   4 +-
 20 files changed, 318 insertions(+), 347 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/699e0360/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
--
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 7d2c681..11a7e01 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -49,7 +49,7 @@ import 
org.apache.openmeetings.db.entity.record.RecordingMetaData;
 import org.apache.openmeetings.db.entity.record.RecordingMetaData.Status;
 import org.apache.openmeetings.db.entity.record.RecordingMetaDelta;
 import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.process.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ProcessResult;
 import org.apache.openmeetings.util.process.ProcessHelper;
 import org.red5.io.flv.impl.FLVWriter;
 import org.red5.logging.Red5LoggerFactory;
@@ -159,14 +159,14 @@ public abstract class BaseConverter {
return argv.toArray(new String[0]);
}
 
-   protected void stripAudioFirstPass(Recording recording, 
List returnLog,
+   protected void stripAudioFirstPass(Recording recording, 
List returnLog,
List waveFiles, File streamFolder)
{
stripAudioFirstPass(recording, returnLog, waveFiles, 
streamFolder
, 
metaDataDao.getAudioMetaDataByRecording(recording.getId()));
}
 
-   private String[] addSoxPad(List returnLog, 
String job, double length, double position, File inFile, File outFile) throws 
IOException {
+   private String[] addSoxPad(List returnLog, String job, 
double length, double position, File inFile, File outFile) throws IOException {
//FIXME need to check this
if (length < 0 || position < 0) {
log.debug("::addSoxPad {} Invalid parameters: length = 
{}; position = {}; inFile = {}", job, length, position, inFile);
@@ -250,7 +250,7 @@ public abstract class BaseConverter {
}
 
protected void stripAudioFirstPass(Recording recording,
-   List returnLog,
+   List returnLog,
List waveFiles, File streamFolder,
List metaDataList) {
try {
@@ -384,7 +384,7 @@ public abstract class BaseConverter {
return argv;
}
 
-   protected String convertToMp4(Recording r, List _argv, 
List returnLog) throws IOException {
+   protected String convertToMp4(Recording r,

openmeetings git commit: [OPENMEETINGS-1714] coverage is improved

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 594ea5fc1 -> 21caf9d88


[OPENMEETINGS-1714] coverage is improved


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/21caf9d8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/21caf9d8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/21caf9d8

Branch: refs/heads/master
Commit: 21caf9d88e21785ce73eccc1182ec290746842d1
Parents: 594ea5f
Author: Maxim Solodovnik 
Authored: Thu Oct 5 18:39:26 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Oct 5 18:39:26 2017 +0700

--
 .../openmeetings/AbstractJUnitDefaults.java |  2 +
 .../openmeetings/AbstractWicketTester.java  |  2 -
 .../web/pages/install/TestInstall.java  |  3 +-
 .../webservice/TestErrorService.java| 43 
 .../webservice/TestUserService.java |  2 -
 5 files changed, 47 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
index 65a58ab..178e556 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
@@ -24,6 +24,7 @@ import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplic
 import static org.junit.Assert.assertNotNull;
 
 import java.util.Date;
+import java.util.Random;
 import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -52,6 +53,7 @@ public abstract class AbstractJUnitDefaults extends 
AbstractSpringTest {
public static final String userpass = "Q!w2e3r4t5";
public static final String group = "smoketest";
public static final String email = "ju...@openmeetings.apache.org";
+   public static final Random rnd = new Random();
 
@Autowired
private AppointmentDao appointmentDao;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
index 6c6c0d5..69a9a50 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
@@ -32,7 +32,6 @@ import static 
org.springframework.web.context.WebApplicationContext.ROOT_WEB_APP
 import java.io.Serializable;
 import java.util.List;
 import java.util.Locale;
-import java.util.Random;
 
 import javax.servlet.ServletContext;
 
@@ -54,7 +53,6 @@ import 
com.googlecode.wicket.jquery.ui.widget.dialog.ButtonAjaxBehavior;
 public class AbstractWicketTester extends AbstractJUnitDefaults {
private static final Logger log = getLogger(AbstractWicketTester.class, 
getWebAppRootKey());
protected WicketTester tester;
-   protected Random rnd = new Random();
 
public static WicketTester getWicketTester() {
return getWicketTester(-1);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index 06946a0..5ee85a8 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -91,6 +91,7 @@ public class TestInstall {
InstallWizard wiz = (InstallWizard)page.get(WIZARD_PATH);
assertNull("Model should be null", 
wiz.getWizardModel().getActiveStep());

tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0)); 
//welcome step
+   assertNotNull("Model should NOT be null", 
wiz.getWizardModel().getActiveStep());
 
ButtonAjaxBehavior prev = getButtonBehavior(tester, 
WIZARD_PATH, "PREV"); //check enabled
log.debug("Prev button

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16192768#comment-16192768
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit 21caf9d88e21785ce73eccc1182ec290746842d1 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=21caf9d ]

[OPENMEETINGS-1714] coverage is improved


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1714] coverage is improved

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 50ec59c5c -> 594ea5fc1


[OPENMEETINGS-1714] coverage is improved


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/594ea5fc
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/594ea5fc
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/594ea5fc

Branch: refs/heads/master
Commit: 594ea5fc1fb5086d3e96b31ca90325af8c1174f4
Parents: 50ec59c
Author: Maxim Solodovnik 
Authored: Thu Oct 5 17:34:52 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Oct 5 17:34:52 2017 +0700

--
 .../org/apache/openmeetings/AbstractWicketTester.java | 10 +-
 .../openmeetings/web/pages/install/TestInstall.java   |  9 -
 2 files changed, 17 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/594ea5fc/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
index 4e31990..6c6c0d5 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
@@ -134,8 +134,16 @@ public class AbstractWicketTester extends 
AbstractJUnitDefaults {
checkErrors(tester, count);
}
 
+   public static List getErrors(WicketTester tester) {
+   return tester.getFeedbackMessages(new 
ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR));
+   }
+
+   public static int countErrors(WicketTester tester) {
+   return getErrors(tester).size();
+   }
+
public static void checkErrors(WicketTester tester, int count) {
-   List errors = tester.getFeedbackMessages(new 
ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR));
+   List errors = getErrors(tester);
if (count != errors.size()) {
for (FeedbackMessage fm : errors) {
log.debug("Error {}", fm);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/594ea5fc/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index 5f0feac..06946a0 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -25,12 +25,14 @@ import static 
org.apache.openmeetings.AbstractJUnitDefaults.email;
 import static org.apache.openmeetings.AbstractJUnitDefaults.group;
 import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
 import static org.apache.openmeetings.AbstractWicketTester.checkErrors;
+import static org.apache.openmeetings.AbstractWicketTester.countErrors;
 import static org.apache.openmeetings.AbstractWicketTester.getButtonBehavior;
 import static org.apache.openmeetings.AbstractWicketTester.getWicketTester;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.red5.logging.Red5LoggerFactory.getLogger;
 
 import java.io.File;
@@ -86,6 +88,8 @@ public class TestInstall {
public void testInstall() {
InstallWizardPage page = 
tester.startPage(InstallWizardPage.class);
tester.assertRenderedPage(InstallWizardPage.class);
+   InstallWizard wiz = (InstallWizard)page.get(WIZARD_PATH);
+   assertNull("Model should be null", 
wiz.getWizardModel().getActiveStep());

tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0)); 
//welcome step
 
ButtonAjaxBehavior prev = getButtonBehavior(tester, 
WIZARD_PATH, "PREV"); //check enabled
@@ -114,7 +118,10 @@ public class TestInstall {
wizardTester.setValue("view:docQuality", "90");
tester.executeBehavior(next); //crypt step
// not checking errors
-   tester.cleanupFeedbackMessages();
+

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16192709#comment-16192709
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit 594ea5fc1fb5086d3e96b31ca90325af8c1174f4 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=594ea5f ]

[OPENMEETINGS-1714] coverage is improved


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1714] coverage is improved

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master e150dc3a3 -> 50ec59c5c


[OPENMEETINGS-1714] coverage is improved


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/50ec59c5
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/50ec59c5
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/50ec59c5

Branch: refs/heads/master
Commit: 50ec59c5c0c6097e35f6ba72c83ec35a79bc71dc
Parents: e150dc3
Author: Maxim Solodovnik 
Authored: Thu Oct 5 16:57:34 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Oct 5 16:57:34 2017 +0700

--
 .../webservice/TestInfoService.java | 37 
 1 file changed, 37 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/50ec59c5/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
--
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
new file mode 100644
index 000..1ea7d94
--- /dev/null
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.openmeetings.webservice;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.apache.openmeetings.db.dto.basic.Info;
+import org.junit.Test;
+
+public class TestInfoService extends AbstractWebServiceTest {
+   public static final String INFO_SERVICE_URL = BASE_SERVICES_URL + 
"/info";
+
+   @Test
+   public void infoTest() {
+   Info info = 
getClient(INFO_SERVICE_URL).path("/version").get(Info.class);
+   assertNotNull("Valid info should be returned", info);
+   assertNotNull("Valid BuildDate should be returned", 
info.getBuildDate());
+   assertNotNull("Valid Revision should be returned", 
info.getRevision());
+   assertNotNull("Valid Version should be returned", 
info.getVersion());
+   }
+}

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16192687#comment-16192687
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit 50ec59c5c0c6097e35f6ba72c83ec35a79bc71dc in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=50ec59c ]

[OPENMEETINGS-1714] coverage is improved


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16192670#comment-16192670
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit e150dc3a36349adf81518734c472764ac88999ab in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=e150dc3 ]

[OPENMEETINGS-1714] more issues are fixed


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1714] more issues are fixed

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master effe83366 -> e150dc3a3


[OPENMEETINGS-1714] more issues are fixed


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e150dc3a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e150dc3a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e150dc3a

Branch: refs/heads/master
Commit: e150dc3a36349adf81518734c472764ac88999ab
Parents: effe833
Author: Maxim Solodovnik 
Authored: Thu Oct 5 16:45:08 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Oct 5 16:45:08 2017 +0700

--
 .../java/org/apache/openmeetings/cli/Admin.java |  3 -
 .../InstallationDocumentHandler.java| 62 
 .../apache/openmeetings/util/OmFileHelper.java  |  5 --
 .../web/pages/install/TestInstall.java  |  3 +-
 4 files changed, 2 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e150dc3a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java 
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 86fc5b0..616e190 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -62,7 +62,6 @@ import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.util.ApplicationHelper;
 import org.apache.openmeetings.installation.ImportInitvalues;
 import org.apache.openmeetings.installation.InstallationConfig;
-import org.apache.openmeetings.installation.InstallationDocumentHandler;
 import org.apache.openmeetings.util.CalendarPatterns;
 import org.apache.openmeetings.util.ConnectionProperties;
 import org.apache.openmeetings.util.ImportHelper;
@@ -279,8 +278,6 @@ public class Admin {
ImportInitvalues importInit = 
getApplicationContext().getBean(ImportInitvalues.class);
importInit.loadAll(cfg, force);
}
-
-   
InstallationDocumentHandler.createDocument(3);
} catch(Exception e) {
handleError("Install failed", e);
}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e150dc3a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
deleted file mode 100644
index 1947c20..000
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.apache.openmeetings.installation;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-import org.apache.openmeetings.util.OmFileHelper;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-import org.dom4j.io.XMLWriter;
-
-public class InstallationDocumentHandler {
-   private InstallationDocumentHandler() {}
-
-   public static void createDocument(int stepNo) throws Exception {
-   Document document = DocumentHelper.createDocument();
-
-   Element root = document.addElement("install");
-

[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed

2017-10-05 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16192644#comment-16192644
 ] 

ASF subversion and git services commented on OPENMEETINGS-1714:
---

Commit effe833661584800f5fe6bb467be4f610fdb7739 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=effe833 ]

[OPENMEETINGS-1714] more issues are fixed


> Issues reported by Sonar should be fixed
> 
>
> Key: OPENMEETINGS-1714
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714
> Project: Openmeetings
>  Issue Type: Task
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Issues reported by Sonar should be fixed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1714] more issues are fixed

2017-10-05 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 4393fb1d8 -> effe83366


[OPENMEETINGS-1714] more issues are fixed


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/effe8336
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/effe8336
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/effe8336

Branch: refs/heads/master
Commit: effe833661584800f5fe6bb467be4f610fdb7739
Parents: 4393fb1
Author: Maxim Solodovnik 
Authored: Thu Oct 5 16:07:09 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Oct 5 16:07:09 2017 +0700

--
 .../java/org/apache/openmeetings/cli/Admin.java |   3 +-
 .../cli/ConnectionPropertiesPatcher.java|   1 +
 .../apache/openmeetings/cli/DerbyPatcher.java   |   7 +-
 .../apache/openmeetings/cli/MssqlPatcher.java   |   4 +-
 .../apache/openmeetings/cli/MysqlPatcher.java   |   4 +-
 .../apache/openmeetings/cli/OraclePatcher.java  |   2 +-
 .../openmeetings/cli/PostgresPatcher.java   |   4 +-
 .../util/OpenmeetingsVariables.java |   1 +
 .../openmeetings/AbstractJUnitDefaults.java |  16 +--
 .../openmeetings/AbstractWicketTester.java  |  22 
 .../apache/openmeetings/web/TestInstall.java|  64 --
 .../web/pages/auth/TestLoginUI.java |  17 ---
 .../web/pages/install/TestInstall.java  | 123 +++
 13 files changed, 168 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/effe8336/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java 
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 3afd80e..86fc5b0 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.cli;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static 
org.apache.openmeetings.db.util.ApplicationHelper.destroyApplication;
 import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_CONTEXT_NAME;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName;
@@ -185,7 +186,7 @@ public class Admin {
}
 
private void process(String[] args) {
-   String ctxName = System.getProperty("context", "openmeetings");
+   String ctxName = System.getProperty("context", 
DEFAULT_CONTEXT_NAME);
setWicketApplicationName(ctxName);
File home = new File(System.getenv("RED5_HOME"));
OmFileHelper.setOmHome(new File(new File(home, "webapps"), 
ctxName));

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/effe8336/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
index b46f607..441b2b1 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
@@ -42,6 +42,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public abstract class ConnectionPropertiesPatcher {
+   public static final String DEFAULT_DB_NAME = "openmeetings";
protected static final String URL_PREFIX = "Url";
protected static final String DRIVER_PREFIX = "DriverClassName";
protected static final String USER_PREFIX = "Username";

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/effe8336/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
index 402b598..c79aa1a 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
+++