You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/06 08:12:49 UTC
svn commit: r1210803 - in /karaf/trunk:
jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Author: jbonofre
Date: Tue Dec 6 07:12:49 2011
New Revision: 1210803
URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
Log:
[KARAF-541] Fix JMX SSL support
Modified:
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Modified: karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java (original)
+++ karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java Tue Dec 6 07:12:49 2011
@@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
private void checkForKeystoresAvailability(String keyStore, String keyAlias, String trustStore, long timeout) {
for (int i = 0; i < timeout / 1000; ++i) {
KeystoreInstance keyInstance = getKeystore(keyStore);
- if (keyInstance != null && keyInstance.isKeystoreLocked()) {
+ if (keyInstance == null || (keyInstance != null && keyInstance.isKeystoreLocked())) {
sleep(1000);
logger.info("Looking for keystore: {}...", keyStore);
continue;
}
- if (keyInstance != null && keyInstance.isKeyLocked(keyAlias)) {
+ if (keyInstance == null || (keyInstance != null && keyInstance.isKeyLocked(keyAlias))) {
sleep(1000);
logger.info("Looking for keystore's key: {}...", keyAlias);
continue;
}
KeystoreInstance trustInstance = trustStore == null ? null : getKeystore(trustStore);
- if (trustInstance != null && trustInstance.isKeystoreLocked()) {
+ if (trustInstance == null || (trustInstance != null && trustInstance.isKeystoreLocked())) {
sleep(1000);
logger.info("Looking for truststore: {}...", trustStore);
continue;
Modified: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
==============================================================================
--- karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java (original)
+++ karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java Tue Dec 6 07:12:49 2011
@@ -212,7 +212,6 @@ public class ConnectorServerFactory {
}
if ( this.secured ) {
- Thread.sleep( 5000 );//give jass.keystores bundle time to init
this.setupSsl();
}
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Jean-Baptiste Onofré <jb...@nanthrax.net>.
Perfect,
thanks ;)
Regards
JB
On 12/06/2011 06:43 PM, Dan Tran wrote:
> Thanks
>
> I successfully verified the fix with my ssl setup for JMX
>
> -Dan
>
> On Tue, Dec 6, 2011 at 9:28 AM, Jean-Baptiste Onofré<jb...@nanthrax.net> wrote:
>> Correct, and it should be up to date ;)
>>
>> NB: don't forget to add the snapshot repository in the
>> etc/org.ops4j.pax.url.mvn.cfg file (in the repositories list) to avoid any
>> issue.
>>
>> Regards
>> JB
>>
>>
>> On 12/06/2011 06:13 PM, Dan Tran wrote:
>>>
>>> is it here?
>>> https://repository.apache.org/content/repositories/snapshots/org/apache/karaf/apache-karaf/2.2.5-SNAPSHOT/
>>>
>>> Thanks
>>>
>>> -Dan
>>>
>>> On Tue, Dec 6, 2011 at 1:48 AM, Jean-Baptiste Onofré<jb...@nanthrax.net>
>>> wrote:
>>>>
>>>> As I made the changes this morning, I will launch a Jenkins build to be
>>>> sure
>>>> that the SNAPSHOTs are up to date.
>>>>
>>>> Regards
>>>> JB
>>>>
>>>>
>>>> On 12/06/2011 09:57 AM, Achim Nierbeck wrote:
>>>>>
>>>>>
>>>>> Hi Dan,
>>>>>
>>>>> it should be available here:
>>>>>
>>>>>
>>>>>
>>>>> http://www.apache.org/dyn/closer.cgi/karaf/2.2.5-SNAPSHOT/apache-karaf-2.2.5-SNAPSHOT.zip
>>>>>
>>>>> regards, Achim
>>>>>
>>>>> 2011/12/6 Dan Tran<da...@gmail.com>
>>>>>
>>>>>> Hi JB
>>>>>>
>>>>>> Thanks for committed this patch. Where can I get a hold of
>>>>>> 2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
>>>>>> actively verify this before release time, learn from previous mistake
>>>>>> )
>>>>>>
>>>>>> -D
>>>>>>
>>>>>>
>>>>>> On Mon, Dec 5, 2011 at 11:12 PM,<jb...@apache.org> wrote:
>>>>>>>
>>>>>>>
>>>>>>> Author: jbonofre
>>>>>>> Date: Tue Dec 6 07:12:49 2011
>>>>>>> New Revision: 1210803
>>>>>>>
>>>>>>> URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
>>>>>>> Log:
>>>>>>> [KARAF-541] Fix JMX SSL support
>>>>>>>
>>>>>>> Modified:
>>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> Modified:
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>>>
>>>>>>>
>>>>>>> URL:
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>>>
>>>>>>>
>>>>>>> ---
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>> (original)
>>>>>>>
>>>>>>>
>>>>>>> +++
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>> Tue Dec 6 07:12:49 2011
>>>>>>>
>>>>>>>
>>>>>>> @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
>>>>>>> private void checkForKeystoresAvailability(String keyStore, String
>>>>>>
>>>>>>
>>>>>> keyAlias, String trustStore, long timeout) {
>>>>>>>
>>>>>>>
>>>>>>> for (int i = 0; i< timeout / 1000; ++i) {
>>>>>>> KeystoreInstance keyInstance = getKeystore(keyStore);
>>>>>>> - if (keyInstance != null&&
>>>>>>> keyInstance.isKeystoreLocked())
>>>>>>> {
>>>>>>>
>>>>>>> + if (keyInstance == null || (keyInstance != null&&
>>>>>>
>>>>>>
>>>>>> keyInstance.isKeystoreLocked())) {
>>>>>>>
>>>>>>>
>>>>>>> sleep(1000);
>>>>>>> logger.info("Looking for keystore: {}...", keyStore);
>>>>>>> continue;
>>>>>>> }
>>>>>>> - if (keyInstance != null&&
>>>>>>
>>>>>>
>>>>>> keyInstance.isKeyLocked(keyAlias)) {
>>>>>>>
>>>>>>>
>>>>>>> + if (keyInstance == null || (keyInstance != null&&
>>>>>>
>>>>>>
>>>>>> keyInstance.isKeyLocked(keyAlias))) {
>>>>>>>
>>>>>>>
>>>>>>> sleep(1000);
>>>>>>> logger.info("Looking for keystore's key: {}...",
>>>>>>
>>>>>>
>>>>>> keyAlias);
>>>>>>>
>>>>>>>
>>>>>>> continue;
>>>>>>> }
>>>>>>>
>>>>>>> KeystoreInstance trustInstance = trustStore == null ? null
>>>>>>> :
>>>>>>
>>>>>>
>>>>>> getKeystore(trustStore);
>>>>>>>
>>>>>>>
>>>>>>> - if (trustInstance != null&&
>>>>>>
>>>>>>
>>>>>> trustInstance.isKeystoreLocked()) {
>>>>>>>
>>>>>>>
>>>>>>> + if (trustInstance == null || (trustInstance != null&&
>>>>>>
>>>>>>
>>>>>> trustInstance.isKeystoreLocked())) {
>>>>>>>
>>>>>>>
>>>>>>> sleep(1000);
>>>>>>> logger.info("Looking for truststore: {}...",
>>>>>>
>>>>>>
>>>>>> trustStore);
>>>>>>>
>>>>>>>
>>>>>>> continue;
>>>>>>>
>>>>>>> Modified:
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>>>
>>>>>>>
>>>>>>> URL:
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> ==============================================================================
>>>>>>>
>>>>>>>
>>>>>>> ---
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>> (original)
>>>>>>>
>>>>>>>
>>>>>>> +++
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>> Tue Dec 6 07:12:49 2011
>>>>>>>
>>>>>>>
>>>>>>> @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
>>>>>>> }
>>>>>>>
>>>>>>> if ( this.secured ) {
>>>>>>> - Thread.sleep( 5000 );//give jass.keystores bundle time to
>>>>>>
>>>>>>
>>>>>> init
>>>>>>>
>>>>>>>
>>>>>>> this.setupSsl();
>>>>>>> }
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>
>>>> --
>>>> Jean-Baptiste Onofré
>>>> jbonofre@apache.org
>>>> http://blog.nanthrax.net
>>>> Talend - http://www.talend.com
>>
>>
>> --
>> Jean-Baptiste Onofré
>> jbonofre@apache.org
>> http://blog.nanthrax.net
>> Talend - http://www.talend.com
--
Jean-Baptiste Onofré
jbonofre@apache.org
http://blog.nanthrax.net
Talend - http://www.talend.com
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Dan Tran <da...@gmail.com>.
Thanks
I successfully verified the fix with my ssl setup for JMX
-Dan
On Tue, Dec 6, 2011 at 9:28 AM, Jean-Baptiste Onofré <jb...@nanthrax.net> wrote:
> Correct, and it should be up to date ;)
>
> NB: don't forget to add the snapshot repository in the
> etc/org.ops4j.pax.url.mvn.cfg file (in the repositories list) to avoid any
> issue.
>
> Regards
> JB
>
>
> On 12/06/2011 06:13 PM, Dan Tran wrote:
>>
>> is it here?
>> https://repository.apache.org/content/repositories/snapshots/org/apache/karaf/apache-karaf/2.2.5-SNAPSHOT/
>>
>> Thanks
>>
>> -Dan
>>
>> On Tue, Dec 6, 2011 at 1:48 AM, Jean-Baptiste Onofré<jb...@nanthrax.net>
>> wrote:
>>>
>>> As I made the changes this morning, I will launch a Jenkins build to be
>>> sure
>>> that the SNAPSHOTs are up to date.
>>>
>>> Regards
>>> JB
>>>
>>>
>>> On 12/06/2011 09:57 AM, Achim Nierbeck wrote:
>>>>
>>>>
>>>> Hi Dan,
>>>>
>>>> it should be available here:
>>>>
>>>>
>>>>
>>>> http://www.apache.org/dyn/closer.cgi/karaf/2.2.5-SNAPSHOT/apache-karaf-2.2.5-SNAPSHOT.zip
>>>>
>>>> regards, Achim
>>>>
>>>> 2011/12/6 Dan Tran<da...@gmail.com>
>>>>
>>>>> Hi JB
>>>>>
>>>>> Thanks for committed this patch. Where can I get a hold of
>>>>> 2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
>>>>> actively verify this before release time, learn from previous mistake
>>>>> )
>>>>>
>>>>> -D
>>>>>
>>>>>
>>>>> On Mon, Dec 5, 2011 at 11:12 PM,<jb...@apache.org> wrote:
>>>>>>
>>>>>>
>>>>>> Author: jbonofre
>>>>>> Date: Tue Dec 6 07:12:49 2011
>>>>>> New Revision: 1210803
>>>>>>
>>>>>> URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
>>>>>> Log:
>>>>>> [KARAF-541] Fix JMX SSL support
>>>>>>
>>>>>> Modified:
>>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>>
>>>>>>
>>>>>>
>>>>>> Modified:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>>
>>>>>>
>>>>>> URL:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>>>
>>>>>>
>>>>>> ---
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>> (original)
>>>>>>
>>>>>>
>>>>>> +++
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>> Tue Dec 6 07:12:49 2011
>>>>>>
>>>>>>
>>>>>> @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
>>>>>> private void checkForKeystoresAvailability(String keyStore, String
>>>>>
>>>>>
>>>>> keyAlias, String trustStore, long timeout) {
>>>>>>
>>>>>>
>>>>>> for (int i = 0; i< timeout / 1000; ++i) {
>>>>>> KeystoreInstance keyInstance = getKeystore(keyStore);
>>>>>> - if (keyInstance != null&&
>>>>>> keyInstance.isKeystoreLocked())
>>>>>> {
>>>>>>
>>>>>> + if (keyInstance == null || (keyInstance != null&&
>>>>>
>>>>>
>>>>> keyInstance.isKeystoreLocked())) {
>>>>>>
>>>>>>
>>>>>> sleep(1000);
>>>>>> logger.info("Looking for keystore: {}...", keyStore);
>>>>>> continue;
>>>>>> }
>>>>>> - if (keyInstance != null&&
>>>>>
>>>>>
>>>>> keyInstance.isKeyLocked(keyAlias)) {
>>>>>>
>>>>>>
>>>>>> + if (keyInstance == null || (keyInstance != null&&
>>>>>
>>>>>
>>>>> keyInstance.isKeyLocked(keyAlias))) {
>>>>>>
>>>>>>
>>>>>> sleep(1000);
>>>>>> logger.info("Looking for keystore's key: {}...",
>>>>>
>>>>>
>>>>> keyAlias);
>>>>>>
>>>>>>
>>>>>> continue;
>>>>>> }
>>>>>>
>>>>>> KeystoreInstance trustInstance = trustStore == null ? null
>>>>>> :
>>>>>
>>>>>
>>>>> getKeystore(trustStore);
>>>>>>
>>>>>>
>>>>>> - if (trustInstance != null&&
>>>>>
>>>>>
>>>>> trustInstance.isKeystoreLocked()) {
>>>>>>
>>>>>>
>>>>>> + if (trustInstance == null || (trustInstance != null&&
>>>>>
>>>>>
>>>>> trustInstance.isKeystoreLocked())) {
>>>>>>
>>>>>>
>>>>>> sleep(1000);
>>>>>> logger.info("Looking for truststore: {}...",
>>>>>
>>>>>
>>>>> trustStore);
>>>>>>
>>>>>>
>>>>>> continue;
>>>>>>
>>>>>> Modified:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>>
>>>>>>
>>>>>> URL:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>>>
>>>>>>
>>>>>> ---
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>> (original)
>>>>>>
>>>>>>
>>>>>> +++
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>> Tue Dec 6 07:12:49 2011
>>>>>>
>>>>>>
>>>>>> @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
>>>>>> }
>>>>>>
>>>>>> if ( this.secured ) {
>>>>>> - Thread.sleep( 5000 );//give jass.keystores bundle time to
>>>>>
>>>>>
>>>>> init
>>>>>>
>>>>>>
>>>>>> this.setupSsl();
>>>>>> }
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>
>>> --
>>> Jean-Baptiste Onofré
>>> jbonofre@apache.org
>>> http://blog.nanthrax.net
>>> Talend - http://www.talend.com
>
>
> --
> Jean-Baptiste Onofré
> jbonofre@apache.org
> http://blog.nanthrax.net
> Talend - http://www.talend.com
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Jean-Baptiste Onofré <jb...@nanthrax.net>.
Correct, and it should be up to date ;)
NB: don't forget to add the snapshot repository in the
etc/org.ops4j.pax.url.mvn.cfg file (in the repositories list) to avoid
any issue.
Regards
JB
On 12/06/2011 06:13 PM, Dan Tran wrote:
> is it here? https://repository.apache.org/content/repositories/snapshots/org/apache/karaf/apache-karaf/2.2.5-SNAPSHOT/
>
> Thanks
>
> -Dan
>
> On Tue, Dec 6, 2011 at 1:48 AM, Jean-Baptiste Onofré<jb...@nanthrax.net> wrote:
>> As I made the changes this morning, I will launch a Jenkins build to be sure
>> that the SNAPSHOTs are up to date.
>>
>> Regards
>> JB
>>
>>
>> On 12/06/2011 09:57 AM, Achim Nierbeck wrote:
>>>
>>> Hi Dan,
>>>
>>> it should be available here:
>>>
>>>
>>> http://www.apache.org/dyn/closer.cgi/karaf/2.2.5-SNAPSHOT/apache-karaf-2.2.5-SNAPSHOT.zip
>>>
>>> regards, Achim
>>>
>>> 2011/12/6 Dan Tran<da...@gmail.com>
>>>
>>>> Hi JB
>>>>
>>>> Thanks for committed this patch. Where can I get a hold of
>>>> 2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
>>>> actively verify this before release time, learn from previous mistake
>>>> )
>>>>
>>>> -D
>>>>
>>>>
>>>> On Mon, Dec 5, 2011 at 11:12 PM,<jb...@apache.org> wrote:
>>>>>
>>>>> Author: jbonofre
>>>>> Date: Tue Dec 6 07:12:49 2011
>>>>> New Revision: 1210803
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
>>>>> Log:
>>>>> [KARAF-541] Fix JMX SSL support
>>>>>
>>>>> Modified:
>>>>>
>>>>
>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>
>>>>>
>>>>
>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>
>>>>>
>>>>> Modified:
>>>>
>>>>
>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>>
>>>>> URL:
>>>>
>>>>
>>>> http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>>
>>>>>
>>>>
>>>> ==============================================================================
>>>>>
>>>>> ---
>>>>
>>>>
>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>> (original)
>>>>>
>>>>> +++
>>>>
>>>>
>>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>> Tue Dec 6 07:12:49 2011
>>>>>
>>>>> @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
>>>>> private void checkForKeystoresAvailability(String keyStore, String
>>>>
>>>> keyAlias, String trustStore, long timeout) {
>>>>>
>>>>> for (int i = 0; i< timeout / 1000; ++i) {
>>>>> KeystoreInstance keyInstance = getKeystore(keyStore);
>>>>> - if (keyInstance != null&& keyInstance.isKeystoreLocked())
>>>>> {
>>>>>
>>>>> + if (keyInstance == null || (keyInstance != null&&
>>>>
>>>> keyInstance.isKeystoreLocked())) {
>>>>>
>>>>> sleep(1000);
>>>>> logger.info("Looking for keystore: {}...", keyStore);
>>>>> continue;
>>>>> }
>>>>> - if (keyInstance != null&&
>>>>
>>>> keyInstance.isKeyLocked(keyAlias)) {
>>>>>
>>>>> + if (keyInstance == null || (keyInstance != null&&
>>>>
>>>> keyInstance.isKeyLocked(keyAlias))) {
>>>>>
>>>>> sleep(1000);
>>>>> logger.info("Looking for keystore's key: {}...",
>>>>
>>>> keyAlias);
>>>>>
>>>>> continue;
>>>>> }
>>>>>
>>>>> KeystoreInstance trustInstance = trustStore == null ? null :
>>>>
>>>> getKeystore(trustStore);
>>>>>
>>>>> - if (trustInstance != null&&
>>>>
>>>> trustInstance.isKeystoreLocked()) {
>>>>>
>>>>> + if (trustInstance == null || (trustInstance != null&&
>>>>
>>>> trustInstance.isKeystoreLocked())) {
>>>>>
>>>>> sleep(1000);
>>>>> logger.info("Looking for truststore: {}...",
>>>>
>>>> trustStore);
>>>>>
>>>>> continue;
>>>>>
>>>>> Modified:
>>>>
>>>>
>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>>
>>>>> URL:
>>>>
>>>>
>>>> http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>>
>>>>>
>>>>
>>>> ==============================================================================
>>>>>
>>>>> ---
>>>>
>>>>
>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>> (original)
>>>>>
>>>>> +++
>>>>
>>>>
>>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>> Tue Dec 6 07:12:49 2011
>>>>>
>>>>> @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
>>>>> }
>>>>>
>>>>> if ( this.secured ) {
>>>>> - Thread.sleep( 5000 );//give jass.keystores bundle time to
>>>>
>>>> init
>>>>>
>>>>> this.setupSsl();
>>>>> }
>>>>>
>>>>>
>>>>>
>>>>
>>>
>>>
>>>
>>
>> --
>> Jean-Baptiste Onofré
>> jbonofre@apache.org
>> http://blog.nanthrax.net
>> Talend - http://www.talend.com
--
Jean-Baptiste Onofré
jbonofre@apache.org
http://blog.nanthrax.net
Talend - http://www.talend.com
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Dan Tran <da...@gmail.com>.
is it here? https://repository.apache.org/content/repositories/snapshots/org/apache/karaf/apache-karaf/2.2.5-SNAPSHOT/
Thanks
-Dan
On Tue, Dec 6, 2011 at 1:48 AM, Jean-Baptiste Onofré <jb...@nanthrax.net> wrote:
> As I made the changes this morning, I will launch a Jenkins build to be sure
> that the SNAPSHOTs are up to date.
>
> Regards
> JB
>
>
> On 12/06/2011 09:57 AM, Achim Nierbeck wrote:
>>
>> Hi Dan,
>>
>> it should be available here:
>>
>>
>> http://www.apache.org/dyn/closer.cgi/karaf/2.2.5-SNAPSHOT/apache-karaf-2.2.5-SNAPSHOT.zip
>>
>> regards, Achim
>>
>> 2011/12/6 Dan Tran<da...@gmail.com>
>>
>>> Hi JB
>>>
>>> Thanks for committed this patch. Where can I get a hold of
>>> 2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
>>> actively verify this before release time, learn from previous mistake
>>> )
>>>
>>> -D
>>>
>>>
>>> On Mon, Dec 5, 2011 at 11:12 PM,<jb...@apache.org> wrote:
>>>>
>>>> Author: jbonofre
>>>> Date: Tue Dec 6 07:12:49 2011
>>>> New Revision: 1210803
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
>>>> Log:
>>>> [KARAF-541] Fix JMX SSL support
>>>>
>>>> Modified:
>>>>
>>>
>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>
>>>>
>>>
>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>
>>>>
>>>> Modified:
>>>
>>>
>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>>
>>>> URL:
>>>
>>>
>>> http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>
>>>>
>>>
>>> ==============================================================================
>>>>
>>>> ---
>>>
>>>
>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>> (original)
>>>>
>>>> +++
>>>
>>>
>>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>> Tue Dec 6 07:12:49 2011
>>>>
>>>> @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
>>>> private void checkForKeystoresAvailability(String keyStore, String
>>>
>>> keyAlias, String trustStore, long timeout) {
>>>>
>>>> for (int i = 0; i< timeout / 1000; ++i) {
>>>> KeystoreInstance keyInstance = getKeystore(keyStore);
>>>> - if (keyInstance != null&& keyInstance.isKeystoreLocked())
>>>> {
>>>>
>>>> + if (keyInstance == null || (keyInstance != null&&
>>>
>>> keyInstance.isKeystoreLocked())) {
>>>>
>>>> sleep(1000);
>>>> logger.info("Looking for keystore: {}...", keyStore);
>>>> continue;
>>>> }
>>>> - if (keyInstance != null&&
>>>
>>> keyInstance.isKeyLocked(keyAlias)) {
>>>>
>>>> + if (keyInstance == null || (keyInstance != null&&
>>>
>>> keyInstance.isKeyLocked(keyAlias))) {
>>>>
>>>> sleep(1000);
>>>> logger.info("Looking for keystore's key: {}...",
>>>
>>> keyAlias);
>>>>
>>>> continue;
>>>> }
>>>>
>>>> KeystoreInstance trustInstance = trustStore == null ? null :
>>>
>>> getKeystore(trustStore);
>>>>
>>>> - if (trustInstance != null&&
>>>
>>> trustInstance.isKeystoreLocked()) {
>>>>
>>>> + if (trustInstance == null || (trustInstance != null&&
>>>
>>> trustInstance.isKeystoreLocked())) {
>>>>
>>>> sleep(1000);
>>>> logger.info("Looking for truststore: {}...",
>>>
>>> trustStore);
>>>>
>>>> continue;
>>>>
>>>> Modified:
>>>
>>>
>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>>
>>>> URL:
>>>
>>>
>>> http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>>
>>>>
>>>
>>> ==============================================================================
>>>>
>>>> ---
>>>
>>>
>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>> (original)
>>>>
>>>> +++
>>>
>>>
>>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>> Tue Dec 6 07:12:49 2011
>>>>
>>>> @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
>>>> }
>>>>
>>>> if ( this.secured ) {
>>>> - Thread.sleep( 5000 );//give jass.keystores bundle time to
>>>
>>> init
>>>>
>>>> this.setupSsl();
>>>> }
>>>>
>>>>
>>>>
>>>
>>
>>
>>
>
> --
> Jean-Baptiste Onofré
> jbonofre@apache.org
> http://blog.nanthrax.net
> Talend - http://www.talend.com
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Jean-Baptiste Onofré <jb...@nanthrax.net>.
As I made the changes this morning, I will launch a Jenkins build to be
sure that the SNAPSHOTs are up to date.
Regards
JB
On 12/06/2011 09:57 AM, Achim Nierbeck wrote:
> Hi Dan,
>
> it should be available here:
>
> http://www.apache.org/dyn/closer.cgi/karaf/2.2.5-SNAPSHOT/apache-karaf-2.2.5-SNAPSHOT.zip
>
> regards, Achim
>
> 2011/12/6 Dan Tran<da...@gmail.com>
>
>> Hi JB
>>
>> Thanks for committed this patch. Where can I get a hold of
>> 2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
>> actively verify this before release time, learn from previous mistake
>> )
>>
>> -D
>>
>>
>> On Mon, Dec 5, 2011 at 11:12 PM,<jb...@apache.org> wrote:
>>> Author: jbonofre
>>> Date: Tue Dec 6 07:12:49 2011
>>> New Revision: 1210803
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
>>> Log:
>>> [KARAF-541] Fix JMX SSL support
>>>
>>> Modified:
>>>
>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>>
>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>>
>>> Modified:
>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>>> URL:
>> http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>
>> ==============================================================================
>>> ---
>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>> (original)
>>> +++
>> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
>> Tue Dec 6 07:12:49 2011
>>> @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
>>> private void checkForKeystoresAvailability(String keyStore, String
>> keyAlias, String trustStore, long timeout) {
>>> for (int i = 0; i< timeout / 1000; ++i) {
>>> KeystoreInstance keyInstance = getKeystore(keyStore);
>>> - if (keyInstance != null&& keyInstance.isKeystoreLocked()) {
>>> + if (keyInstance == null || (keyInstance != null&&
>> keyInstance.isKeystoreLocked())) {
>>> sleep(1000);
>>> logger.info("Looking for keystore: {}...", keyStore);
>>> continue;
>>> }
>>> - if (keyInstance != null&&
>> keyInstance.isKeyLocked(keyAlias)) {
>>> + if (keyInstance == null || (keyInstance != null&&
>> keyInstance.isKeyLocked(keyAlias))) {
>>> sleep(1000);
>>> logger.info("Looking for keystore's key: {}...",
>> keyAlias);
>>> continue;
>>> }
>>>
>>> KeystoreInstance trustInstance = trustStore == null ? null :
>> getKeystore(trustStore);
>>> - if (trustInstance != null&&
>> trustInstance.isKeystoreLocked()) {
>>> + if (trustInstance == null || (trustInstance != null&&
>> trustInstance.isKeystoreLocked())) {
>>> sleep(1000);
>>> logger.info("Looking for truststore: {}...",
>> trustStore);
>>> continue;
>>>
>>> Modified:
>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>>> URL:
>> http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
>>>
>> ==============================================================================
>>> ---
>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>> (original)
>>> +++
>> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>> Tue Dec 6 07:12:49 2011
>>> @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
>>> }
>>>
>>> if ( this.secured ) {
>>> - Thread.sleep( 5000 );//give jass.keystores bundle time to
>> init
>>> this.setupSsl();
>>> }
>>>
>>>
>>>
>>
>
>
>
--
Jean-Baptiste Onofré
jbonofre@apache.org
http://blog.nanthrax.net
Talend - http://www.talend.com
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Achim Nierbeck <bc...@googlemail.com>.
Hi Dan,
it should be available here:
http://www.apache.org/dyn/closer.cgi/karaf/2.2.5-SNAPSHOT/apache-karaf-2.2.5-SNAPSHOT.zip
regards, Achim
2011/12/6 Dan Tran <da...@gmail.com>
> Hi JB
>
> Thanks for committed this patch. Where can I get a hold of
> 2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
> actively verify this before release time, learn from previous mistake
> )
>
> -D
>
>
> On Mon, Dec 5, 2011 at 11:12 PM, <jb...@apache.org> wrote:
> > Author: jbonofre
> > Date: Tue Dec 6 07:12:49 2011
> > New Revision: 1210803
> >
> > URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
> > Log:
> > [KARAF-541] Fix JMX SSL support
> >
> > Modified:
> >
> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
> >
> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
> >
> > Modified:
> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
> > URL:
> http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
> >
> ==============================================================================
> > ---
> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
> (original)
> > +++
> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
> Tue Dec 6 07:12:49 2011
> > @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
> > private void checkForKeystoresAvailability(String keyStore, String
> keyAlias, String trustStore, long timeout) {
> > for (int i = 0; i < timeout / 1000; ++i) {
> > KeystoreInstance keyInstance = getKeystore(keyStore);
> > - if (keyInstance != null && keyInstance.isKeystoreLocked()) {
> > + if (keyInstance == null || (keyInstance != null &&
> keyInstance.isKeystoreLocked())) {
> > sleep(1000);
> > logger.info("Looking for keystore: {}...", keyStore);
> > continue;
> > }
> > - if (keyInstance != null &&
> keyInstance.isKeyLocked(keyAlias)) {
> > + if (keyInstance == null || (keyInstance != null &&
> keyInstance.isKeyLocked(keyAlias))) {
> > sleep(1000);
> > logger.info("Looking for keystore's key: {}...",
> keyAlias);
> > continue;
> > }
> >
> > KeystoreInstance trustInstance = trustStore == null ? null :
> getKeystore(trustStore);
> > - if (trustInstance != null &&
> trustInstance.isKeystoreLocked()) {
> > + if (trustInstance == null || (trustInstance != null &&
> trustInstance.isKeystoreLocked())) {
> > sleep(1000);
> > logger.info("Looking for truststore: {}...",
> trustStore);
> > continue;
> >
> > Modified:
> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
> > URL:
> http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
> >
> ==============================================================================
> > ---
> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
> (original)
> > +++
> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
> Tue Dec 6 07:12:49 2011
> > @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
> > }
> >
> > if ( this.secured ) {
> > - Thread.sleep( 5000 );//give jass.keystores bundle time to
> init
> > this.setupSsl();
> > }
> >
> >
> >
>
--
Apache Karaf <http://karaf.apache.org/> Committer & PMC
OPS4J Pax Web <http://wiki.ops4j.org/display/paxweb/Pax+Web/> Committer &
Project Lead
blog <http://notizblog.nierbeck.de/>
Re: svn commit: r1210803 - in /karaf/trunk: jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
Posted by Dan Tran <da...@gmail.com>.
Hi JB
Thanks for committed this patch. Where can I get a hold of
2.2.5-SNAPSHOT distribution to verify this fix? ( I would like to
actively verify this before release time, learn from previous mistake
)
-D
On Mon, Dec 5, 2011 at 11:12 PM, <jb...@apache.org> wrote:
> Author: jbonofre
> Date: Tue Dec 6 07:12:49 2011
> New Revision: 1210803
>
> URL: http://svn.apache.org/viewvc?rev=1210803&view=rev
> Log:
> [KARAF-541] Fix JMX SSL support
>
> Modified:
> karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
> karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
>
> Modified: karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java
> URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java?rev=1210803&r1=1210802&r2=1210803&view=diff
> ==============================================================================
> --- karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java (original)
> +++ karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java Tue Dec 6 07:12:49 2011
> @@ -128,19 +128,19 @@ public class OsgiKeystoreManager impleme
> private void checkForKeystoresAvailability(String keyStore, String keyAlias, String trustStore, long timeout) {
> for (int i = 0; i < timeout / 1000; ++i) {
> KeystoreInstance keyInstance = getKeystore(keyStore);
> - if (keyInstance != null && keyInstance.isKeystoreLocked()) {
> + if (keyInstance == null || (keyInstance != null && keyInstance.isKeystoreLocked())) {
> sleep(1000);
> logger.info("Looking for keystore: {}...", keyStore);
> continue;
> }
> - if (keyInstance != null && keyInstance.isKeyLocked(keyAlias)) {
> + if (keyInstance == null || (keyInstance != null && keyInstance.isKeyLocked(keyAlias))) {
> sleep(1000);
> logger.info("Looking for keystore's key: {}...", keyAlias);
> continue;
> }
>
> KeystoreInstance trustInstance = trustStore == null ? null : getKeystore(trustStore);
> - if (trustInstance != null && trustInstance.isKeystoreLocked()) {
> + if (trustInstance == null || (trustInstance != null && trustInstance.isKeystoreLocked())) {
> sleep(1000);
> logger.info("Looking for truststore: {}...", trustStore);
> continue;
>
> Modified: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
> URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1210803&r1=1210802&r2=1210803&view=diff
> ==============================================================================
> --- karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java (original)
> +++ karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java Tue Dec 6 07:12:49 2011
> @@ -212,7 +212,6 @@ public class ConnectorServerFactory {
> }
>
> if ( this.secured ) {
> - Thread.sleep( 5000 );//give jass.keystores bundle time to init
> this.setupSsl();
> }
>
>
>