Title: [638] trunk/rails-integration: set target and source to 1.4 to ensure JVM compatability.
- Revision
- 638
- Author
- tirsen
- Date
- 2007-06-19 05:16:48 -0400 (Tue, 19 Jun 2007)
Log Message
set target and source to 1.4 to ensure JVM compatability. made initial set of rails instances configurable.
Modified Paths
Diff
Modified: trunk/rails-integration/build.xml (637 => 638)
--- trunk/rails-integration/build.xml 2007-06-19 07:57:41 UTC (rev 637)
+++ trunk/rails-integration/build.xml 2007-06-19 09:16:48 UTC (rev 638)
@@ -36,7 +36,7 @@
</target>
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
- <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+ <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false" target="1.4" source="1.4">
<src>
<pathelement location="src/main/java"/>
</src>
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/RailsContextListener.java (637 => 638)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/RailsContextListener.java 2007-06-19 07:57:41 UTC (rev 637)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/RailsContextListener.java 2007-06-19 09:16:48 UTC (rev 638)
@@ -93,11 +93,12 @@
protected ObjectPool createObjectPool(RailsFactory railsFactory) {
int maxObjects = getIntegerProperty("jruby.pool.maxActive", 4);
int minIdle = getIntegerProperty("jruby.pool.minIdle", 2);
+ int initialSize = getIntegerProperty("jruby.pool.initialSize", minIdle);
int checkInterval = getIntegerProperty("jruby.pool.checkInterval", 1000);
CustomObjectPool pool = new CustomObjectPool(railsFactory, maxObjects, minIdle, checkInterval);
pool.setMaxWait(getIntegerProperty("jruby.pool.maxWait", 30000));
try {
- pool.addObjects(1);
+ pool.addObjects(initialSize);
} catch (Exception e) {
// ignore
}
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
