[prev in list] [next in list] [prev in thread] [next in thread]
List: openmrs-svn
Subject: [29405] openmrs-modules/idgen/trunk: IDGEN-17 - Identifier Pools should be able to refill themselves
From: svn-noreply () openmrs ! org
Date: 2012-09-27 17:29:19
Message-ID: 20120927172919.8E19A401C9 () openmrs ! osuosl ! org
[Download RAW message or body]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29405] openmrs-modules/idgen/trunk: IDGEN-17 - Identifier Pools should be \
able to refill themselves on a scheduled task</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>29405</dd>
<dt>Author</dt> <dd>darius</dd>
<dt>Date</dt> <dd>2012-09-27 17:29:19 +0000 (Thu, 27 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDGEN-17 - Identifier Pools should be able to refill themselves on a scheduled \
task</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmodulesidgentrunkapisrcmainjavaorgopenmrsmoduleidgenIdentifierPoo \
ljava">openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/IdentifierPool.java</a></li>
<li><a href="#openmrsmodulesidgentrunkapisrcmainjavaorgopenmrsmoduleidgenprocessorIde \
ntifierPoolProcessorjava">openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/processor/IdentifierPoolProcessor.java</a></li>
<li><a href="#openmrsmodulesidgentrunkapisrcmainresourcesIdentifierSourcehbmxml">openmrs-modules/idgen/trunk/api/src/main/resources/IdentifierSource.hbm.xml</a></li>
<li><a href="#openmrsmodulesidgentrunkapisrcmainresourcesmessagesproperties">openmrs-modules/idgen/trunk/api/src/main/resources/messages.properties</a></li>
<li><a href="#openmrsmodulesidgentrunkapisrcmainresourcesmoduleApplicationContextxml" \
>openmrs-modules/idgen/trunk/api/src/main/resources/moduleApplicationContext.xml</a></li>
>
<li><a href="#openmrsmodulesidgentrunkapisrctestjavaorgopenmrsmoduleidgenintegrationRe \
moteWithLocalPoolIntegrationTestjava">openmrs-modules/idgen/trunk/api/src/test/java/or \
g/openmrs/module/idgen/integration/RemoteWithLocalPoolIntegrationTest.java</a></li> \
<li><a href="#openmrsmodulesidgentrunkapisrctestresourcesTestingApplicationContextxml" \
>openmrs-modules/idgen/trunk/api/src/test/resources/TestingApplicationContext.xml</a></li>
>
<li><a href="#openmrsmodulesidgentrunkapisrctestresourcesorgopenmrsmoduleidgenincludeT \
estDataxml">openmrs-modules/idgen/trunk/api/src/test/resources/org/openmrs/module/idgen/include/TestData.xml</a></li>
<li><a href="#openmrsmodulesidgentrunkomodsrcmainresourcessqldiffxml">openmrs-modules/idgen/trunk/omod/src/main/resources/sqldiff.xml</a></li>
<li><a href="#openmrsmodulesidgentrunkomodsrcmainwebappeditIdentifierSourcejsp">openmrs-modules/idgen/trunk/omod/src/main/webapp/editIdentifierSource.jsp</a></li>
<li><a href="#openmrsmodulesidgentrunkpomxml">openmrs-modules/idgen/trunk/pom.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmodulesidgentrunkapisrcmainjavaorgopenmrsmoduleidgenIdentifierPooljava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/IdentifierPool.java \
(29404 => 29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/IdentifierPool.java 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/IdentifierPool.java 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> private int minPoolSize = 500; // request more when we \
go below this number </span><span class="cx"> private boolean sequential = false;
</span><span class="cx"> private Set<PooledIdentifier> identifiers;
</span><del>-
</del><ins>+ private boolean refillWithScheduledTask = true; // if true, refill \
with a scheduled task, otherwise refill on demands for ids +
</ins><span class="cx"> //***** INSTANCE METHODS *****
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -157,4 +158,19 @@
</span><span class="cx"> public void setIdentifiers(Set<PooledIdentifier> \
identifiers) { </span><span class="cx"> this.identifiers = identifiers;
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @return the refillWithScheduledTask
+ */
+ public boolean isRefillWithScheduledTask() {
+ return refillWithScheduledTask;
+ }
+
+ /**
+ * @param refillWithScheduledTask the refillWithScheduledTask to set
+ */
+ public void setRefillWithScheduledTask(boolean refillWithScheduledTask) {
+ this.refillWithScheduledTask = refillWithScheduledTask;
+ }
+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrcmainjavaorgopenmrsmoduleidgenprocessorIdentifierPoolProcessorjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/processor/IdentifierPoolProcessor.java \
(29404 => 29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/processor/IdentifierPoolProcessor.java 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/main/java/org/openmrs/module/idgen/processor/IdentifierPoolProcessor.java 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -34,7 +34,9 @@
</span><span class="cx"> public synchronized List<String> \
getIdentifiers(IdentifierSource source, int batchSize) { </span><span class="cx"> \
IdentifierPool pool = (IdentifierPool) source; </span><span class="cx"> \
IdentifierSourceService iss = Context.getService(IdentifierSourceService.class); \
</span><del>- iss.checkAndRefillIdentifierPool(pool); </del><ins>+ if \
(!pool.isRefillWithScheduledTask()) { + iss.checkAndRefillIdentifierPool(pool);
+ }
</ins><span class="cx"> List<PooledIdentifier> available = \
iss.getAvailableIdentifiers(pool, batchSize); </span><span class="cx"> \
List<String> ret = new ArrayList<String>(); </span><span class="cx"> \
Date now = new Date(); </span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrcmainresourcesIdentifierSourcehbmxml"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/main/resources/IdentifierSource.hbm.xml (29404 => \
29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/main/resources/IdentifierSource.hbm.xml 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/main/resources/IdentifierSource.hbm.xml 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -44,7 +44,8 @@
</span><span class="cx"> <many-to-one name="source" \
class="IdentifierSource" lazy="false" /> </span><span \
class="cx"> <property name="batchSize" type="int" \
column="batch_size" /> </span><span class="cx"> <property \
name="minPoolSize" type="int" column="min_pool_size" \
/> </span><del>- <property name="sequential" \
type="java.lang.Boolean" length="1" \
not-null="true"/> </del><ins>+ <property \
name="refillWithScheduledTask" type="java.lang.Boolean" \
column="refill_with_scheduled_task" length="1" \
not-null="true"/> + <property name="sequential" \
type="java.lang.Boolean" length="1" \
not-null="true"/> </ins><span class="cx"> <set \
name="identifiers" lazy="true" \
cascade="all-delete-orphan" inverse="true" \
access="field"> </span><span class="cx"> <key \
column="pool_id" not-null="true" /> </span><span class="cx"> \
<one-to-many class="PooledIdentifier" /> </span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrcmainresourcesmessagesproperties"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/main/resources/messages.properties (29404 => \
29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/main/resources/messages.properties 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/main/resources/messages.properties 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -40,6 +40,9 @@
</span><span class="cx"> idgen.order = Order
</span><span class="cx"> idgen.random = Random
</span><span class="cx"> idgen.sequential = Sequential
</span><ins>+idgen.scheduledFill = When to fill
+idgen.scheduledFill.scheduled = Background task
+idgen.scheduledFill.onDemand = When you request an identifier
</ins><span class="cx"> idgen.autoGenerate = Generate
</span><span class="cx"> idgen.autoGenerateLabel = Will be Auto-Generated when saved
</span><span class="cx"> idgen.autoGenerationConfiguration = Auto-Generation \
Configuration </span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrcmainresourcesmoduleApplicationContextxml"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/main/resources/moduleApplicationContext.xml \
(29404 => 29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/main/resources/moduleApplicationContext.xml 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/main/resources/moduleApplicationContext.xml 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -1,9 +1,16 @@
</span><span class="cx"> <?xml version="1.0" \
encoding="UTF-8"?> </span><del>-<!DOCTYPE beans PUBLIC \
"-//SPRING//DTD BEAN//EN" \
"http://www.springframework.org/dtd/spring-beans.dtd"> </del><span \
class="cx"> </span><del>-<!-- Beans to add to the current Application context \
definition --> </del><ins>+<beans \
xmlns="http://www.springframework.org/schema/beans" + \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + \
xmlns:context="http://www.springframework.org/schema/context" + \
xmlns:util="http://www.springframework.org/schema/util" + \
xsi:schemaLocation="http://www.springframework.org/schema/beans + \
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + \
http://www.springframework.org/schema/context + \
http://www.springframework.org/schema/context/spring-context-2.5.xsd + \
http://www.springframework.org/schema/util + \
http://www.springframework.org/schema/util/spring-util-2.0.xsd"> </ins><span \
class="cx"> </span><del>-<beans>
</del><span class="cx"> <bean id="baseIdentifierSourceService" \
class="org.openmrs.module.idgen.service.BaseIdentifierSourceService"> \
</span><span class="cx"> <property name="dao"> </span><span \
class="cx"> <bean \
class="org.openmrs.module.idgen.service.db.HibernateIdentifierSourceDAO">
</span><span class="lines">@@ -68,4 +75,19 @@
</span><span class="cx"> </map>
</span><span class="cx"> </property>
</span><span class="cx"> </bean>
</span><ins>+
+ <bean id="idgenTimerFactory" \
class="org.springframework.scheduling.timer.TimerFactoryBean"> + \
<property name="scheduledTimerTasks"> + <list>
+ <bean id="refillIdentifierPools" \
class="org.springframework.scheduling.timer.ScheduledTimerTask"> + \
<property name="delay" value="10000" /> <!-- delay 10 \
seconds --> + <property name="period" \
value="300000" /> <!-- run every 5 minutes --> + \
<property name="timerTask"> + <bean \
class="org.openmrs.module.idgen.task.RefillIdentifierPoolsTask"/> + \
</property> + </bean>
+ </list>
+ </property>
+ </bean>
+
</ins><span class="cx"> </beans>
</span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrctestjavaorgopenmrsmoduleidgenintegrationRemoteWithLocalPoolIntegrationTestjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/test/java/org/openmrs/module/idgen/integration/RemoteWithLocalPoolIntegrationTest.java \
(29404 => 29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/test/java/org/openmrs/module/idgen/integration/RemoteWithLocalPoolIntegrationTest.java 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/test/java/org/openmrs/module/idgen/integration/RemoteWithLocalPoolIntegrationTest.java 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> pool.setMinPoolSize(4);
</span><span class="cx"> pool.setBatchSize(3);
</span><span class="cx"> pool.setSequential(true);
</span><ins>+ pool.setRefillWithScheduledTask(false);
</ins><span class="cx"> service.saveIdentifierSource(pool);
</span><span class="cx">
</span><span class="cx"> // set up auto generation from the local pool (not the \
remote source) </span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrctestresourcesTestingApplicationContextxml"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/test/resources/TestingApplicationContext.xml \
(29404 => 29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/test/resources/TestingApplicationContext.xml 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/test/resources/TestingApplicationContext.xml 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -25,5 +25,19 @@
</span><span class="cx"> </property>
</span><span class="cx"> <!-- default properties must be set in the \
hibernate.default.properties --> </span><span class="cx"> </bean>
</span><ins>+
+ <bean id="idgenTestTimerFactory" \
class="org.springframework.scheduling.timer.TimerFactoryBean"> + \
<property name="scheduledTimerTasks"> + <list>
+ <bean id="refillIdentifierPools" \
class="org.springframework.scheduling.timer.ScheduledTimerTask"> + \
<property name="delay" value="5000" /> + \
<property name="period" value="5000" /> + \
<property name="timerTask"> + <bean \
class="org.openmrs.module.idgen.task.TestTask"/> + \
</property> + </bean>
+ </list>
+ </property>
+ </bean>
</ins><span class="cx">
</span><span class="cx"> </beans>
</span></span></pre></div>
<a id="openmrsmodulesidgentrunkapisrctestresourcesorgopenmrsmoduleidgenincludeTestDataxml"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/api/src/test/resources/org/openmrs/module/idgen/include/TestData.xml \
(29404 => 29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/api/src/test/resources/org/openmrs/module/idgen/include/TestData.xml 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/api/src/test/resources/org/openmrs/module/idgen/include/TestData.xml 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> <IDGEN_REMOTE_SOURCE ID="2" \
URL="http://localhost:8080/openmrs/module/idgen/getIdentifier"/> \
</span><span class="cx"> </span><del>- <IDGEN_ID_POOL ID="3" \
SOURCE="1" BATCH_SIZE="1000" MIN_POOL_SIZE="100" \
sequential="1"/> </del><ins>+ <IDGEN_ID_POOL ID="3" \
SOURCE="1" BATCH_SIZE="1000" MIN_POOL_SIZE="100" \
sequential="1" refill_with_scheduled_task="0"/> </ins><span \
class="cx"> </span><span class="cx"> <IDGEN_POOLED_IDENTIFIER ID="1" \
POOL_ID="3" IDENTIFIER="00001" \
UUID="1d47284f-9e9b-4a81-a88b-8bb42bc0a901"/> </span><span class="cx"> \
<IDGEN_POOLED_IDENTIFIER ID="2" POOL_ID="3" \
IDENTIFIER="00002" \
UUID="2d47284f-9e9b-4a81-a88b-8bb42bc0a901"/> </span></span></pre></div>
<a id="openmrsmodulesidgentrunkomodsrcmainresourcessqldiffxml"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/omod/src/main/resources/sqldiff.xml (29404 => 29405)</h4> \
<pre class="diff"><span> <span class="info">--- \
openmrs-modules/idgen/trunk/omod/src/main/resources/sqldiff.xml 2012-09-27 14:54:42 \
UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/omod/src/main/resources/sqldiff.xml 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -122,9 +122,9 @@
</span><span class="cx"> <diff>
</span><span class="cx"> <version>2.0</version>
</span><span class="cx"> <author>Partners In Health</author>
</span><del>- <date>28 June 2010</date>
</del><ins>+ <date>27 Sept 2012</date>
</ins><span class="cx"> <description>
</span><del>- Add table for reserved identifiers
</del><ins>+ Add column for pools to indicate whether they're scheduled or not
</ins><span class="cx"> </description>
</span><span class="cx"> <sql>
</span><span class="cx"> CREATE TABLE `idgen_reserved_identifier` (
</span><span class="lines">@@ -138,4 +138,16 @@
</span><span class="cx"> ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
</span><span class="cx"> </sql>
</span><span class="cx"> </diff>
</span><ins>+
+ <diff>
+ <version>2.4</version>
+ <author>Partners In Health</author>
+ <date>28 June 2010</date>
+ <description>
+ Add table for reserved identifiers
+ </description>
+ <sql>
+ ALTER TABLE `idgen_id_pool` ADD COLUMN `refill_with_scheduled_task` \
tinyint(1) NOT NULL default 1; + </sql>
+ </diff>
</ins><span class="cx"> </sqldiff>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="openmrsmodulesidgentrunkomodsrcmainwebappeditIdentifierSourcejsp"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/idgen/trunk/omod/src/main/webapp/editIdentifierSource.jsp (29404 => \
29405)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/idgen/trunk/omod/src/main/webapp/editIdentifierSource.jsp 2012-09-27 \
14:54:42 UTC (rev 29404)
+++ openmrs-modules/idgen/trunk/omod/src/main/webapp/editIdentifierSource.jsp 2012-09-27 \
17:29:19 UTC (rev 29405) </span><span class="lines">@@ -137,7 +137,14 @@
</span><span class="cx"> <frm:radiobutton path="sequential" \
value="${true}" /> <spring:message code="idgen.sequential" \
/> </span><span class="cx"> <frm:errors path="sequential" \
cssClass="error" /></td> </span><span class="cx"> </tr>
</span><del>- <tr>
</del><ins>+ <tr>
+ <th align="right"><spring:message \
code="idgen.scheduledFill" />:</th> + <td>
+ <frm:radiobutton path="refillWithScheduledTask" \
value="${true}" /> <spring:message \
code="idgen.scheduledFill.scheduled" /> + \
<frm:radiobutton path="refillWithScheduledTask" \
value="${false}" /> <spring:message \
code="idgen.scheduledFill.onDemand" /> + \
<frm:errors path="refillWithScheduledTask" cssClass="error" \
/></td> + </tr>
+ <tr>
</ins><span class="cx"> <th align="right"><spring:message \
code="idgen.batchSize" />:</th> </span><span class="cx"> \
<td><frm:input path="batchSize" size="50" \
/><frm:errors path="batchSize" cssClass="error" \
/></td> </span><span class="cx"> </tr>
</span></span></pre></div>
<a id="openmrsmodulesidgentrunkpomxml"></a>
<div class="modfile"><h4>Modified: openmrs-modules/idgen/trunk/pom.xml (29404 => \
29405)</h4> <pre class="diff"><span>
<span class="info">--- openmrs-modules/idgen/trunk/pom.xml 2012-09-27 14:54:42 UTC \
(rev 29404)
+++ openmrs-modules/idgen/trunk/pom.xml 2012-09-27 17:29:19 UTC (rev 29405)
</span><span class="lines">@@ -59,6 +59,13 @@
</span><span class="cx"> <type>pom</type>
</span><span class="cx"> <scope>test</scope>
</span><span class="cx"> </dependency>
</span><ins>+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.0</version>
+ <scope>test</scope>
+ </dependency>
</ins><span class="cx"> </dependencies>
</span><span class="cx">
</span><span class="cx"> <properties>
</span></span></pre>
</div>
</div>
</body>
</html>
<p></p>
-- OpenMRS Subversion Commits: <a \
href="http://go.openmrs.org/svn">http://go.openmrs.org/svn</a><br /> Posting is not \
allowed - please join dev@openmrs.org for discussion.<br />
Unsubscribe: svn+unsubscribe@openmrs.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic