OpenMRS

Timestamp:

08/28/08 16:57:35 (3 months ago)

Author:

tmdugan

Message:

-- openmrs logic-api-refactoring

* continuation of previous commit

Files:

• openmrs/branches/logic-api-refactoring/.project (modified) (1 diff)
• openmrs/branches/logic-api-refactoring/build.xml (modified) (9 diffs)

openmrs/branches/logic-api-refactoring/.project

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-
+-trunk
-        <comment></comment>
-        <projects>

openmrs/branches/logic-api-refactoring/build.xml

@@ -93 +93 @@
-                        regexp="${openmrs.database.version.expected.regexp}"
-                        select="\1"
-
+0
-                        casesensitive="false" />
-                <propertyregex property="openmrs.database.version.expected.short"
@@ -99 +99 @@
-                        regexp="${openmrs.version.major}\.${openmrs.version.minor}\.${openmrs.version.maintenance}\.([0-9][0-9]+)"
-                        select="\1"
-Invalid Database Version
+00
-                
-                <loadfile srcfile="${openmrs.version.revision.filename}" property="repositoryFileInput" />
@@ -113 +113 @@
-                        </then>
-                        <else>
-4
+11
-                                <propertyregex property="openmrs.version.revision"
-                                        input="${repositoryFileInput}"
-
-4
+\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)\n
+11
-                                        defaultValue="? (error in post-1.4 revision regexp)" />                         
-                        </else>
@@ -219 +219 @@
-                
-                <!-- move files over that are required for modules to use this test-openmrs-api*.jar file -->
-" file="${test.dir}/api/org/openmrs/test
+/testutil" file="${test.dir}/api/org/openmrs/test/testutil
-                <copy todir="${build.dir}/org/openmrs/test/include" file="${test.dir}/api/org/openmrs/test/include/initialInMemoryTestDataSet.xml" />
+                
+                <!-- copy the extra files to the build dir in case an ant-clean was just done -->
+                <copy todir="${build.dir}">
+                        <!-- dbunit files for db and api tests -->
+                        <fileset dir="${test.dir}/api" includes="**/*.xml"/>
+                        <!-- module files for module tests -->
+                        <fileset dir="${test.dir}/api" includes="**/*.omod"/>
+                </copy>
-                
-        </target>
@@ -233 +241 @@
-                                <exclude name="**/web/test/*.class" />
-                                <include name="**/test/*.class" />
-                                <include name="org/openmrs/test/TestingApplicationContext.xml" />
-                                <include name="org/openmrs/test/include/initialInMemoryTestDataSet.xml" />
-                        </fileset>
+                        <!-- Put this xml in a separate fileset so that its in the root of the jar file -->
+                        <fileset file="${build.dir}/org/openmrs/test/testutil/TestingApplicationContext.xml" />
-                </jar>
-        </target>
@@ -278 +287 @@
-                                <include name="**/messages*.properties"/>
-                                <include name="**/images/**/*" />
-
+
+
+
-                </copy>
-        </target>
@@ -335 +346 @@
-        
-        <target name="package-web" depends="package-web-init" description="create webapp war file">
-
+, **/test/
-                        <classes dir="${build.dir}">
-                                <include name="**/web/**/*.class" />
@@ -360 +371 @@
-        
-        <target name="package-web-without-libs" depends="package-web-init" description="create webapp war file without libs">
-
+, **/test/
-                        <classes dir="${build.dir}" >
-                                <include name="**/web/**/*.class" />
@@ -572 +583 @@
-                                <fileset dir="${build.dir}">
-                                        <include name="**/*Test.class" />
-org/openmrs/test/
-org/openmrs/test/
+**/*
+**/*
-                                        <exclude name="org/openmrs/web/taglib/SummaryTest.class" />
-                                </fileset>