- Action/Rule decoupling work

- Updated web services, SDK and web client where appropraite
- Patch added to migrate existing rules
- Entire rule service can now be disabled programmatically
- Rule service is now disabled during the patching process
- StoreEnum and languageEnum types removed from web service interfaces
- Multiple rule types now supported in the repo (but not in the UI)
- Removed owning node ref from action and rule .. now calculated from methods on the rule service

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

source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java

@@ -35,10 +35,8 @@ import org.alfresco.repo.webservice.types.Node;
 import org.alfresco.repo.webservice.types.NodeDefinition;
 import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.repo.webservice.types.Query;
-import org.alfresco.repo.webservice.types.QueryLanguageEnum;
 import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.repo.webservice.types.Store;
-import org.alfresco.repo.webservice.types.StoreEnum;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -103,14 +101,10 @@ public class RepositoryWebService extends AbstractWebService implements
     /**
      * @see org.alfresco.repo.webservice.repository.RepositoryServiceSoapPort#createStore(org.alfresco.repo.webservice.types.StoreEnum, java.lang.String)
      */
-    public Store createStore(StoreEnum scheme, String address) throws RemoteException, RepositoryFault
+    public Store createStore(String scheme, String address) throws RemoteException, RepositoryFault
     {
-        String protocol = scheme.getValue();
-        StoreRef storeRef = this.nodeService.createStore(protocol, address);
-        
-        StoreEnum storeEnum = StoreEnum.fromString(storeRef
-                .getProtocol());
-        return new Store(storeEnum, storeRef.getIdentifier());
+        StoreRef storeRef = this.nodeService.createStore(scheme, address);
+        return Utils.convertToStore(storeRef);
     }
 
     /**
@@ -136,9 +130,7 @@ public class RepositoryWebService extends AbstractWebService implements
                     logger.debug("Store protocol :" + storeRef.getProtocol());
                 }
                 
-                StoreEnum storeEnum = StoreEnum.fromString(storeRef
-                        .getProtocol());
-                Store store = new Store(storeEnum, storeRef.getIdentifier());
+                Store store = Utils.convertToStore(storeRef);
                 returnStores[x] = store;
             }
 
@@ -175,13 +167,11 @@ public class RepositoryWebService extends AbstractWebService implements
     public QueryResult query(Store store, Query query, boolean includeMetaData)
             throws RemoteException, RepositoryFault
     {
-        QueryLanguageEnum langEnum = query.getLanguage();
-
-        if (langEnum.equals(QueryLanguageEnum.cql)
-                || langEnum.equals(QueryLanguageEnum.xpath))
+        String language = query.getLanguage();
+        if (language.equals(Utils.QUERY_LANG_LUCENE) == false)
         {
             throw new RepositoryFault(110, "Only '"
-                    + QueryLanguageEnum.lucene.getValue()
+                    + Utils.QUERY_LANG_LUCENE
                     + "' queries are currently supported!");
         }
 

source/java/org/alfresco/repo/webservice/repository/ResultSetQuerySession.java

@@ -90,7 +90,7 @@ public class ResultSetQuerySession extends AbstractQuerySession
          try
          {
             searchResults = searchService.query(Utils.convertToStoreRef(this.store), 
-                  this.query.getLanguage().getValue(), statement);
+                  this.query.getLanguage(), statement);
          
             int totalRows = searchResults.length();
             int lastRow = calculateLastRowIndex(totalRows);
@@ -174,8 +174,8 @@ public class ResultSetQuerySession extends AbstractQuerySession
       builder.append(" (id=").append(getId());
       builder.append(" batchSize=").append(this.batchSize);
       builder.append(" position=").append(this.position);
-      builder.append(" store=").append(this.store.getScheme().getValue()).append(":").append(this.store.getAddress());
-      builder.append(" language=").append(this.query.getLanguage().getValue());
+      builder.append(" store=").append(this.store.getScheme()).append(":").append(this.store.getAddress());
+      builder.append(" language=").append(this.query.getLanguage());
       builder.append(" statement=").append(this.query.getStatement());
       builder.append(")");
       return builder.toString();