Fix issue in datable usage

README.md

@@ -9,7 +9,9 @@ Version | For PrimeFaces
 -----------| -------------
 1.0     | 3.5
 1.1     | 4.0
-1.2     | 5.x
+1.2.1   | 5.x
+
+Version 1.2 has a bug!
 
 When you want to add the artifact, put following snippets in your `pom.xml`
 
@@ -23,5 +25,5 @@ When you want to add the artifact, put following snippets in your `pom.xml`
     <dependency>
         <groupId>be.rubus.web.jsf.primefaces</groupId>
         <artifactId>advanced-graphic-image</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </dependency>

core/pom.xml

@@ -26,7 +26,7 @@
     <artifactId>advanced-graphic-image</artifactId>
     <name>Advanced Graphic image renderer</name>
     <packaging>jar</packaging>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 
     <properties>
         <primefaces.version>5.0</primefaces.version>
@@ -65,6 +65,21 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <inherited>true</inherited>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <!--This plugin allows to run the example using mvn jetty:run -->
                 <groupId>org.mortbay.jetty</groupId>

core/src/main/java/be/rubus/web/jsf/primefaces/AdvancedGraphicImageRenderer.java

@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -95,7 +95,7 @@ private String buildAdvancedImageSrc(FacesContext context, GraphicImage image) t
         StringEncrypter encrypter = RequestContext.getCurrentInstance().getEncrypter();
 
         ValueExpression expression = ValueExpressionAnalyzer.getExpression(context.getELContext(), image.getValueExpression("value"));
-        String rid = encrypter.encrypt(expression.getExpressionString());
+        String rid = encrypter.encrypt(expression.getExpressionString() + image.getClientId(context));
 
         GraphicImageManager graphicImageManager = GraphicImageUtil.retrieveManager(context);
         graphicImageManager.registerImage(streamedContent, rid);

demo/pom.xml

@@ -86,7 +86,7 @@
         <dependency>
             <groupId>be.rubus.web.jsf.primefaces</groupId>
             <artifactId>advanced-graphic-image</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
         </dependency>
 
         <dependency>

demo/src/main/webapp/index.xhtml

@@ -26,14 +26,14 @@
 
 <h:body>
 
-    <comp:customComp image="#{imageBean.image}"/>
+    <comp:customComp image="#{imageBean.image}" id="cust"/>
 
     <p:dataTable value="#{imageBean.dataList}" var="data">
         <p:column headerText="Code">
             <h:outputText value="#{data.code}"/>
         </p:column>
         <p:column headerText="Image">
-            <p:graphicImage value="#{data.image}">
+            <p:graphicImage value="#{data.image}" id="tbl">
                 <!--x:advancedRenderering value="true"/-->
             </p:graphicImage>
         </p:column>