Merge with master

modules/activiti-image-generator/src/main/java/org/activiti/image/impl/DefaultProcessDiagramCanvas.java

@@ -1123,7 +1123,7 @@ public class DefaultProcessDiagramCanvas {
     	  double tX = graphicInfo.getX();
     	  if (centered)
         	  tX += (int) (graphicInfo.getWidth() / 2 - bb.getWidth() / 2);
-    	  tl.draw(g, tX, textY);
+    	  tl.draw(g, (float) tX, textY);
     	  textY += tl.getDescent() + tl.getLeading() + (interline - 1.0f) * tl.getAscent();
       }
   

userguide/src/en/chapters/ch17-Advanced.xml

@@ -440,7 +440,7 @@ INFO  org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl  - class org.a
 	   </para>
 	
 	</section>
-	
+
 	<section id="advanced.task.query.switching">
 	
 		<title>Advanced query API: seamless switching between runtime and historic task querying</title>
@@ -479,6 +479,121 @@ List&lt;? extends TaskInfo&gt; taskInfos = taskInfoQueryWrapper.getTaskInfoQuery
 	
 	</section>
 	
+    <section id="advanced.custom.session.manager">
+    
+        <title>Custom identity management by overriding standard SessionFactory</title>
+        
+        <para>
+          If you do not want to use a full <emphasis>ProcessEngineConfigurator</emphasis> implementation like in the 
+          <link linkend="chapter_ldap">LDAP integration</link>, but still want to plug in your custom identity management framework, 
+          then you can also override the <emphasis>SessionFactory</emphasis> classes directly in the <emphasis>ProcessEngineConfiguration</emphasis>. 
+          In Spring this can be easily done by adding the following to the <emphasis>ProcessEngineConfiguration</emphasis> bean definition:
+	       <programlisting>
+&lt;bean id=&quot;processEngineConfiguration&quot; class=&quot;...SomeProcessEngineConfigurationClass&quot;&gt;
+
+    ...
+        
+    &lt;property name=&quot;customSessionFactories&quot;&gt;
+        &lt;list&gt;
+            &lt;bean class=&quot;com.mycompany.MyGroupManagerFactory&quot;/&gt;
+            &lt;bean class=&quot;com.mycompany.MyUserManagerFactory&quot;/&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    
+    ...
+        
+&lt;/bean&gt;        	       
+	       </programlisting> 
+        </para>
+        
+        <para>
+          The <emphasis>MyGroupManagerFactory</emphasis> and <emphasis>MyUserManagerFactory</emphasis> need to implement the
+          <emphasis>org.activiti.engine.impl.interceptor.SessionFactory</emphasis> interface. The call to <emphasis>openSession()</emphasis>
+          returns the custom class implementation that does the actual identity management. For groups this is a class that
+          inherits from <emphasis>org.activiti.engine.impl.persistence.entity.GroupEntityManager</emphasis> and for managing users
+          it must inherit from <emphasis>org.activiti.engine.impl.persistence.entity.UserEntityManager</emphasis>
+          The following code sample contains a custom manager factory for groups:
+          <programlisting>
+package com.mycompany;
+
+import org.activiti.engine.impl.interceptor.Session;
+import org.activiti.engine.impl.interceptor.SessionFactory;
+import org.activiti.engine.impl.persistence.entity.GroupIdentityManager;
+
+public class MyGroupManagerFactory implements SessionFactory {
+
+	@Override
+	public Class&lt;?&gt; getSessionType() {
+		return GroupIdentityManager.class;
+	}
+
+	@Override
+	public Session openSession() {
+		return new MyCompanyGroupManager();
+	}
+
+}</programlisting>
+        </para>
+        
+        <para>
+          The <emphasis>MyCompanyGroupManager</emphasis> created by the factory is doing the actual work. You do not need
+          to override all members of <emphasis>GroupEntityManager</emphasis> though, just the ones required for your use case.
+          The following sample provides an indication of how this may look like (only a selection of members are shown):
+          <programlisting>
+public class MyCompanyGroupManager extends GroupEntityManager {
+	
+    private static Logger log = LoggerFactory.getLogger(MyCompanyGroupManager.class);
+
+    @Override
+    public List&lt;Group&gt; findGroupsByUser(String userId) {
+        log.debug("findGroupByUser called with userId: " + userId);
+        return super.findGroupsByUser(userId);
+    }
+    
+    @Override
+    public List&lt;Group&gt; findGroupByQueryCriteria(GroupQueryImpl query, Page page) {
+        log.debug("findGroupByQueryCriteria called, query: " + query + " page: " + page);
+        return super.findGroupByQueryCriteria(query, page);
+    }
+    
+    @Override
+    public long findGroupCountByQueryCriteria(GroupQueryImpl query) {
+        log.debug("findGroupCountByQueryCriteria called, query: " + query);
+        return super.findGroupCountByQueryCriteria(query);
+    }
+    
+    @Override
+    public Group createNewGroup(String groupId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void deleteGroup(String groupId) {
+        throw new UnsupportedOperationException();
+    }
+}</programlisting>
+        </para>
+        
+        <para>
+          Add your own implementation in the appropriate methods to plugin your own identity management solution.
+          You have to figure out which member of the base class must be overridden. For example the following call:
+          <programlisting>
+long potentialOwners = identityService.createUserQuery().memberOfGroup("management").count();
+          </programlisting>
+          leads to a call on the following member of the <emphasis>UserIdentityManager</emphasis> interface:
+          <programlisting>
+List&lt;User$gt; findUserByQueryCriteria(UserQueryImpl query, Page page);
+          </programlisting>
+        </para>
+        
+        <para>
+          The code for the <link linkend="chapter_ldap">LDAP integration</link> contains full examples of how to implement this.
+          Check out the code on Github, specifically the following classes 
+          <ulink url="https://github.com/Activiti/Activiti/blob/master/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPGroupManager.java">LDAPGroupManager</ulink> and
+          <ulink url="https://github.com/Activiti/Activiti/blob/master/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPUserManager.java">LDAPUserManager</ulink>.
+        </para>
+    </section>
+    
 	<section id="advanced.safe.bpmn.xml">
 	
 	   <title>Enable safe BPMN 2.0 xml</title>