[jira] [Resolved] (TOMEE-1888) tomcat context.xml datasource can be created twice in a different way when singleton

2016-07-26 Thread Romain Manni-Bucau (JIRA) 

 [ 
https://issues.apache.org/jira/browse/TOMEE-1888?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Romain Manni-Bucau resolved TOMEE-1888.
---
Resolution: Fixed

> tomcat context.xml datasource can be created twice in a different way when 
> singleton
> 
>
> Key: TOMEE-1888
> URL: https://issues.apache.org/jira/browse/TOMEE-1888
> Project: TomEE
>  Issue Type: Bug
>Reporter: Romain Manni-Bucau
>Assignee: Romain Manni-Bucau
> Fix For: 7.0.2
>
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

tomee git commit: TOMEE-1886 add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code

2016-07-26 Thread rmannibucau 
Repository: tomee
Updated Branches:
  refs/heads/master 20ea8808a -> f54517fb3


TOMEE-1886 add tomee.embedded.add-callers flag to tomee embeddded to be able to 
skip add caller code


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

Branch: refs/heads/master
Commit: f54517fb398807ed46120caa08ee841399656254
Parents: 20ea880
Author: Romain manni-Bucau 
Authored: Tue Jul 26 08:44:59 2016 +0200
Committer: Romain manni-Bucau 
Committed: Tue Jul 26 08:44:59 2016 +0200

--
 .../src/main/java/org/apache/tomee/embedded/Container.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/f54517fb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
--
diff --git 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index bb2ccd5..d3d5538 100644
--- 
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ 
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -278,7 +278,9 @@ public class Container implements AutoCloseable {
 throw new IllegalStateException(e);
 }
 
-addCallersAsEjbModule(loader, app, additionalCallers);
+if (!SystemInstance.isInitialized() || 
Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.embedded.add-callers",
 "true"))) {
+addCallersAsEjbModule(loader, app, additionalCallers);
+}
 
 systemInstance.addObserver(new 
StandardContextCustomizer(configuration, webModule, keepClassloader));
 if 
(systemInstance.getComponent(AnnotationDeployer.FolderDDMapper.class) == null) {

[jira] [Created] (TOMEE-1886) add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code

2016-07-26 Thread Romain Manni-Bucau (JIRA) 
Romain Manni-Bucau created TOMEE-1886:
-

 Summary: add tomee.embedded.add-callers flag to tomee embeddded to 
be able to skip add caller code
 Key: TOMEE-1886
 URL: https://issues.apache.org/jira/browse/TOMEE-1886
 Project: TomEE
  Issue Type: Improvement
Reporter: Romain Manni-Bucau
Assignee: Romain Manni-Bucau
 Fix For: 7.0.2






--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (TOMEE-1887) Cipher command exception swalled

2016-07-26 Thread Jean-Louis MONTEIRO (JIRA) 

 [ 
https://issues.apache.org/jira/browse/TOMEE-1887?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jean-Louis MONTEIRO resolved TOMEE-1887.

Resolution: Fixed

> Cipher command exception swalled
> 
>
> Key: TOMEE-1887
> URL: https://issues.apache.org/jira/browse/TOMEE-1887
> Project: TomEE
>  Issue Type: Bug
>Reporter: Jean-Louis MONTEIRO
>Assignee: Jean-Louis MONTEIRO
> Fix For: 1.7.5, 7.0.2
>
>
> Cipher command line tool swallows exceptions and always prints 
> Could not load password cipher implementation class. Check your classpath.
> Available ciphers are: xxx



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (TOMEE-1887) Cipher command exception swalled

2016-07-26 Thread Jean-Louis MONTEIRO (JIRA) 
Jean-Louis MONTEIRO created TOMEE-1887:
--

 Summary: Cipher command exception swalled
 Key: TOMEE-1887
 URL: https://issues.apache.org/jira/browse/TOMEE-1887
 Project: TomEE
  Issue Type: Bug
Reporter: Jean-Louis MONTEIRO
Assignee: Jean-Louis MONTEIRO
 Fix For: 1.7.5, 7.0.2


Cipher command line tool swallows exceptions and always prints 

Could not load password cipher implementation class. Check your classpath.
Available ciphers are: xxx



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

tomee git commit: Remove execution block from the lookup block to not mix the exceptions

2016-07-26 Thread jlmonteiro 
Repository: tomee
Updated Branches:
  refs/heads/TOMEE-1887-cipher-command-hidden 2a7e0c4e9 -> 4aae16ccd


Remove execution block from the lookup block to not mix the exceptions


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

Branch: refs/heads/TOMEE-1887-cipher-command-hidden
Commit: 4aae16ccd86f28e86675925a12c44a1e5df0730d
Parents: 2a7e0c4
Author: Jean-Louis Monteiro 
Authored: Tue Jul 26 12:11:33 2016 +0200
Committer: Jean-Louis Monteiro 
Committed: Tue Jul 26 12:11:33 2016 +0200

--
 .../java/org/apache/openejb/cli/MainImpl.java   |  5 ++--
 .../java/org/apache/openejb/config/Cipher.java  | 31 +++-
 2 files changed, 20 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/4aae16cc/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java 
b/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
index 5082309..66d11aa 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
@@ -69,8 +69,8 @@ public class MainImpl implements Main {
 
 // create the Options
 final Options options = new Options();
-options.addOption(null, "version", false, "");
-options.addOption("h", "help", false, "");
+options.addOption(null, "version", false, "Display version");
+options.addOption("h", "help", false, "Display help");
 options.addOption("e", "errors", false, "Produce execution error 
messages");
 
 CommandLine line = null;
@@ -241,6 +241,7 @@ public class MainImpl implements Main {
 final String footer = "\n" +
 "Try 'openejb  --help' for help on a specific 
command.\n" +
 "For example 'openejb deploy --help'.\n" +
+"Important: to display exceptions while running commands, add 
-e option.\n" +
 "\n" +
 "Apache OpenEJB -- EJB Container System and Server.\n" +
 "For additional information, see http://tomee.apache.org\n; +

http://git-wip-us.apache.org/repos/asf/tomee/blob/4aae16cc/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java 
b/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
index 41d4d18..7996077 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
@@ -80,27 +80,29 @@ public class Cipher {
 return;
 }
 
+final PasswordCipher cipher;
 try {
-final PasswordCipher cipher = 
PasswordCipherFactory.getPasswordCipher(cipherName);
-
-if (line.hasOption("decrypt")) {
-final String pwdArg = (String) line.getArgList().get(0);
-final char[] encryptdPassword = pwdArg.toCharArray();
-System.out.println(cipher.decrypt(encryptdPassword));
-
-} else { // if option neither encrypt/decrypt is specified, we 
assume
-// it is encrypt.
-final String plainPassword = (String) line.getArgList().get(0);
-System.out.println(new String(cipher.encrypt(plainPassword)));
-}
+cipher = PasswordCipherFactory.getPasswordCipher(cipherName);
 
 } catch (final PasswordCipherException e) {
 System.out.println("Could not load password cipher implementation 
class. Check your classpath.");
-
 availableCiphers();
 
 throw new SystemExitException(-1);
 }
+
+if (line.hasOption("decrypt")) {
+final String pwdArg = (String) line.getArgList().get(0);
+final char[] encryptdPassword = pwdArg.toCharArray();
+
+System.out.println(cipher.decrypt(encryptdPassword));
+
+} else { // if option neither encrypt/decrypt is specified, we assume
+// it is encrypt.
+final String plainPassword = (String) line.getArgList().get(0);
+
+System.out.println(new String(cipher.encrypt(plainPassword)));
+}
 }
 
 private static void availableCiphers() {
@@ -108,7 +110,8 @@ public class Cipher {
 final ResourceFinder

tomee git commit: Remove execution block from the lookup block to not mix the exceptions

2016-07-26 Thread jlmonteiro 
Repository: tomee
Updated Branches:
  refs/heads/master f54517fb3 -> 6d4a0308a


Remove execution block from the lookup block to not mix the exceptions


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

Branch: refs/heads/master
Commit: 6d4a0308af2c451497553bcfc81e550095fa412c
Parents: f54517f
Author: Jean-Louis Monteiro 
Authored: Tue Jul 26 12:11:33 2016 +0200
Committer: Jean-Louis Monteiro 
Committed: Tue Jul 26 12:29:32 2016 +0200

--
 .../java/org/apache/openejb/cli/MainImpl.java   |  5 ++--
 .../java/org/apache/openejb/config/Cipher.java  | 31 +++-
 2 files changed, 20 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/6d4a0308/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java 
b/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
index bacaf9f..2764d34 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
@@ -69,8 +69,8 @@ public class MainImpl implements Main {
 
 // create the Options
 final Options options = new Options();
-options.addOption(null, "version", false, "");
-options.addOption("h", "help", false, "");
+options.addOption(null, "version", false, "Display version");
+options.addOption("h", "help", false, "Display help");
 options.addOption("e", "errors", false, "Produce execution error 
messages");
 
 CommandLine line = null;
@@ -241,6 +241,7 @@ public class MainImpl implements Main {
 final String footer = "\n" +
 "Try 'openejb  --help' for help on a specific 
command.\n" +
 "For example 'openejb deploy --help'.\n" +
+"Important: to display exceptions while running commands, add 
-e option.\n" +
 "\n" +
 "Apache OpenEJB -- EJB Container System and Server.\n" +
 "For additional information, see http://tomee.apache.org\n; +

http://git-wip-us.apache.org/repos/asf/tomee/blob/6d4a0308/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
--
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java 
b/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
index 41d4d18..7996077 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
@@ -80,27 +80,29 @@ public class Cipher {
 return;
 }
 
+final PasswordCipher cipher;
 try {
-final PasswordCipher cipher = 
PasswordCipherFactory.getPasswordCipher(cipherName);
-
-if (line.hasOption("decrypt")) {
-final String pwdArg = (String) line.getArgList().get(0);
-final char[] encryptdPassword = pwdArg.toCharArray();
-System.out.println(cipher.decrypt(encryptdPassword));
-
-} else { // if option neither encrypt/decrypt is specified, we 
assume
-// it is encrypt.
-final String plainPassword = (String) line.getArgList().get(0);
-System.out.println(new String(cipher.encrypt(plainPassword)));
-}
+cipher = PasswordCipherFactory.getPasswordCipher(cipherName);
 
 } catch (final PasswordCipherException e) {
 System.out.println("Could not load password cipher implementation 
class. Check your classpath.");
-
 availableCiphers();
 
 throw new SystemExitException(-1);
 }
+
+if (line.hasOption("decrypt")) {
+final String pwdArg = (String) line.getArgList().get(0);
+final char[] encryptdPassword = pwdArg.toCharArray();
+
+System.out.println(cipher.decrypt(encryptdPassword));
+
+} else { // if option neither encrypt/decrypt is specified, we assume
+// it is encrypt.
+final String plainPassword = (String) line.getArgList().get(0);
+
+System.out.println(new String(cipher.encrypt(plainPassword)));
+}
 }
 
 private static void availableCiphers() {
@@ -108,7 +110,8 @@ public class Cipher {
 final ResourceFinder finder = new ResourceFinder("META-INF/");

[tomee] Git Push Summary

2016-07-26 Thread jlmonteiro 
Repository: tomee
Updated Branches:
  refs/heads/TOMEE-1887-cipher-command-hidden [created] 2a7e0c4e9

[2/2] tomee git commit: Merge branch 'TOMEE-1887-cipher-command-hidden' into tomee-1.7.x

2016-07-26 Thread jlmonteiro 
Merge branch 'TOMEE-1887-cipher-command-hidden' into tomee-1.7.x


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

Branch: refs/heads/tomee-1.7.x
Commit: 0977da51eb03759f23407f2dabba81b17ae7fd31
Parents: 2a7e0c4 4aae16c
Author: Jean-Louis Monteiro 
Authored: Tue Jul 26 12:18:11 2016 +0200
Committer: Jean-Louis Monteiro 
Committed: Tue Jul 26 12:18:11 2016 +0200

--
 .../java/org/apache/openejb/cli/MainImpl.java   |  5 ++--
 .../java/org/apache/openejb/config/Cipher.java  | 31 +++-
 2 files changed, 20 insertions(+), 16 deletions(-)
--

[jira] [Resolved] (TOMEE-1886) add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code

2016-07-26 Thread Romain Manni-Bucau (JIRA) 

 [ 
https://issues.apache.org/jira/browse/TOMEE-1886?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Romain Manni-Bucau resolved TOMEE-1886.
---
Resolution: Fixed

> add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add 
> caller code
> -
>
> Key: TOMEE-1886
> URL: https://issues.apache.org/jira/browse/TOMEE-1886
> Project: TomEE
>  Issue Type: Improvement
>Reporter: Romain Manni-Bucau
>Assignee: Romain Manni-Bucau
> Fix For: 7.0.2
>
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)