Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Changeset 5134

Show
Ignore:
Timestamp:
08/02/08 08:24:09 (5 months ago)
Author:
r0bby
Message:

trunk: small change to probe the environmental variable rather than hard coding a value for the tomcat and catalina home. This is a small enough change that shouldn't have any consequences, so I'm just going to commit this. Apologies for reformatting; the only changes occured with regards to lines 11 and 12.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/trunk/properties.xml

    r4158 r5134  
    22<project name="properties"> 
    33 
    4        <!--  Webapp properties --> 
    5        <property name="webapp.name" value="openmrs" /> 
    6        <property name="webapp.version" value="${openmrs.version}" /> 
    7        <property name="webapp.display.name" value="OpenMRS" /> 
    8        <property name="webapp.description" value="An Open-Source EMR System" /> 
     4    <!--  Webapp properties --> 
     5    <property name="webapp.name" value="openmrs"/> 
     6    <property name="webapp.version" value="${openmrs.version}"/> 
     7    <property name="webapp.display.name" value="OpenMRS"/> 
     8    <property name="webapp.description" value="An Open-Source EMR System"/> 
    99 
    10        <!-- Properties for running unit tests and webapp [un]deploy with tomcat --> 
    11     <property name="tomcat.home" value="C:/Program Files/Apache Software Foundation/Tomcat 5.5"/> 
    12     <property name="catalina.home" value="C:/Program Files/Apache Software Foundation/Tomcat 5.5"/> 
    13     <property name="tomcat.server" value="localhost" /> 
    14        <property name="tomcat.port" value="8080" /> 
    15     <property name="tomcat.manager.url" value="http://${tomcat.server}:${tomcat.port}/manager" /> 
    16     <property name="tomcat.username" value="test" /> 
    17     <property name="tomcat.password" value="test" /> 
    18      
     10    <!-- Properties for running unit tests and webapp [un]deploy with tomcat --> 
     11    <property name="tomcat.home" value="${env.CATALINA_HOME}"/> 
     12    <property name="catalina.home" value="${env.CATALINA_HO ME}"/> 
     13    <property name="tomcat.server" value="localhost"/> 
     14    <property name="tomcat.port" value="8080"/> 
     15    <property name="tomcat.manager.url" value="http://${tomcat.server}:${tomcat.port}/manager"/> 
     16    <property name="tomcat.username" value="test"/> 
     17    <property name="tomcat.password" value="test"/> 
     18 
    1919    <!-- Documentation settings --> 
    20     <property name="doc.title" value="${ant.project.name} API" /> 
    21     <property name="doc.bottom" value="&lt;em&gt;&lt;small&gt;Generated ${timestamp}. NOTE - these libraries are in active development and subject to change&lt;/small&gt;&lt;/em&gt;" /> 
    22     <property name="doc.header" value="&lt;a href=&quot;http://www.openmrs.org&quot; target=_top&gt;&lt;img src=&quot;/doc/openmrs-logo-small.gif&quot; border=0/&gt;&lt;/a&gt;" /> 
    23     <property name="doc.footer" value="&lt;a href=&quot;http://www.openmrs.org&quot; target=_top&gt;${ant.project.name}&lt;/a&gt;" /> 
    24          
     20    <property name="doc.title" value="${ant.project.name} API"/> 
     21    <property name="doc.bottom" 
     22              value="&lt;em&gt;&lt;small&gt;Generated ${timestamp}. NOTE - these libraries are in active development and subject to change&lt;/small&gt;&lt;/em&gt;"/> 
     23    <property name="doc.header" 
     24              value="&lt;a href=&quot;http://www.openmrs.org&quot; target=_top&gt;&lt;img src=&quot;/doc/openmrs-logo-small.gif&quot; border=0/&gt;&lt;/a&gt;"/> 
     25    <property name="doc.footer" 
     26              value="&lt;a href=&quot;http://www.openmrs.org&quot; target=_top&gt;${ant.project.name}&lt;/a&gt;"/> 
     27 
    2528    <!-- =================================================================== --> 
    2629    <!-- Classpaths                                                          --> 
    2730    <!-- =================================================================== --> 
    28     
     31 
    2932    <!-- Hibernate --> 
    3033    <path id="hibernate.classpath"> 
    31        <fileset dir="${cglib.dir}" includes="*.jar" /> 
    32                <fileset dir="${commons-beanutils.dir}" includes="*.jar" /> 
    33                <fileset dir="${commons-collections.dir}" includes="*.jar" /> 
    34         <fileset dir="${commons-lang.dir}" includes="*.jar" /> 
    35         <fileset dir="${commons-logging.dir}" includes="*.jar" /> 
    36                <fileset dir="${database.dir}" includes="*.jar" /> 
    37                <fileset dir="${dom4j.dir}" includes="*.jar" /> 
    38         <fileset dir="${hibernate.dir}" includes="*.jar" /> 
    39         <fileset dir="${jta.dir}" includes="*.jar" /> 
    40         <pathelement location="${build.dir}/api" /> 
     34        <fileset dir="${cglib.dir}" includes="*.jar"/> 
     35        <fileset dir="${commons-beanutils.dir}" includes="*.jar"/> 
     36        <fileset dir="${commons-collections.dir}" includes="*.jar"/> 
     37        <fileset dir="${commons-lang.dir}" includes="*.jar"/> 
     38        <fileset dir="${commons-logging.dir}" includes="*.jar"/> 
     39        <fileset dir="${database.dir}" includes="*.jar"/> 
     40        <fileset dir="${dom4j.dir}" includes="*.jar"/> 
     41        <fileset dir="${hibernate.dir}" includes="*.jar"/> 
     42        <fileset dir="${jta.dir}" includes="*.jar"/> 
     43        <pathelement location="${build.dir}/api"/> 
    4144    </path> 
    42      
     45 
    4346    <!-- API --> 
    4447    <path id="api.compile.classpath"> 
    45                <!--<fileset dir="${activemq.dir}" includes="*.jar" />--> 
    46                <fileset dir="${antlr.dir}" includes="*.jar" /> 
    47                <fileset dir="${commons-io.dir}" includes="*.jar" /> 
    48                <fileset dir="${commons-logging.dir}" includes="*.jar" /> 
    49        <fileset dir="${commons-collections.dir}" includes="*.jar" /> 
    50                <fileset dir="${dom4j.dir}" includes="*.jar" /> 
    51                <fileset dir="${hibernate.dir}" includes="*.jar" /> 
    52        <fileset dir="${hl7api.dir}" includes="*.jar" /> 
    53        <fileset dir="${jfreechart.dir}" includes="*.jar" /> 
    54                <fileset dir="${junit.dir}" includes="*.jar" /> 
    55                <fileset dir="${log4j.dir}" includes="*.jar" /> 
    56                <fileset dir="${mail.dir}" includes="*.jar" /> 
    57                <!--<fileset dir="${quartz.dir}" includes="*.jar" />--> 
    58        <fileset dir="${simple.dir}" includes="*.jar" /> 
    59                <fileset dir="${spring.dir}" includes="*.jar" /> 
    60                <fileset dir="${velocity.dir}" includes="*.jar" /> 
    61        <fileset dir="${xerces.dir}" includes="*.jar" /> 
    62        <fileset dir="${xstream.dir}" includes="*.jar" /> 
     48        <!--<fileset dir="${activemq.dir}" includes="*.jar" />--> 
     49        <fileset dir="${antlr.dir}" includes="*.jar"/> 
     50        <fileset dir="${commons-io.dir}" includes="*.jar"/> 
     51        <fileset dir="${commons-logging.dir}" includes="*.jar"/> 
     52        <fileset dir="${commons-collections.dir}" includes="*.jar"/> 
     53        <fileset dir="${dom4j.dir}" includes="*.jar"/> 
     54        <fileset dir="${hibernate.dir}" includes="*.jar"/> 
     55        <fileset dir="${hl7api.dir}" includes="*.jar"/> 
     56        <fileset dir="${jfreechart.dir}" includes="*.jar"/> 
     57        <fileset dir="${junit.dir}" includes="*.jar"/> 
     58        <fileset dir="${log4j.dir}" includes="*.jar"/> 
     59        <fileset dir="${mail.dir}" includes="*.jar"/> 
     60        <!--<fileset dir="${quartz.dir}" includes="*.jar" />--> 
     61        <fileset dir="${simple.dir}" includes="*.jar"/> 
     62        <fileset dir="${spring.dir}" includes="*.jar"/> 
     63        <fileset dir="${velocity.dir}" includes="*.jar"/> 
     64        <fileset dir="${xerces.dir}" includes="*.jar"/> 
     65        <fileset dir="${xstream.dir}" includes="*.jar"/> 
    6366    </path> 
    6467    <path id="api.test.classpath"> 
    6568        <path refid="api.compile.classpath"/> 
    66         <fileset dir="${dist.dir}" includes="*.jar" /> 
    67                <fileset dir="${junit.dir}" includes="*.jar" /> 
    68                <fileset dir="${test.dir}/api" includes="**/*.java" /> 
    69                <fileset dir="${tomcat.dir}" includes="*.jar" /> 
     69        <fileset dir="${dist.dir}" includes="*.jar"/> 
     70        <fileset dir="${junit.dir}" includes="*.jar"/> 
     71        <fileset dir="${test.dir}/api" includes="**/*.java"/> 
     72        <fileset dir="${tomcat.dir}" includes="*.jar"/> 
    7073    </path> 
    71          
     74 
    7275    <!-- Web --> 
    7376    <path id="web.compile.classpath"> 
    74                <pathelement location="${dist.dir}/openmrs-api-${openmrs.version}.jar" /> 
    75                <fileset dir="${commons-io.dir}" includes="*.jar" /> 
    76                <fileset dir="${commons-logging.dir}" includes="*.jar" /> 
    77                <fileset dir="${commons-lang.dir}" includes="*.jar" /> 
    78                <fileset dir="${commons-beanutils.dir}" includes="*.jar" /> 
    79                <fileset dir="${commons-collections.dir}" includes="*.jar" /> 
    80                <fileset dir="${dwr.dir}" includes="*.jar" /> 
    81                <fileset dir="${hibernate.dir}" includes="*.jar" /> 
    82        <fileset dir="${hl7api.dir}" includes="*.jar" /> 
    83        <fileset dir="${jfreechart.dir}" includes="*.jar" /> 
    84                <fileset dir="${jstl.dir}" includes="*.jar" /> 
    85                <fileset dir="${log4j.dir}" includes="*.jar" /> 
    86                <fileset dir="${neal-reporting.dir}" includes="*.jar" /> 
    87        <fileset dir="${log4j.dir}" includes="*.jar" /> 
    88                <fileset dir="${simple.dir}" includes="*.jar" /> 
    89                <fileset dir="${spring.dir}" includes="*.jar" /> 
    90                <fileset dir="${stax.dir}" includes="*.jar" /> 
    91                <fileset dir="${taglibs.dir}" includes="*.jar" /> 
    92                <fileset dir="${tomcat.dir}" includes="*.jar" /> 
    93                <fileset dir="${velocity.dir}" includes="*.jar" /> 
    94        <fileset dir="${xerces.dir}" includes="*.jar" /> 
    95        <fileset dir="${xstream.dir}" includes="*.jar" /> 
     77        <pathelement location="${dist.dir}/openmrs-api-${openmrs.version}.jar"/> 
     78        <fileset dir="${commons-io.dir}" includes="*.jar"/> 
     79        <fileset dir="${commons-logging.dir}" includes="*.jar"/> 
     80        <fileset dir="${commons-lang.dir}" includes="*.jar"/> 
     81        <fileset dir="${commons-beanutils.dir}" includes="*.jar"/> 
     82        <fileset dir="${commons-collections.dir}" includes="*.jar"/> 
     83        <fileset dir="${dwr.dir}" includes="*.jar"/> 
     84        <fileset dir="${hibernate.dir}" includes="*.jar"/> 
     85        <fileset dir="${hl7api.dir}" includes="*.jar"/> 
     86        <fileset dir="${jfreechart.dir}" includes="*.jar"/> 
     87        <fileset dir="${jstl.dir}" includes="*.jar"/> 
     88        <fileset dir="${log4j.dir}" includes="*.jar"/> 
     89        <fileset dir="${neal-reporting.dir}" includes="*.jar"/> 
     90        <fileset dir="${log4j.dir}" includes="*.jar"/> 
     91        <fileset dir="${simple.dir}" includes="*.jar"/> 
     92        <fileset dir="${spring.dir}" includes="*.jar"/> 
     93        <fileset dir="${stax.dir}" includes="*.jar"/> 
     94        <fileset dir="${taglibs.dir}" includes="*.jar"/> 
     95        <fileset dir="${tomcat.dir}" includes="*.jar"/> 
     96        <fileset dir="${velocity.dir}" includes="*.jar"/> 
     97        <fileset dir="${xerces.dir}" includes="*.jar"/> 
     98        <fileset dir="${xstream.dir}" includes="*.jar"/> 
    9699    </path> 
    97100