[exo-jcr-commits] exo-jcr SVN: r3556 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation.

[do-not-reply at jboss.org]

Author: sergiykarpenko
Date: 2010-11-25 07:35:32 -0500 (Thu, 25 Nov 2010)
New Revision: 3556

Modified:
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationException.java
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
Log:
EXOJCR-929: RepositoryCreationServiceImpl constructor without RPCService added.

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationException.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationException.java	2010-11-25 10:48:35 UTC (rev 3555)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationException.java	2010-11-25 12:35:32 UTC (rev 3556)
@@ -16,6 +16,8 @@
  */
 package org.exoplatform.services.jcr.ext.repository.creation;
 
+import javax.jcr.RepositoryException;
+
 /**
  * Created by The eXo Platform SAS.
  * 
@@ -24,9 +26,8 @@
  * @author <a href="karpenko.sergiy at gmail.com">Karpenko Sergiy</a> 
  * @version $Id: RepositoryCreationException.java 111 2008-11-11 11:11:11Z serg $
  */
-public class RepositoryCreationException extends Exception
+public class RepositoryCreationException extends RepositoryException
 {
-
    /**
     * {@inheritDoc}
     */
@@ -42,5 +43,4 @@
    {
       super(message, cause);
    }
-
 }

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java	2010-11-25 10:48:35 UTC (rev 3555)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java	2010-11-25 12:35:32 UTC (rev 3556)
@@ -115,6 +115,22 @@
     * Constructor RepositoryCreationServiceImpl.
     */
    public RepositoryCreationServiceImpl(RepositoryService repositoryService, BackupManager backupManager,
+      DBCreator dbCreator, InitialContextInitializer initialContextInitializer)
+   {
+      this.repositoryService = repositoryService;
+      this.backupManager = backupManager;
+      this.rpcService = null;
+      this.dbCreator = dbCreator;
+      this.initialContextInitializer = initialContextInitializer;
+
+      LOG.warn("RepositoryCreationService initialized without RPCService, so other cluser nodes will"
+         + " not be notified about new repositories.");
+   }
+
+   /**
+    * Constructor RepositoryCreationServiceImpl.
+    */
+   public RepositoryCreationServiceImpl(RepositoryService repositoryService, BackupManager backupManager,
       DBCreator dbCreator, InitialContextInitializer initialContextInitializer, final RPCService rpcService)
    {
       this.repositoryService = repositoryService;
@@ -123,85 +139,78 @@
       this.dbCreator = dbCreator;
       this.initialContextInitializer = initialContextInitializer;
 
-      if (rpcService == null)
+      // register commands
+      reserveRepositoryName = rpcService.registerCommand(new RemoteCommand()
       {
-         LOG.warn("RepositoryCreationService initialized with null RPCService, so other cluser nodes will"
-            + " not be notified about new repositories.");
-      }
-      else
-      {
-         // register commands
-         reserveRepositoryName = rpcService.registerCommand(new RemoteCommand()
+
+         public String getId()
          {
+            return "org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl-reserveRepositoryName";
+         }
 
-            public String getId()
-            {
-               return "org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl-reserveRepositoryName";
-            }
+         public Serializable execute(Serializable[] args) throws Throwable
+         {
+            String repositoryName = (String)args[0];
+            return reserveRepoName(repositoryName);
+         }
+      });
 
-            public Serializable execute(Serializable[] args) throws Throwable
-            {
-               String repositoryName = (String)args[0];
-               return reserveRepoName(repositoryName);
-            }
-         });
+      createRepository = rpcService.registerCommand(new RemoteCommand()
+      {
 
-         createRepository = rpcService.registerCommand(new RemoteCommand()
+         public String getId()
          {
+            return "org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl-createRepository";
+         }
 
-            public String getId()
-            {
-               return "org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl-createRepository";
-            }
+         public Serializable execute(Serializable[] args) throws Throwable
+         {
+            //String backupId, RepositoryEntry rEntry, String rToken
+            String backupId = (String)args[0];
+            String stringRepositoryEntry = (String)args[1];
+            String rToken = (String)args[2];
 
-            public Serializable execute(Serializable[] args) throws Throwable
+            try
             {
-               //String backupId, RepositoryEntry rEntry, String rToken
-               String backupId = (String)args[0];
-               String stringRepositoryEntry = (String)args[1];
-               String rToken = (String)args[2];
+               RepositoryEntry rEntry =
+                  (RepositoryEntry)(getObject(RepositoryEntry.class, stringRepositoryEntry
+                     .getBytes(Constants.DEFAULT_ENCODING)));
 
-               try
-               {
-                  RepositoryEntry rEntry =
-                     (RepositoryEntry)(getObject(RepositoryEntry.class, stringRepositoryEntry
-                        .getBytes(Constants.DEFAULT_ENCODING)));
-
-                  createRepo(backupId, rEntry, rToken);
-                  return null;
-               }
-               finally
-               {
-                  // release tokens
-                  pendingRepositories.remove(rToken);
-               }
+               createRepo(backupId, rEntry, rToken);
+               return null;
             }
-         });
-
-         startRepository = rpcService.registerCommand(new RemoteCommand()
-         {
-            public String getId()
+            finally
             {
-               return "org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl-startRepository";
+               // release tokens
+               pendingRepositories.remove(rToken);
             }
+         }
+      });
 
-            public Serializable execute(Serializable[] args) throws Throwable
+      startRepository = rpcService.registerCommand(new RemoteCommand()
+      {
+         public String getId()
+         {
+            return "org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl-startRepository";
+         }
+
+         public Serializable execute(Serializable[] args) throws Throwable
+         {
+            // must not be executed on coordinator node, since coordinator node already created the repository
+            if (!rpcService.isCoordinator())
             {
-               // must not be executed on coordinator node, since coordinator node already created the repository
-               if (!rpcService.isCoordinator())
-               {
-                  //RepositoryEntry (as String) rEntry
-                  String stringRepositoryEntry = (String)args[0];
-                  RepositoryEntry rEntry =
-                     (RepositoryEntry)(getObject(RepositoryEntry.class, stringRepositoryEntry
-                        .getBytes(Constants.DEFAULT_ENCODING)));
+               //RepositoryEntry (as String) rEntry
+               String stringRepositoryEntry = (String)args[0];
+               RepositoryEntry rEntry =
+                  (RepositoryEntry)(getObject(RepositoryEntry.class, stringRepositoryEntry
+                     .getBytes(Constants.DEFAULT_ENCODING)));
 
-                  startRepository(rEntry);
-               }
-               return null;
+               startRepository(rEntry);
             }
-         });
-      }
+            return null;
+         }
+      });
+
    }
 
    /**