From agila-commits-return-57-apmail-incubator-agila-commits-archive=www.apache.org@incubator.apache.org Sun Aug 14 11:34:04 2005 Return-Path: Delivered-To: apmail-incubator-agila-commits-archive@www.apache.org Received: (qmail 98850 invoked from network); 14 Aug 2005 11:34:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Aug 2005 11:34:04 -0000 Received: (qmail 89534 invoked by uid 500); 14 Aug 2005 11:34:04 -0000 Mailing-List: contact agila-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: agila-dev@incubator.apache.org Delivered-To: mailing list agila-commits@incubator.apache.org Received: (qmail 89521 invoked by uid 99); 14 Aug 2005 11:34:03 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 14 Aug 2005 04:34:03 -0700 Received: (qmail 98845 invoked by uid 65534); 14 Aug 2005 11:34:03 -0000 Message-ID: <20050814113403.98844.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r232597 - in /incubator/agila/trunk/modules/bpm/src: java/org/apache/agila/impl/dao/ java/org/apache/agila/impl/memory/ java/org/apache/agila/impl/servlet/ java/org/apache/agila/impl/web/ java/org/apache/agila/services/ java/org/apache/agil... Date: Sun, 14 Aug 2005 11:34:00 -0000 To: agila-commits@incubator.apache.org From: clim@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: clim Date: Sun Aug 14 04:33:39 2005 New Revision: 232597 URL: http://svn.apache.org/viewcvs?rev=232597&view=rev Log: Refactored method naming from listInstanceInfo() to getInstanceInfos(). Suggested by James Strachan 11/9/2004. Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/AgilaDAO.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/InstanceServiceImpl.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/memory/InstanceServiceImpl.java incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/servlet/AgilaServlet.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/web/AgilaServlet.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/AbstractInstanceService.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/InstanceService.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/util/JDBCUtil.java (contents, props changed) incubator/agila/trunk/modules/bpm/src/test/org/apache/agila/impl/dao/DAOTestCaseSupport.java Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/AgilaDAO.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/AgilaDAO.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/AgilaDAO.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/AgilaDAO.java Sun Aug 14 04:33:39 2005 @@ -37,7 +37,7 @@ * A simple Data Access Object interface to make it easy to plug in alternative presistence mechanisms. * * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Id$ */ public interface AgilaDAO { @@ -60,7 +60,7 @@ Instance getInstanceByID(InstanceID id); - List listInstanceInfo(); + List getInstanceInfos(); InstanceServiceInfo getInstanceServiceInfo(); Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/AgilaDAO.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/InstanceServiceImpl.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/InstanceServiceImpl.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/InstanceServiceImpl.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/InstanceServiceImpl.java Sun Aug 14 04:33:39 2005 @@ -21,8 +21,6 @@ import org.apache.agila.engine.InstanceID; import org.apache.agila.model.BusinessProcessID; -import org.apache.agila.util.JDBCUtil; - import java.util.Map; import java.util.List; @@ -31,7 +29,7 @@ * persistence methods. * * @author James Strachan - * @version $Id: $ + * @version $Id$ */ public class InstanceServiceImpl extends AbstractInstanceService { @@ -82,9 +80,9 @@ * Returns all instances from the persistence store * @return */ - protected List internalListInstanceInfo() { + protected List internalGetInstanceInfos() { - return dao.listInstanceInfo(); + return dao.getInstanceInfos(); } Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/dao/InstanceServiceImpl.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/memory/InstanceServiceImpl.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/memory/InstanceServiceImpl.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/memory/InstanceServiceImpl.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/memory/InstanceServiceImpl.java Sun Aug 14 04:33:39 2005 @@ -35,7 +35,7 @@ * work. Implementations just need to implement the persistence part. * * * @author Geir Magnusson Jr. - * @version $Id: $ + * @version $Id$ */ public class InstanceServiceImpl extends AbstractInstanceService { @@ -86,7 +86,7 @@ * Returns all instances from the persistence store * @return */ - protected List internalListInstanceInfo() { + protected List internalGetInstanceInfos() { List data = new ArrayList(); @@ -152,4 +152,4 @@ public void resume(InstanceID id) { ((Instance)hm.get( id )).setStatus( Instance.STATUS_RUNNING ); } -} \ No newline at end of file +} Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/servlet/AgilaServlet.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/servlet/AgilaServlet.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/servlet/AgilaServlet.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/servlet/AgilaServlet.java Sun Aug 14 04:33:39 2005 @@ -47,7 +47,7 @@ * deprecated at this point. Use the one in the web package. * * @author Geir Magnusson Jr. - * @version $Id: $ + * @version $Id$ */ public class AgilaServlet extends VelocityActionServlet { @@ -168,7 +168,7 @@ public void show_instance_list(HttpServletRequest req, HttpServletResponse res, VelocityContext ctx) throws ServletException, IOException { - List l = eiSvc.listInstanceInfo(); + List l = eiSvc.getInstanceInfos(); ctx.put("list", l); ctx.put("tokenService", tokenService); Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/servlet/AgilaServlet.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/web/AgilaServlet.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/web/AgilaServlet.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/web/AgilaServlet.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/web/AgilaServlet.java Sun Aug 14 04:33:39 2005 @@ -63,6 +63,9 @@ import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; +/** + * $Id$ + */ public class AgilaServlet extends ActionServlet implements LogService { public static final String HTTP_ACTION_VERB = "action"; @@ -251,7 +254,7 @@ public void show_instance_list( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException { - List l = eiSvc.listInstanceInfo(); + List l = eiSvc.getInstanceInfos(); request.setAttribute( "list", l ); request.setAttribute( "tokenService", tokenService ); @@ -432,7 +435,7 @@ InstanceID instanceID = new InstanceID( Integer.parseInt( request.getParameter( "instanceid" ) ) ); engine.stop( instanceID ); - List l = eiSvc.listInstanceInfo(); + List l = eiSvc.getInstanceInfos(); request.setAttribute( "list", l ); request.setAttribute( "tokenService", tokenService ); @@ -464,7 +467,7 @@ InstanceID instanceID = new InstanceID( Integer.parseInt( request.getParameter( "instanceid" ) ) ); engine.suspend( instanceID ); - List l = eiSvc.listInstanceInfo(); + List l = eiSvc.getInstanceInfos(); request.setAttribute( "list", l ); request.setAttribute( "tokenService", tokenService ); @@ -485,7 +488,7 @@ InstanceID instanceID = new InstanceID( Integer.parseInt( request.getParameter( "instanceid" ) ) ); engine.resume( instanceID ); - List l = eiSvc.listInstanceInfo(); + List l = eiSvc.getInstanceInfos(); request.setAttribute( "list", l ); request.setAttribute( "tokenService", tokenService ); Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/impl/web/AgilaServlet.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/AbstractInstanceService.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/AbstractInstanceService.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/AbstractInstanceService.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/AbstractInstanceService.java Sun Aug 14 04:33:39 2005 @@ -34,7 +34,7 @@ /** * * @author Geir Magnusson Jr. - * @version $Id: $ + * @version $Id$ */ public abstract class AbstractInstanceService implements InstanceService { @@ -125,9 +125,9 @@ * TODO - scrap this. Imagine 1,000,000 instances.... * @return */ - public List listInstanceInfo() { + public List getInstanceInfos() { - List l= internalListInstanceInfo(); + List l= internalGetInstanceInfos(); if( l != null ) { /* @@ -214,7 +214,7 @@ * * @return List with 0 or more instances */ - protected abstract List internalListInstanceInfo(); + protected abstract List internalGetInstanceInfos(); protected abstract InstanceServiceInfo internalInstanceServiceInfo(); } Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/AbstractInstanceService.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/InstanceService.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/InstanceService.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/InstanceService.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/InstanceService.java Sun Aug 14 04:33:39 2005 @@ -27,7 +27,7 @@ * Manages the instances of executing business processes * * * @author Geir Magnusson Jr. - * @version $Id: $ + * @version $Id$ */ public interface InstanceService { @@ -72,10 +72,10 @@ * * @return */ - List listInstanceInfo(); + List getInstanceInfos(); InstanceServiceInfo getInstanceServiceInfo(); void registerListener(InstanceLifecycleListener listener); void deRegisterListener(InstanceLifecycleListener listener); -} \ No newline at end of file +} Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/services/InstanceService.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/util/JDBCUtil.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/util/JDBCUtil.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/util/JDBCUtil.java (original) +++ incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/util/JDBCUtil.java Sun Aug 14 04:33:39 2005 @@ -65,6 +65,8 @@ * * TODO maybe creating a session factory is a cool todo so that system will * be abstracted how the persistence layer is done (JDO, O/R, JDBC) + * + * $Id$ */ public class JDBCUtil implements AgilaDAO { @@ -487,7 +489,7 @@ return retVal; } - public List listInstanceInfo() { + public List getInstanceInfos() { List retVal = null; Connection connection = null; Propchange: incubator/agila/trunk/modules/bpm/src/java/org/apache/agila/util/JDBCUtil.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/agila/trunk/modules/bpm/src/test/org/apache/agila/impl/dao/DAOTestCaseSupport.java URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpm/src/test/org/apache/agila/impl/dao/DAOTestCaseSupport.java?rev=232597&r1=232596&r2=232597&view=diff ============================================================================== --- incubator/agila/trunk/modules/bpm/src/test/org/apache/agila/impl/dao/DAOTestCaseSupport.java (original) +++ incubator/agila/trunk/modules/bpm/src/test/org/apache/agila/impl/dao/DAOTestCaseSupport.java Sun Aug 14 04:33:39 2005 @@ -156,7 +156,7 @@ } public void testListInstanceInfo() { - List instances = dao.listInstanceInfo(); + List instances = dao.getInstanceInfos(); assertNotNull( "instances should not be null", instances ); }