You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/10 22:55:52 UTC
[20/50] [abbrv] git commit: CLOUDSTACK-52 Fix for AWSAPI contains
hibernate configurations https://reviews.apache.org/r/6967/diff/
CLOUDSTACK-52 Fix for AWSAPI contains hibernate configurations https://reviews.apache.org/r/6967/diff/
Signed-off-by: Mice Xia <mi...@tcloudcomputing.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d9c03a55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d9c03a55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d9c03a55
Branch: refs/heads/4.0
Commit: d9c03a55cfd482d2aa7a254e83ee75e7eaa02f7d
Parents: eb7746c
Author: Rajesh Battala <ra...@citrix.com>
Authored: Mon Sep 10 17:58:16 2012 +0800
Committer: Mice Xia <mi...@tcloudcomputing.com>
Committed: Mon Sep 10 17:58:16 2012 +0800
----------------------------------------------------------------------
awsapi/conf/CloudStack.cfg.xml | 58 -----------------------------------
cloud.spec | 2 +-
2 files changed, 1 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9c03a55/awsapi/conf/CloudStack.cfg.xml
----------------------------------------------------------------------
diff --git a/awsapi/conf/CloudStack.cfg.xml b/awsapi/conf/CloudStack.cfg.xml
deleted file mode 100644
index 511e68f..0000000
--- a/awsapi/conf/CloudStack.cfg.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-<session-factory>
- <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
- <property name="hibernate.connection.pool_size">20</property>
- <property name="hibernate.connection.autocommit">false</property>
-
- <property name="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property>
-
- <property name="hibernate.c3p0.min_size">5</property>
- <property name="hibernate.c3p0.max_size">50</property>
- <property name="hibernate.c3p0.timeout">7200</property>
- <property name="hibernate.c3p0.max_statements">50</property>
- <!-- This property forces the revalidation of a connection after the given amount of time (in secs) -->
- <!-- it must be set to LESS than the wait_timout setting for the mysql server (this setting defaults to 28800 secs (8 hours)) -->
-
- <property name="hibernate.c3p0.idle_test_period">5400</property>
-
-
- <!-- transactiion isolation level : 1 - read uncommitted, 2 - read committed, 4 - repeatable read, 8 - Serializable -->
- <property name="hibernate.connection.isolation">2</property>
-
- <property name="hibernate.order_updates">true</property>
- <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
-
- <property name="show_sql">false</property>
- <!-- to debug hibernate generated SQL, open following configuration property -->
- <!--
- <property name="show_sql">true</property>
- <property name="hibernate.format_sql">true</property>
- -->
-
- <!-- Mapping files -->
- <mapping resource="com/cloud/stack/models/CloudStackConfiguration.hbm.xml"/>
- <mapping resource="com/cloud/stack/models/CloudStackServiceOffering.hbm.xml"/>
- <mapping resource="com/cloud/stack/models/CloudStackAccount.hbm.xml"/>
-</session-factory>
-</hibernate-configuration>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9c03a55/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index ab445ff..5587362 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -407,7 +407,7 @@ if [ "$1" == "1" ] ; then
cp -f $root/lib/$j $root/webapps/awsapi/WEB-INF/lib/
done
- confs="cloud-bridge.properties ec2-service.properties hibernate.cfg.xml CloudStack.cfg.xml"
+ confs="cloud-bridge.properties ec2-service.properties"
for c in $confs
do
cp -f $root/conf/$c $target/conf