Add Traditional WebSphere support

Author: emre

README.md

@@ -41,15 +41,17 @@ project root directory:
 
 - Execute `mvn clean package` on `hazelcast-dynacache` root directory to create the `.esa` file
 
-# Installing Hazelcast DynaCache to Liberty
+# Installing Hazelcast DynaCache to WebSphere Liberty
 
 Install the `.esa` file by executing the following command:
 
 ```
-<liberty dir>/bin/featureManager install hazelcast-dynacache/hazelcast-dynacache/target/hazelcast-dynacache-0.1.esa
+<liberty dir>/bin/featureManager install hazelcast-dynacache/hazelcast-dynacache/target/hazelcast-dynacache-0.2.esa
 ```    
 
-# Enabling Hazelcast DynaCache
+Use `hazelcast` as your cache provider name in your `cacheinstances.properties` file.
+
+# Enabling Hazelcast DynaCache on WebSphere Liberty
 
 Enable Hazelcast DynaCache by adding the following snippet to your `server.xml` file:
 
@@ -58,3 +60,16 @@ Enable Hazelcast DynaCache by adding the following snippet to your `server.xml`
     <feature>usr:hazelcast-dynacache</feature>
   </featureManager>
  ```
+ 
+ 
+
+# Installing Hazelcast DynaCache to Traditional WebSphere 9.0.0.1
+
+[Apply the iFix](http://www.ibm.com/support/knowledgecenter/SS7K4U_8.5.5/com.ibm.websphere.installation.nd.doc/ae/tins_install_fixes_dist.html)
+ under `twas-ifix` directory to your WebSphere server and put the following files under `WAS_HOME/lib/ext`:
+
+* hazelcast-3.8-BUNDLE.jar
+* hazelcast-client-3.8-BUNDLE.jar
+* hazelcast-dynacache-bundle-0.2.jar
+
+Use `com.hazelcast.ibm.dynacache.CacheProviderImpl` as your cache provider name in your `cacheinstances.properties` file.

hazelcast-dynacache-bundle/src/main/java/com/hazelcast/ibm/dynacache/CacheEntryImpl.java

@@ -169,7 +169,7 @@ public boolean isInvalid() {
 	public boolean prepareForSerialization() {
 		LOGGER.finest("[CacheEntry] prepareForSerialization");
 
-        return false;
+        return true;
 	}
 
 	@Override

hazelcast-dynacache-bundle/src/main/java/com/hazelcast/ibm/dynacache/CacheProviderImpl.java

@@ -1,9 +1,10 @@
 package com.hazelcast.ibm.dynacache;
 
+import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.client.config.XmlClientConfigBuilder;
 import com.hazelcast.client.osgi.HazelcastClientOSGiService;
-import com.hazelcast.client.osgi.HazelcastOSGiClientInstance;
+import com.hazelcast.core.HazelcastInstance;
 import com.ibm.wsspi.cache.CacheConfig;
 import com.ibm.wsspi.cache.CacheFeatureSupport;
 import com.ibm.wsspi.cache.CacheProvider;
@@ -67,7 +68,12 @@ public CoreCache createCache(CacheConfig cacheConfig) {
 
         LOGGER.finest("hazelcastClientOSGIService: " + hazelcastClientOSGIService);
 
-        HazelcastOSGiClientInstance hazelcastClientInstance = hazelcastClientOSGIService.newHazelcastInstance(config);
+        HazelcastInstance hazelcastClientInstance;
+        if (hazelcastClientOSGIService != null) {
+            hazelcastClientInstance = hazelcastClientOSGIService.newHazelcastInstance(config);
+        } else {
+            hazelcastClientInstance = HazelcastClient.newHazelcastClient(config);
+        }
 
         LOGGER.finest("HazelcastClientInstance: " + hazelcastClientInstance);
 

hazelcast-dynacache-bundle/src/main/java/com/hazelcast/ibm/dynacache/CoreCacheImpl.java

@@ -1,6 +1,6 @@
 package com.hazelcast.ibm.dynacache;
 
-import com.hazelcast.client.osgi.HazelcastOSGiClientInstance;
+import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
 import com.hazelcast.core.MultiMap;
 import com.ibm.websphere.cache.CacheEntry;
@@ -22,7 +22,7 @@ public class CoreCacheImpl implements CoreCache {
     private final MultiMap<Object, Object> dependencyIds;
     private final MultiMap<Object, Object> templateIds;
 
-    public CoreCacheImpl(String cacheName, HazelcastOSGiClientInstance hazelcastInstance) {
+    public CoreCacheImpl(String cacheName, HazelcastInstance hazelcastInstance) {
         this.cacheName = cacheName;
 
         this.cache = hazelcastInstance.getMap(cacheName);
@@ -100,7 +100,7 @@ public Set<Object> getTemplateIds() {
     public void invalidate(Object id, boolean waitOnInvalidation) {
         LOGGER.finest("[CoreCache] invalidate: " + id + " " + waitOnInvalidation);
 
-        invalidate(id);
+        doInvalidate(id, waitOnInvalidation);
         invalidateByDependency(id, waitOnInvalidation);
         invalidateByTemplate(id.toString(), waitOnInvalidation);
     }
@@ -109,10 +109,10 @@ public void invalidate(Object id, boolean waitOnInvalidation) {
     public void invalidateByCacheId(Object cacheId, boolean waitOnInvalidation) {
         LOGGER.finest("[CoreCache] invalidate(cacheId): " + cacheId + ":" + waitOnInvalidation);
 
-        invalidate(cacheId);
+        doInvalidate(cacheId, waitOnInvalidation);
     }
 
-    private void invalidate(Object id) {
+    private void doInvalidate(Object id, boolean waitOnInvalidation) {
         CacheEntry removedEntry = (CacheEntry) cache.remove(id);
 
         if (removedEntry != null) {