Updated Branches: refs/heads/javelin 6dfbcee63 -> 96bd1d417
Forget to save changed file in last commit Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/96bd1d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/96bd1d41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/96bd1d41 Branch: refs/heads/javelin Commit: 96bd1d4172aaa37757cc75a694b40783a6b962c4 Parents: 6dfbcee Author: Kelven Yang <[email protected]> Authored: Mon Jan 14 14:10:47 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Mon Jan 14 14:10:47 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/servlet/CloudStartupServlet.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96bd1d41/server/src/com/cloud/servlet/CloudStartupServlet.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/servlet/CloudStartupServlet.java b/server/src/com/cloud/servlet/CloudStartupServlet.java index d3b930d..bbcf353 100755 --- a/server/src/com/cloud/servlet/CloudStartupServlet.java +++ b/server/src/com/cloud/servlet/CloudStartupServlet.java @@ -27,7 +27,6 @@ import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.xml.DOMConfigurator; -import com.cloud.api.ApiServer; import com.cloud.exception.InvalidParameterValueException; import com.cloud.server.ConfigurationServer; import com.cloud.server.ManagementServer; @@ -49,7 +48,7 @@ public class CloudStartupServlet extends HttpServlet implements ServletContextLi ManagementServer ms = (ManagementServer)ComponentContext.getComponent(ManagementServer.Name); ms.startup(); ms.enableAdminUser("password"); - ApiServer.initApiServer(); + //ApiServer.initApiServer(); } catch (InvalidParameterValueException ipve) { s_logger.error("Exception starting management server ", ipve); throw new ServletException (ipve.getMessage());
