1) JCR Checkout/Checkin support

2) Fix issue with auto version when cm:versionable is first applied and version snapshot is created at end of transaction even though one may have been made explicitly in the transaction (moved condition to rule, not contained action)
3) Fix Search test after previous search change

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

source/java/org/alfresco/repo/version/VersionableAspect.java

@@ -263,7 +263,8 @@ public class VersionableAspect
             Action action = this.actionService.createAction(CreateVersionActionExecuter.NAME);
             ActionCondition condition = this.actionService.createActionCondition(HasVersionHistoryEvaluator.NAME);
             condition.setInvertCondition(true);
-            action.addActionCondition(condition);
+            // conditions are only evaluated on the parent rule - not the contained actions
+            rule.addActionCondition(condition);
             this.rule.addAction(action);
         }
         

source/java/org/alfresco/util/SearchLanguageConversionTest.java

@@ -79,7 +79,7 @@ public class SearchLanguageConversionTest extends TestCase
     {
         String good = SearchLanguageConversion.convertXPathLikeToRegex(BAD_STRING);
         assertEquals("XPath like to regex failed",
-                "\\ \\| ! \" <20> " +
+                "(?s)\\ \\| ! \" <20> " +
                 "\\$ .* \\^ & \\* \\( " +
                 "\\) . \\{ \\} [ ] " +
                 "@ # ~ ' : ; " +