Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Changeset 5013

Show
Ignore:
Timestamp:
07/22/08 18:38:16 (6 months ago)
Author:
bmckown
Message:

form2program: updating lib-common files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs-modules/form2program

    • Property svn:ignore changed from
      dist
      to
      nbproject
      dist

  • openmrs-modules/form2program/.classpath

    r3441 r5013  
    44        <classpathentry kind="src" path="web/src"/> 
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    6         <classpathentry kind="lib" path="lib-common/openmrs-api-1.2.0.3440.jar" /> 
    7         <classpathentry kind="lib" path="lib-common/tests-openmrs-api-1.2.0.3440.jar"/> 
    8         <classpathentry kind="lib" path="lib-common/web-openmrs-api-1.2.0.3440.jar"/> 
    9         <classpathentry kind="lib" path="lib-common/commons-logging-1.0.4.jar"/> 
    10         <classpathentry kind="lib" path="lib-common/spring-2.0.jar"/> 
    11         <classpathentry kind="lib" path="lib-common/hibernate3.jar"/> 
     6        <classpathentry kind="lib" path="lib-common/openmrs-api-1.3.0.13.4955.jar" /> 
     7        <classpathentry kind="lib" path="lib-common/tests-openmrs-api-1.3.0.13.4955.jar"/> 
     8        <classpathentry kind="lib" path="lib-common/web-openmrs-api-1.3.0.13.4955.jar"/> 
     9        <classpathentry kind="lib" path="lib-common/commons-logging-1.1.1.jar"/> 
     10        <classpathentry kind="lib" path="lib-common/spring-2.5.1.jar"/> 
     11        <classpathentry kind="lib" path="lib-common/spring-webmvc.jar"/> 
     12        <classpathentry kind="lib" path="lib-common/hibernate325.jar"/> 
    1213        <classpathentry kind="lib" path="lib-common/servlet-api.jar"/> 
    1314        <classpathentry kind="lib" path="lib-common/commons-io-1.1.jar"/> 

  • openmrs-modules/form2program/build.xml

    r2888 r5013  
    3636                                <include name="**/*.jar"/> 
    3737                        </fileset> 
    38                         <fileset dir="../openmrs-alpha/lib"> 
     38<!-- 
     39            <fileset dir="../openmrs-alpha/lib"> 
    3940                                <include name="**/*.jar"/> 
    4041                        </fileset> 
    41                 </path> 
     42--> 
     43        </path> 
    4244 
    4345        </target> 

  • openmrs-modules/form2program/test/org/openmrs/module/form2program/test/Form2ProgramServiceTest.java

    r2306 r5013  
    77import org.apache.commons.logging.Log; 
    88import org.apache.commons.logging.LogFactory; 
    9 import org.openmrs.BaseTest; 
    109import org.openmrs.EncounterType; 
    1110import org.openmrs.Program; 
    …… 
    1413import org.openmrs.module.form2program.Form2ProgramMap; 
    1514import org.openmrs.module.form2program.Form2ProgramService; 
     15import org.openmrs.test.BaseModuleContextSensitiveTest; 
    1616 
    17 public class Form2ProgramServiceTest extends BaseTest { 
     17/** 
     18 * TODO: This test case needs updated to openmrs 1.3.0 code. 
     19 * 
     20 * @author bmckown 
     21 */ 
     22public class Form2ProgramServiceTest extends BaseModuleContextSensitiveTest { 
    1823         
    19         private Log log = LogFactory.getLog(getClass()); 
     24        //private Log log = LogFactory.getLog( ); 
    2025 
    21         @Override 
     26        //@Override 
    2227        protected void onSetUpBeforeTransaction() throws Exception { 
    23           super.onSetUpBeforeTransaction(); 
     28          //super.onSetUpBeforeTransaction(); 
     29       
    2430          authenticate(); 
    2531        } 
    …… 
    3036        public void testForm2ProgramService() throws Exception { 
    3137                 
    32                 startup(); 
     38                //startup(); 
    3339                authenticate(); 
    3440 
    …… 
    6268                } 
    6369                 
    64                 shutdown(); 
     70                //shutdown(); 
    6571        } 
    6672         

  • openmrs-modules/form2program/web/src/org/openmrs/module/form2program/web/controller/Form2ProgramConditionFormController.java

    r2907 r5013  
    181181                 
    182182                map.put("programMap", programMap); 
    183                 map.put("datatypes", (List<ConceptDatatype>)getConceptService().getConceptDatatypes()); 
     183                //map.put("datatypes", (List<ConceptDatatype>)getConceptService().getConceptDatatypes()); 
    184184                 
    185185                return map;