Distributed: updated default configuration

pellyadolfo · May 10, 2013 · 77bcad4 · 77bcad4
1 parent 3219000
commit 77bcad4
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 32 deletions.
diff --git a/distributed/config/orientdb-dserver-config.xml b/distributed/config/orientdb-dserver-config.xml
@@ -24,6 +24,20 @@
 				<parameter name="db.exclude" value="" /><!-- USE COMMA TO SEPARATE MULTIPLE DATABASE NAMES -->
 			</parameters>
 		</handler>
+		<!-- MAIL, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
+		<handler class="com.orientechnologies.orient.server.plugin.mail.OMailPlugin">
+			<parameters>
+				<parameter name="enabled" value="true" />
+				<!-- CREATE MULTIPLE PROFILES WITH profile.<name>... -->
+				<parameter name="profile.default.mail.smtp.host" value="localhost" />
+				<parameter name="profile.default.mail.smtp.port" value="25" />
+				<parameter name="profile.default.mail.smtp.auth" value="true" />
+				<parameter name="profile.default.mail.smtp.starttls.enable" value="true" />
+				<parameter name="profile.default.mail.smtp.user" value="" />
+				<parameter name="profile.default.mail.smtp.password" value="" />
+				<parameter name="profile.default.mail.date.format" value="yyyy-MM-dd HH:mm:ss" />
+			</parameters>
+		</handler>
 		<!-- SERVER SIDE SCRIPT INTERPRETER. WARNING! THIS CAN BE A SECURITY HOLE: ENABLE IT ONLY IF CLIENTS ARE TRUCT, TO TURN ON SET THE 'ENABLED' PARAMETER 
 			TO 'true' -->
 		<handler class="com.orientechnologies.orient.server.handler.OServerSideScriptInterpreter">
@@ -75,7 +89,21 @@
 		<!-- Uses the Hazelcast's distributed cache as 2nd level cache -->
 		<!-- <entry name="cache.level2.impl" value="com.orientechnologies.orient.server.hazelcast.OHazelcastCache" /> -->
 
-		<!-- Enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
+		<!-- DATABASE POOL: size min/max -->
+		<entry name="db.pool.min" value="1" />
+		<entry name="db.pool.max" value="20" />
+
+		<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
+		<entry name="cache.level1.enabled" value="false" />
+		<entry name="cache.level1.size" value="1000" />
+		<entry name="cache.level2.enabled" value="true" />
+		<entry name="cache.level2.size" value="1000" />
+
+		<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size>  -->
+		<entry name="profiler.enabled" value="true" />
+		<!-- <entry name="profiler.config" value="30,10,10" />  -->		
+
+		<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
 		<entry name="log.console.level" value="info" />
 		<entry name="log.file.level" value="fine" />
 	</properties>

diff --git a/distributed/src/test/resources/hazelcast-1.xml b/distributed/src/test/resources/hazelcast-1.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~ ~ Licensed 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. -->
+<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~ 
+	~ Licensed 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. -->
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd" xmlns="http://www.hazelcast.com/schema/config"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast
+	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd"
+	xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<group>
 		<name>orientdb</name>
 		<password>orientdb</password>
@@ -14,7 +19,7 @@
 		<port auto-increment="false">2434</port>
 		<join>
 			<multicast enabled="true">
-				<multicast-group>235.1.1.1</multicast-group>
+				<multicast-group>224.2.2.3</multicast-group>
 				<multicast-port>2434</multicast-port>
 			</multicast>
 		</join>
@@ -24,5 +29,13 @@
 		<max-pool-size>16</max-pool-size>
 		<keep-alive-seconds>60</keep-alive-seconds>
 	</executor-service>
+	<!-- Add your own semaphore configurations here: <semaphore name="default"> 
+		<initial-permits>10</initial-permits> <semaphore-factory enabled="true"> 
+		<class-name>com.acme.MySemaphoreFactory</class-name> </semaphore-factory> 
+		</semaphore> -->
+
+	<!-- Add your own map merge policy implementations here: <merge-policies> 
+		<map-merge-policy name="MY_MERGE_POLICY"> <class-name>com.acme.MyOwnMergePolicy</class-name> 
+		</map-merge-policy> </merge-policies> -->
 
 </hazelcast>
diff --git a/distributed/src/test/resources/hazelcast-2.xml b/distributed/src/test/resources/hazelcast-2.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~ ~ Licensed 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. -->
+<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~ 
+	~ Licensed 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. -->
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd" xmlns="http://www.hazelcast.com/schema/config"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast
+	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd"
+	xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<group>
 		<name>orientdb</name>
 		<password>orientdb</password>
@@ -14,7 +19,7 @@
 		<port auto-increment="false">2435</port>
 		<join>
 			<multicast enabled="true">
-				<multicast-group>235.1.1.1</multicast-group>
+				<multicast-group>224.2.2.3</multicast-group>
 				<multicast-port>2434</multicast-port>
 			</multicast>
 		</join>
@@ -24,10 +29,13 @@
 		<max-pool-size>16</max-pool-size>
 		<keep-alive-seconds>60</keep-alive-seconds>
 	</executor-service>
-	<!-- Add your own semaphore configurations here: <semaphore name="default"> <initial-permits>10</initial-permits> <semaphore-factory enabled="true"> <class-name>com.acme.MySemaphoreFactory</class-name> 
-		</semaphore-factory> </semaphore> -->
+	<!-- Add your own semaphore configurations here: <semaphore name="default"> 
+		<initial-permits>10</initial-permits> <semaphore-factory enabled="true"> 
+		<class-name>com.acme.MySemaphoreFactory</class-name> </semaphore-factory> 
+		</semaphore> -->
 
-	<!-- Add your own map merge policy implementations here: <merge-policies> <map-merge-policy name="MY_MERGE_POLICY"> <class-name>com.acme.MyOwnMergePolicy</class-name> 
+	<!-- Add your own map merge policy implementations here: <merge-policies> 
+		<map-merge-policy name="MY_MERGE_POLICY"> <class-name>com.acme.MyOwnMergePolicy</class-name> 
 		</map-merge-policy> </merge-policies> -->
 
 </hazelcast>
diff --git a/distributed/src/test/resources/orientdb-dserver-config-1.xml b/distributed/src/test/resources/orientdb-dserver-config-1.xml
@@ -56,15 +56,29 @@
 		</listeners>
 	</network>
 	<storages>
-		<storage loaded-at-startup="true" userPassword="admin" userName="admin" path="memory:temp" name="temp" />
 	</storages>
 	<users>
-		<user resources="*" password="09725FA08AB11932720F67BF78907BCB3A3345624E0B93AEF773A8A79AFB1B6D" name="root" />
+		<user resources="*" password="test" name="root" />
 		<user resources="connect,server.listDatabases" password="guest" name="guest" />
 		<user resources="database.passthrough" password="79498491C4D4F1360816D003E2004BC04606AA1C31B1A0E3BCF091A30EFDAB7D" name="replicator" />
 	</users>
 	<properties>
-		<entry value="info" name="log.console.level" />
-		<entry value="fine" name="log.file.level" />
+		<!-- DATABASE POOL: size min/max -->
+		<entry name="db.pool.min" value="1" />
+		<entry name="db.pool.max" value="20" />
+
+		<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
+		<entry name="cache.level1.enabled" value="false" />
+		<entry name="cache.level1.size" value="1000" />
+		<entry name="cache.level2.enabled" value="true" />
+		<entry name="cache.level2.size" value="1000" />
+
+		<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size>  -->
+		<entry name="profiler.enabled" value="true" />
+		<!-- <entry name="profiler.config" value="30,10,10" />  -->		
+
+		<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
+		<entry name="log.console.level" value="info" />
+		<entry name="log.file.level" value="fine" />
 	</properties>
 </orient-server>
diff --git a/distributed/src/test/resources/orientdb-dserver-config-2.xml b/distributed/src/test/resources/orientdb-dserver-config-2.xml
@@ -56,15 +56,29 @@
 		</listeners>
 	</network>
 	<storages>
-		<storage loaded-at-startup="true" userPassword="admin" userName="admin" path="memory:temp" name="temp" />
 	</storages>
 	<users>
-		<user resources="*" password="09725FA08AB11932720F67BF78907BCB3A3345624E0B93AEF773A8A79AFB1B6D" name="root" />
+		<user resources="*" password="test" name="root" />
 		<user resources="connect,server.listDatabases" password="guest" name="guest" />
 		<user resources="database.passthrough" password="42BF13166BD3DCA08BF21DCD7BE9F1FFDCD81772B9467F6C61ABC634AEF14B77" name="replicator" />
 	</users>
 	<properties>
-		<entry value="info" name="log.console.level" />
-		<entry value="fine" name="log.file.level" />
+		<!-- DATABASE POOL: size min/max -->
+		<entry name="db.pool.min" value="1" />
+		<entry name="db.pool.max" value="20" />
+
+		<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
+		<entry name="cache.level1.enabled" value="false" />
+		<entry name="cache.level1.size" value="1000" />
+		<entry name="cache.level2.enabled" value="true" />
+		<entry name="cache.level2.size" value="1000" />
+
+		<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size>  -->
+		<entry name="profiler.enabled" value="true" />
+		<!-- <entry name="profiler.config" value="30,10,10" />  -->		
+
+		<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
+		<entry name="log.console.level" value="info" />
+		<entry name="log.file.level" value="fine" />
 	</properties>
 </orient-server>
diff --git a/distributed/src/test/resources/orientdb-dserver-config-3.xml b/distributed/src/test/resources/orientdb-dserver-config-3.xml
@@ -55,15 +55,29 @@
         </listeners>
     </network>
     <storages>
-        <storage loaded-at-startup="true" userPassword="admin" userName="admin" path="memory:temp" name="temp"/>
     </storages>
     <users>
-        <user resources="*" password="09725FA08AB11932720F67BF78907BCB3A3345624E0B93AEF773A8A79AFB1B6D" name="root"/>
+        <user resources="*" password="test" name="root"/>
         <user resources="connect,server.listDatabases" password="guest" name="guest"/>
         <user resources="database.passthrough" password="32B77D61B488C37B8F06CE0086C0E03EFEC2BF99FFE62027D4DAFE4FC44B57AA" name="replicator"/>
     </users>
     <properties>
-        <entry value="info" name="log.console.level"/>
-        <entry value="fine" name="log.file.level"/>
+		<!-- DATABASE POOL: size min/max -->
+		<entry name="db.pool.min" value="1" />
+		<entry name="db.pool.max" value="20" />
+
+		<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
+		<entry name="cache.level1.enabled" value="false" />
+		<entry name="cache.level1.size" value="1000" />
+		<entry name="cache.level2.enabled" value="true" />
+		<entry name="cache.level2.size" value="1000" />
+
+		<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size>  -->
+		<entry name="profiler.enabled" value="true" />
+		<!-- <entry name="profiler.config" value="30,10,10" />  -->		
+
+		<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
+		<entry name="log.console.level" value="info" />
+		<entry name="log.file.level" value="fine" />
     </properties>
 </orient-server>
diff --git a/graphdb/config/orientdb-dserver-config.xml b/graphdb/config/orientdb-dserver-config.xml
@@ -27,6 +27,20 @@
 				<parameter name="db.exclude" value="" /><!-- USE COMMA TO SEPARATE MULTIPLE DATABASE NAMES -->
 			</parameters>
 		</handler>
+		<!-- MAIL, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
+		<handler class="com.orientechnologies.orient.server.plugin.mail.OMailPlugin">
+			<parameters>
+				<parameter name="enabled" value="true" />
+				<!-- CREATE MULTIPLE PROFILES WITH profile.<name>... -->
+				<parameter name="profile.default.mail.smtp.host" value="localhost" />
+				<parameter name="profile.default.mail.smtp.port" value="25" />
+				<parameter name="profile.default.mail.smtp.auth" value="true" />
+				<parameter name="profile.default.mail.smtp.starttls.enable" value="true" />
+				<parameter name="profile.default.mail.smtp.user" value="" />
+				<parameter name="profile.default.mail.smtp.password" value="" />
+				<parameter name="profile.default.mail.date.format" value="yyyy-MM-dd HH:mm:ss" />
+			</parameters>
+		</handler>
 		<!-- SERVER SIDE SCRIPT INTERPRETER. WARNING! THIS CAN BE A SECURITY HOLE: ENABLE IT ONLY IF CLIENTS ARE TRUCT, TO TURN ON SET THE 'ENABLED' PARAMETER 
 			TO 'true' -->
 		<handler class="com.orientechnologies.orient.server.handler.OServerSideScriptInterpreter">
@@ -78,7 +92,21 @@
 		<!-- Uses the Hazelcast's distributed cache as 2nd level cache -->
 		<!-- <entry name="cache.level2.impl" value="com.orientechnologies.orient.server.hazelcast.OHazelcastCache" /> -->
 
-		<!-- Enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
+		<!-- DATABASE POOL: size min/max -->
+		<entry name="db.pool.min" value="1" />
+		<entry name="db.pool.max" value="20" />
+
+		<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
+		<entry name="cache.level1.enabled" value="false" />
+		<entry name="cache.level1.size" value="1000" />
+		<entry name="cache.level2.enabled" value="true" />
+		<entry name="cache.level2.size" value="1000" />
+
+		<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size>  -->
+		<entry name="profiler.enabled" value="true" />
+		<!-- <entry name="profiler.config" value="30,10,10" />  -->		
+
+		<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
 		<entry name="log.console.level" value="info" />
 		<entry name="log.file.level" value="fine" />
 	</properties>

diff --git a/...ientechnologies/orient/server/network/protocol/binary/OBinaryNetworkProtocolAbstract.java b/...ientechnologies/orient/server/network/protocol/binary/OBinaryNetworkProtocolAbstract.java
@@ -76,7 +76,7 @@ public OBinaryNetworkProtocolAbstract(final String iThreadName) {
   /**
    * Executes the request.
    * 
-   * @return true if the request has been recognized, othereise false
+   * @return true if the request has been recognized, otherwise false
    * @throws IOException
    */
   protected abstract boolean executeRequest() throws IOException;