Author: aco
Date: Fri Mar 17 16:13:56 2006
New Revision: 386769
URL: http://svn.apache.org/viewcvs?rev=386769&view=rev
Log:
- Setup keystores for ssl used by ConfigTest.java
- Prevented NullPointerException in MemoryPersistenceAdapter
Added:
incubator/activemq/trunk/assembly/src/test/resources/client.keystore
(with props)
incubator/activemq/trunk/assembly/src/test/resources/server.keystore
(with props)
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java?rev=386769&r1=386768&r2=386769&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
Fri Mar 17 16:13:56 2006
@@ -125,7 +125,10 @@
store.delete();
}
}
- transactionStore.delete();
+
+ if (transactionStore != null) {
+ transactionStore.delete();
+ }
}
public boolean isUseExternalMessageReferences() {
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java?rev=386769&r1=386768&r2=386769&view=diff
==============================================================================
---
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
(original)
+++
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
Fri Mar 17 16:13:56 2006
@@ -51,6 +51,15 @@
protected static final String DERBY_ROOT = "target/test-data/";
protected static final String CONF_ROOT = "src/sample-conf/";
+ static {
+ System.setProperty("javax.net.ssl.trustStore",
"src/test/resources/client.keystore");
+ System.setProperty("javax.net.ssl.trustStorePassword", "password");
+ System.setProperty("javax.net.ssl.trustStoreType", "jks");
+ System.setProperty("javax.net.ssl.keyStore",
"src/test/resources/server.keystore");
+ System.setProperty("javax.net.ssl.keyStorePassword", "password");
+ System.setProperty("javax.net.ssl.keyStoreType", "jks");
+ }
+
/*
* IMPORTANT NOTE: Assertions checking for the existence of the derby
directory will fail if the first derby
* directory is not created under target/test-data/. The
test in unable to change the derby
Added: incubator/activemq/trunk/assembly/src/test/resources/client.keystore
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/resources/client.keystore?rev=386769&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/activemq/trunk/assembly/src/test/resources/client.keystore
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/activemq/trunk/assembly/src/test/resources/server.keystore
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/resources/server.keystore?rev=386769&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/activemq/trunk/assembly/src/test/resources/server.keystore
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
