Merged V3.4-BUG-FIX to HEAD

30744: ALF-9524: WCM: Defining a complex type with 'abstract' attribute to true does not allow other complex types to define elements with the same name 
      - Fix by Pavel
   30804: ALF-9524: Fix to NPE by Pavel
   30812: ALF-718: Rules Fire Emails before Transaction Commit/Rollback
   Added tests and moved email sending into a post commit callback.
   30820: Fix for ALF-10516 - 'My Sites' dashlet should indicate it is loading rather than say 'No sites'
   30824: Fixed ALF-10470: DeclaritiveRegistry is looping continuously and re-initializing
    - Only replicate removals for the cache.  The reset always does a remove first.
       <cache 
           name="org.alfresco.cache.webScriptsRegistryCache"
                                    ...
                                    replicateUpdates = false,
                                    ...
       </cache>
   30827: ALF-10513 60k Site Performance: Unable to delete user + request not acknowledged for 2 minutes
     Now about 3 to 4 seconds
   30828: Andy H recommended change to lucene indexer values
   30831: ALF-718: Fix for InvitationServiceImplTest
   Fixes behaviour broken by original fix for ALF-718: the send-after-commit does NOT work for the invitation service, so it was necessary
   to change the code to only send-after-commit in the context of a rule.  
   30843: Fixed ALF-7698 "Defects in tags picker in SHARE." according to feedback provided in ALF-9953 "Decide order where new items shall appear in the object finder."
   30844: ALF-9544 - Inbound email restricts file name to 86 characters or less.
     used QName.createQNameWithValidLocalName()  as suggested.
     added new EmailServiceImplTest
   30849: Fixed ALF-8776 "Rule details dialog handling of apostrophes"
   30862: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with improvements)
      30856: ALF-10288: Regression of ALF-1997: non domain users cannot bypass SSO in Share using /share/page?pt=login
         In SSOAuthenticationFilter.doFilter() method added check (PAGE_SERVLET_PATH.equals(req.getServletPath()) && LOGIN_PATH_INFORMATION.equals(req.getPathInfo()).
   30864: SMTP Server, To and From address format.
     - Out standards for from and to address were stuck in the 1980s!
   30867: ALF-10517 - 'My Content' slow
    - performance improvements by reworking Lucene queries used to retrieve recently modified and recently created content for a user
    - converted queries to fts-alfresco
    - improvements from 3.5sec per page render down to 1.1 secs
   30874: MERGE DEV to V3.4-BUG-FIX
         30851 : ALF-9558 - Unchecked Return Value
   30882: - ScriptGroup.isRootGroup() now stops if it finds a single parent rather than doing a size on all parent groups.
     Not sure the logic (not changed by me) is correct as it includes parents that are site groups.
   - SiteServiceImpl now only gets the specified number of sites. Sometimes it would have return more if AuthorityDAOImpl
     switched approach used to get containing authorities.
   - Overloaded getContainingAuthorities to take a size parameter, deprecated other and switched calling code
     Done for isRootGroup activity.
   30910: - Fix build error
   - Found a better way to use filter in AuthorityDAOImpl.getContainingAuthoritiesInZone
     so that we don't need to reset the filter, by using the +ve hits from first approach
     if we switch to second approach.
   30925: - ALF-10501 60k Site Performance: Searching for a group to add to a site with a value that matches a few sites takes 2 minutes
     ALF-10502 60k Site Performance: Admin Console | Groups: search with a value that matches a few sites takes 70 seconds
     ALF-10504 60k Site Performance: Admin Console | Groups | Browse Groups page appears corrupt as it never finishes loading
     - All the above were slow as a result of ScriptGroup.isRootGroup()
     - ScriptGroup.isRootGroup() and ScriptGroup.isAdminGroup() removed - Checked with KevinR that these are not needed any more.
     - Removed code added on 30 Sep 11 to support isRootGroup (the size parameter to AuthorityDAO.getContainingAuthorities)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java

@@ -101,11 +101,8 @@ public class SubethaEmailMessage implements EmailMessage
         processMimeMessage(mimeMessage);
     }
 
-    public SubethaEmailMessage(String from, String to, InputStream dataInputStream)
+    public SubethaEmailMessage(InputStream dataInputStream)
     {
-        this.to = to;
-        this.from = from;
-
         MimeMessage mimeMessage = null;
         try
         {
@@ -136,8 +133,16 @@ public class SubethaEmailMessage implements EmailMessage
             {
                 throw new EmailMessageException(ERR_NO_FROM_ADDRESS);
             }
+            if(addresses[0] instanceof InternetAddress)
+            {
+                from = ((InternetAddress)addresses[0]).getAddress();
+            }
+            else
+            {
             from = addresses[0].toString();
         }
+         
+        }
 
         if (to == null)
         {
@@ -154,6 +159,15 @@ public class SubethaEmailMessage implements EmailMessage
             {
                 throw new EmailMessageException(ERR_NO_TO_ADDRESS);
             }
+            if(addresses[0] instanceof InternetAddress)
+            {
+                to = ((InternetAddress)addresses[0]).getAddress();
+            }
+            else
+            {
+            to = addresses[0].toString();
+        }
+
             to = addresses[0].toString();
         }
         

source/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java

@@ -24,6 +24,9 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+
 import org.alfresco.email.server.EmailServer;
 import org.alfresco.service.cmr.email.EmailMessage;
 import org.alfresco.service.cmr.email.EmailMessageException;
@@ -41,7 +44,7 @@ import org.subethamail.smtp.server.SMTPServer;
  */
 public class SubethaEmailServer extends EmailServer
 {
-    private final static Log log = LogFactory.getLog(SubethaEmailServer.class);
+    private final static Log logger = LogFactory.getLog(SubethaEmailServer.class);
 
     private SMTPServer serverImpl;
 
@@ -91,7 +94,6 @@ public class SubethaEmailServer extends EmailServer
 
         private List<String> EMPTY_LIST = new LinkedList<String>();
 
-        private String from;
         private MessageContext messageContext;
         List<Delivery> deliveries = new ArrayList<Delivery>();
 
@@ -105,11 +107,25 @@ public class SubethaEmailServer extends EmailServer
             return messageContext;
         }
 
-        public void from(String from) throws RejectException
+        public void from(String fromString) throws RejectException
         {
-            this.from = from;
+            String from = fromString;
+            
             try
             {
+                InternetAddress a = new InternetAddress(from);
+                from = a.getAddress();
+            }
+            catch (AddressException e)
+            {
+            }
+            
+            try
+            {
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("check whether user is allowed to send email from" + from);
+                }
                 filterSender(from);
             }
             catch (EmailMessageException e)
@@ -187,7 +203,7 @@ public class SubethaEmailServer extends EmailServer
             EmailMessage emailMessage;
             try
             {
-                emailMessage = new SubethaEmailMessage(from, delivery.getRecipient(), data);
+                emailMessage = new SubethaEmailMessage(data);
                 getEmailService().importMessage(emailMessage);
             }
             catch (EmailMessageException e)