shopizer-developers

various attemps to fix upgrade

11/21/2016 5:23:57 PM

Details

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 4b7e6f7..158fd91 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Nov 18 09:25:05 EST 2016
+#Mon Nov 21 13:54:23 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost
diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index aeef9b0..183ac56 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Nov 18 09:25:04 EST 2016
+#Mon Nov 21 13:54:22 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor
diff --git a/sm-core/files/repos/FilesRepository.dat b/sm-core/files/repos/FilesRepository.dat
new file mode 100644
index 0000000..b2476e0
Binary files /dev/null and b/sm-core/files/repos/FilesRepository.dat differ
diff --git a/sm-core/files/store/StoreRepository.dat b/sm-core/files/store/StoreRepository.dat
new file mode 100644
index 0000000..805df69
Binary files /dev/null and b/sm-core/files/store/StoreRepository.dat differ
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java
index 74e23c9..23dab9d 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java
@@ -119,6 +119,8 @@ public class CmsImageFileManagerImpl
         	}
         	
         	Node<String, Object> productNode = this.getNode(nodePath.toString());
+        	
+        	System.out.println("*** WRITING PRODUCT IMAGE TO KEY " + productNode.toString());
 
             
             InputStream isFile = contentImage.getFile();
@@ -129,6 +131,13 @@ public class CmsImageFileManagerImpl
 
             // object for a given product containing all images
             productNode.put(contentImage.getFileName(), output.toByteArray());
+            
+            
+            /////NOW READ THE IMAGE
+            OutputContentFile ocf = getProductImage(productImage);
+            if(ocf==null) {
+            	//we have a problem 
+            }
 
 
         }
@@ -435,9 +444,14 @@ public class CmsImageFileManagerImpl
         	
         	Node<String,Object> productNode = this.getNode(nodePath.toString());
         	
+        	System.out.println("*** READING PRODUCT IMAGE TO KEY " + productNode.toString());
+        	
             byte[] imageBytes = (byte[])productNode.get( imageName );
-
-
+            
+            if(imageBytes==null) {
+            	LOGGER.warn("Image " + imageName + " does not exist");
+            	return null;//no post processing will occur
+            }
 
             input = new ByteArrayInputStream( imageBytes );
             ByteArrayOutputStream output = new ByteArrayOutputStream();
diff --git a/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java b/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java
index 1e546c2..cf7727d 100644
--- a/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java
+++ b/sm-core/src/test/java/com/salesmanager/test/catalog/ProductTest.java
@@ -540,7 +540,7 @@ public class ProductTest extends com.salesmanager.test.common.AbstractSalesManag
         
         product.getImages().add(productImage);
         
-        productService.saveOrUpdate(product);
+        productService.saveOrUpdate(product);//saves the ProductImage entity and the file on disk
 		
 		
 	}
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 2f7d37d..a0b29ef 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Nov 18 09:25:05 EST 2016
+#Mon Nov 21 13:54:23 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search
diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index c0bc7da..3803aca 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index e71da10..08986be 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index 054b721..e7e6add 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Fri Nov 18 13:24:02 EST 2016
-id=15878ae544854c043e638338aaf1b1e31c895571d4f
+#Mon Nov 21 14:10:26 EST 2016
+id=158884beacb7f2999065523f5b0b828af957fcb93f9
 method=file
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java
index 0cc3990..d2efc35 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java
@@ -155,7 +155,7 @@ public class ReadableProductPopulator extends
 			}
 			
 			//remove products from invisible category -> set visible = false
-			Set<Category> categories = source.getCategories();
+/*			Set<Category> categories = source.getCategories();
 			boolean isVisible = true;
 			if(!CollectionUtils.isEmpty(categories)) {
 				for(Category c : categories) {
@@ -166,9 +166,9 @@ public class ReadableProductPopulator extends
 						isVisible = false;
 					}
 				}
-			}
+			}*/
 			
-			target.setVisible(isVisible);
+			//target.setVisible(isVisible);
 			
 	
 			target.setSku(source.getSku());
diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index 78e5997..fd8d328 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Nov 18 09:28:12 EST 2016
+#Mon Nov 21 13:54:27 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop