Author: psteitz
Date: Sat Sep 18 19:26:00 2010
New Revision: 998527
URL: http://svn.apache.org/viewvc?rev=998527&view=rev
Log:
Created separate builds for dbcp, http, pool.
Added:
commons/sandbox/performance/trunk/src/dbcp/
commons/sandbox/performance/trunk/src/dbcp/build.properties.sample
- copied unchanged from r748908,
commons/sandbox/performance/trunk/build.properties.sample
commons/sandbox/performance/trunk/src/dbcp/build.xml
- copied, changed from r748908,
commons/sandbox/performance/trunk/build-dbcp.xml
commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml (with props)
commons/sandbox/performance/trunk/src/dbcp/logging.properties (with props)
commons/sandbox/performance/trunk/src/http/
commons/sandbox/performance/trunk/src/http/build.xml
- copied, changed from r748908,
commons/sandbox/performance/trunk/build-http.xml
commons/sandbox/performance/trunk/src/http/config-http.xml
- copied unchanged from r748908,
commons/sandbox/performance/trunk/config-http.xml
commons/sandbox/performance/trunk/src/http/logging.properties (with props)
commons/sandbox/performance/trunk/src/pool/
commons/sandbox/performance/trunk/src/pool/build.xml
- copied, changed from r748908,
commons/sandbox/performance/trunk/build-pool.xml
commons/sandbox/performance/trunk/src/pool/config-pool.xml (with props)
commons/sandbox/performance/trunk/src/pool/logging.properties (with props)
Removed:
commons/sandbox/performance/trunk/build-dbcp.xml
commons/sandbox/performance/trunk/build-http.xml
commons/sandbox/performance/trunk/build-pool.xml
commons/sandbox/performance/trunk/build.properties.sample
commons/sandbox/performance/trunk/config-dbcp.xml
commons/sandbox/performance/trunk/config-http.xml
commons/sandbox/performance/trunk/config-pool.xml
Copied: commons/sandbox/performance/trunk/src/dbcp/build.xml (from r748908,
commons/sandbox/performance/trunk/build-dbcp.xml)
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/dbcp/build.xml?p2=commons/sandbox/performance/trunk/src/dbcp/build.xml&p1=commons/sandbox/performance/trunk/build-dbcp.xml&r1=748908&r2=998527&rev=998527&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/build-dbcp.xml (original)
+++ commons/sandbox/performance/trunk/src/dbcp/build.xml Sat Sep 18 19:26:00
2010
@@ -21,7 +21,7 @@
<project name="DBCPTest" default="run" basedir=".">
- <property name="src" location="src"/>
+ <property name="src" location=".."/>
<property name="build" location="build"/>
<property name="lib" location="lib"/>
@@ -32,6 +32,8 @@
<pathelement location="${jdbc-jar}"/>
<pathelement location="${pool-jar}"/>
<pathelement location="${dbcp-jar}"/>
+ <pathelement location="${tomcat-jdbc-jar}"/>
+ <pathelement location="${tomcat-juli-jar}"/>
<fileset dir="${lib}">
<include name="*.jar"/>
</fileset>
@@ -94,6 +96,7 @@
destdir="${build}">
<classpath refid="compile.classpath"/>
<compilerarg value="-Xlint:unchecked" />
+ <include name="**/dbcp/*" />
</javac>
<copy file="${basedir}/config-dbcp.xml" tofile="${build}/config-dbcp.xml"/>
<copy file="${basedir}/logging.properties"
tofile="${build}/logging.properties"/>
Added: commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml?rev=998527&view=auto
==============================================================================
--- commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml (added)
+++ commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml Sat Sep 18
19:26:00 2010
@@ -0,0 +1,92 @@
+<!--
+/*
+ * 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.
+ */
+ -->
+
+<configuration>
+ <database>
+ <driver>com.mysql.jdbc.Driver</driver>
+ <url>jdbc:mysql:///test</url>
+ <username></username>
+ <password></password>
+ <!-- no-op, integerIndexed, integerScan, or textScan -->
+ <query-type>integerIndexed</query-type>
+ </database>
+
+ <!-- BasicDataSource or PoolingDataSource -->
+ <datasource-type>PoolingDataSource</datasource-type>
+
+ <connection-factory>
+ <!-- DriverManager or Driver -->
+ <type>DriverManager</type>
+ <auto-commit>true</auto-commit>
+ <read-only>false</read-only>
+ <!-- Validation query to use when testOnBorrow or testOnReturn is true -->
+ <validation-query>SELECT 1</validation-query>
+ </connection-factory>
+
+ <poolable-connection-factory>
+ <!-- PoolableConnectionFactory or CPDSConnectionFactory (not yet) -->
+ <type>PoolableConnectionFactory</type>
+ <pool-prepared-statements>true</pool-prepared-statements>
+ <max-open-statements>-1</max-open-statements>
+ </poolable-connection-factory>
+
+ <pool>
+ <!-- GenericObjectPool or AbandonedObjectPool -->
+ <type>GenericObjectPool</type>
+ <max-active>15</max-active>
+ <max-idle>15</max-idle>
+ <min-idle>3</min-idle>
+ <max-wait>2000</max-wait>
+ <!-- block, fail, or grow -->
+ <exhausted-action>block</exhausted-action>
+ <test-on-borrow>true</test-on-borrow>
+ <test-on-return>false</test-on-return>
+ <time-between-evictions>-1</time-between-evictions>
+ <tests-per-eviction>3</tests-per-eviction>
+ <idle-timeout>-1</idle-timeout>
+ <test-while-idle>false</test-while-idle>
+ </pool>
+
+ <!-- Ignored unless pool type is AbandonedObjectPool -->
+ <abandoned-config>
+ <log-abandoned>true</log-abandoned>
+ <remove-abandoned>true</remove-abandoned>
+ <abandoned-timeout>50000</abandoned-timeout>
+ </abandoned-config>
+
+ <run>
+ <iterations>10000</iterations>
+ <clients>800</clients>
+ <delay-min>200</delay-min>
+ <delay-max>1000</delay-max>
+ <delay-sigma>50</delay-sigma>
+ <!-- constant, gaussian, or poisson -->
+ <delay-type>constant</delay-type>
+ <!-- none, linear, random -->
+ <ramp-type>linear</ramp-type>
+ <ramp-period>5000</ramp-period>
+ <peak-period>3000</peak-period>
+ <trough-period>3000</trough-period>
+ <!-- none, oscillating (others?)-->
+ <cycle-type>oscillating</cycle-type>
+ </run>
+
+</configuration>
Propchange: commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: commons/sandbox/performance/trunk/src/dbcp/logging.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/dbcp/logging.properties?rev=998527&view=auto
==============================================================================
--- commons/sandbox/performance/trunk/src/dbcp/logging.properties (added)
+++ commons/sandbox/performance/trunk/src/dbcp/logging.properties Sat Sep 18
19:26:00 2010
@@ -0,0 +1,38 @@
+###############################################################################
+#
+# 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.
+###############################################################################
+
+handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+.level=WARNING
+
+org.apache.commons.pool.level=FINE
+org.apache.commons.dbcp.level=FINE
+org.apache.commons.performance.level=INFO
+
+java.util.logging.ConsoleHandler.level=SEVERE
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level=FINE
+java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
+
+java.util.logging.FileHandler.pattern=%h/performance%u.log
+
+java.util.logging.FileHandler.limit=1000000
+
+java.util.logging.FileHandler.count=10
+
+
Propchange: commons/sandbox/performance/trunk/src/dbcp/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/performance/trunk/src/dbcp/logging.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: commons/sandbox/performance/trunk/src/dbcp/logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: commons/sandbox/performance/trunk/src/http/build.xml (from r748908,
commons/sandbox/performance/trunk/build-http.xml)
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/http/build.xml?p2=commons/sandbox/performance/trunk/src/http/build.xml&p1=commons/sandbox/performance/trunk/build-http.xml&r1=748908&r2=998527&rev=998527&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/build-http.xml (original)
+++ commons/sandbox/performance/trunk/src/http/build.xml Sat Sep 18 19:26:00
2010
@@ -21,7 +21,7 @@
<project name="HttpTest" default="run" basedir=".">
- <property name="src" location="src"/>
+ <property name="src" location=".."/>
<property name="build" location="build"/>
<property name="lib" location="lib"/>
@@ -107,8 +107,9 @@
destdir="${build}">
<classpath refid="compile.classpath"/>
<compilerarg value="-Xlint:unchecked" />
+ <include name="**/http/*" />
</javac>
- <copy file="${basedir}/config-pool.xml" tofile="${build}/config-pool.xml"/>
+ <copy file="${basedir}/config-http.xml" tofile="${build}/config-http.xml"/>
<copy file="${basedir}/logging.properties"
tofile="${build}/logging.properties"/>
</target>
Added: commons/sandbox/performance/trunk/src/http/logging.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/http/logging.properties?rev=998527&view=auto
==============================================================================
--- commons/sandbox/performance/trunk/src/http/logging.properties (added)
+++ commons/sandbox/performance/trunk/src/http/logging.properties Sat Sep 18
19:26:00 2010
@@ -0,0 +1,36 @@
+###############################################################################
+#
+# 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.
+###############################################################################
+
+handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+.level=WARNING
+
+org.apache.commons.performance.level=INFO
+
+java.util.logging.ConsoleHandler.level=SEVERE
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level=FINE
+java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
+
+java.util.logging.FileHandler.pattern=%h/performance%u.log
+
+java.util.logging.FileHandler.limit=1000000
+
+java.util.logging.FileHandler.count=10
+
+
Propchange: commons/sandbox/performance/trunk/src/http/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/performance/trunk/src/http/logging.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: commons/sandbox/performance/trunk/src/http/logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: commons/sandbox/performance/trunk/src/pool/build.xml (from r748908,
commons/sandbox/performance/trunk/build-pool.xml)
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/pool/build.xml?p2=commons/sandbox/performance/trunk/src/pool/build.xml&p1=commons/sandbox/performance/trunk/build-pool.xml&r1=748908&r2=998527&rev=998527&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/build-pool.xml (original)
+++ commons/sandbox/performance/trunk/src/pool/build.xml Sat Sep 18 19:26:00
2010
@@ -21,7 +21,7 @@
<project name="DBCPTest" default="run" basedir=".">
- <property name="src" location="src"/>
+ <property name="src" location=".."/>
<property name="build" location="build"/>
<property name="lib" location="lib"/>
Added: commons/sandbox/performance/trunk/src/pool/config-pool.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/pool/config-pool.xml?rev=998527&view=auto
==============================================================================
--- commons/sandbox/performance/trunk/src/pool/config-pool.xml (added)
+++ commons/sandbox/performance/trunk/src/pool/config-pool.xml Sat Sep 18
19:26:00 2010
@@ -0,0 +1,79 @@
+<!--
+/*
+ * 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.
+ */
+ -->
+
+<configuration>
+
+ <factory>
+ <activate-latency>0</activate-latency>
+ <destroy-latency>20</destroy-latency>
+ <make-latency>40</make-latency>
+ <passivate-latency>0</passivate-latency>
+ <validate-latency>20</validate-latency>
+ <waiter-latency>0</waiter-latency>
+ </factory>
+
+ <pool>
+ <!-- GenericObjectPool, AbandonedObjectPool, GenericKeyedObjectPool
+ StackObjectPool, StackKeyedObjectPool, SoftReferenceObjectPool -->
+ <type>GenericObjectPool</type>
+ <max-active>100</max-active>
+ <max-idle>10</max-idle>
+ <min-idle>5</min-idle>
+ <max-wait>-1</max-wait>
+ <!-- block, fail, or grow -->
+ <exhausted-action>block</exhausted-action>
+ <test-on-borrow>false</test-on-borrow>
+ <test-on-return>false</test-on-return>
+ <time-between-evictions>2000</time-between-evictions>
+ <tests-per-eviction>3</tests-per-eviction>
+ <idle-timeout>1000</idle-timeout>
+ <test-while-idle>true</test-while-idle>
+ <lifo>false</lifo>
+ <!-- Ignored unless pool type a KeyedObjectPool -->
+ <max-active-per-key>10</max-active-per-key>
+ <sampling-rate>0.1</sampling-rate>
+ </pool>
+
+ <!-- Ignored unless pool type is AbandonedObjectPool -->
+ <abandoned-config>
+ <log-abandoned>false</log-abandoned>
+ <remove-abandoned>false</remove-abandoned>
+ <abandoned-timeout>-1</abandoned-timeout>
+ </abandoned-config>
+
+ <run>
+ <iterations>1000</iterations>
+ <clients>100</clients>
+ <delay-min>20</delay-min>
+ <delay-max>2000</delay-max>
+ <delay-sigma>100</delay-sigma>
+ <!-- constant, gaussian, or poisson -->
+ <delay-type>poisson</delay-type>
+ <!-- none, linear, random -->
+ <ramp-type>linear</ramp-type>
+ <ramp-period>2000</ramp-period>
+ <peak-period>5000</peak-period>
+ <trough-period>2000</trough-period>
+ <!-- none, oscillating (others?)-->
+ <cycle-type>oscillating</cycle-type>
+ </run>
+
+</configuration>
Propchange: commons/sandbox/performance/trunk/src/pool/config-pool.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/performance/trunk/src/pool/config-pool.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: commons/sandbox/performance/trunk/src/pool/config-pool.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: commons/sandbox/performance/trunk/src/pool/logging.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/pool/logging.properties?rev=998527&view=auto
==============================================================================
--- commons/sandbox/performance/trunk/src/pool/logging.properties (added)
+++ commons/sandbox/performance/trunk/src/pool/logging.properties Sat Sep 18
19:26:00 2010
@@ -0,0 +1,37 @@
+###############################################################################
+#
+# 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.
+###############################################################################
+
+handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+.level=WARNING
+
+org.apache.commons.pool.level=FINE
+org.apache.commons.performance.level=INFO
+
+java.util.logging.ConsoleHandler.level=SEVERE
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level=FINE
+java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
+
+java.util.logging.FileHandler.pattern=%h/performance%u.log
+
+java.util.logging.FileHandler.limit=1000000
+
+java.util.logging.FileHandler.count=10
+
+
Propchange: commons/sandbox/performance/trunk/src/pool/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/performance/trunk/src/pool/logging.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: commons/sandbox/performance/trunk/src/pool/logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
