2 Commits

Author SHA1 Message Date
Derek Hulley
f17fd30824 Merge V2.0 to HEAD
5234: LicenseService shutdown
   5256: AR-1273 workaround
   5289: AWC-1142
   5294: WCM-360
   5296: Potential NPE in patches dao


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:14:46 +00:00
Derek Hulley
e7c83d8731 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5093 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5094 .
      - Fix AR-1024: AVM workflow submit NPE
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5188 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5189 .
      - PostgreSQL sample
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5191 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5193 .
      - PostgreSQL lurking JDBC driver


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-20 11:23:11 +00:00