Fix problems with not loading, links not linking

r-friedman · Jul 1, 2012 · e65aec6 · e65aec6
1 parent 92815e1
commit e65aec6
Showing 36 changed files with 69 additions and 478 deletions.
diff --git a/api/src/main/java/org/openmrs/module/tbcase/api/extension/html/AdminList.java b/api/src/main/java/org/openmrs/module/tbcase/api/extension/html/AdminList.java
@@ -46,7 +46,7 @@ public String getTitle() {
 	public Map<String, String> getLinks() {
 
 		Map<String, String> map = new LinkedHashMap<String, String>();
-		map.put("module/tbcase/landing.list", "Manage TB Case Reporting");
+		map.put("module/tbcase/admin/reportSelection.list", "TB Case Reports");
 		return map;
 	}
 	@Override

diff --git a/api/src/main/java/org/openmrs/module/tbcase/api/extension/html/TBCaseGutterLinkExt.java b/api/src/main/java/org/openmrs/module/tbcase/api/extension/html/TBCaseGutterLinkExt.java
@@ -17,7 +17,7 @@ public String getRequiredPrivilege() {
 
 	@Override
 	public String getUrl() {
-		return "module/tbcase/admin/reportSelection.jsp";
+		return "module/tbcase/admin/reportSelection.list";
 	}
 
 }
diff --git a/api/src/main/resources/TBCaseReport.hbm.xml b/api/src/main/resources/TBCaseReport.hbm.xml
@@ -23,7 +23,7 @@
 				<column name="reportId" />
 			</key>
 			 <list-index column="parameter_id"/>
-			<composite-element class="TBCaseReportParameter">
+			<composite-element class="TBCaseParameter">
 				<property name="displayName" type="string" column="display_name" />
 				<property name="name" type="string" column="name" not-null="true" />
 				<property name="valueClass" type="class" column="class" not-null="true" />

diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
@@ -1 +1 @@
-@MODULE_ID@.title=TB Case Report Module
+tbcase.title=TB Case Report Module
diff --git a/api/target/classes/TBCaseReport.hbm.xml b/api/target/classes/TBCaseReport.hbm.xml
@@ -23,7 +23,7 @@
 				<column name="reportId" />
 			</key>
 			 <list-index column="parameter_id"/>
-			<composite-element class="TBCaseReportParameter">
+			<composite-element class="TBCaseParameter">
 				<property name="displayName" type="string" column="display_name" />
 				<property name="name" type="string" column="name" not-null="true" />
 				<property name="valueClass" type="class" column="class" not-null="true" />

diff --git a/api/target/classes/liquibase.xml b/api/target/classes/liquibase.xml
diff --git a/api/target/classes/messages.properties b/api/target/classes/messages.properties
@@ -1 +1 @@
-@MODULE_ID@.title=TB Case Report Module
+tbcase.title=TB Case Report Module
diff --git a/api/target/classes/org/openmrs/module/tbcase/api/extension/html/AdminList.class b/api/target/classes/org/openmrs/module/tbcase/api/extension/html/AdminList.class
diff --git a/api/target/classes/org/openmrs/module/tbcase/api/extension/html/TBCaseGutterLinkExt.class b/api/target/classes/org/openmrs/module/tbcase/api/extension/html/TBCaseGutterLinkExt.class
diff --git a/api/target/maven-archiver/pom.properties b/api/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Sat Jun 30 16:46:01 EDT 2012
+#Sun Jul 01 11:36:17 EDT 2012
 version=0.5-SNAPSHOT
 groupId=org.openmrs.module
 artifactId=tbcase-api
diff --git a/api/target/tbcase-api-0.5-SNAPSHOT.jar b/api/target/tbcase-api-0.5-SNAPSHOT.jar
diff --git a/omod/pom.xml b/omod/pom.xml
@@ -210,4 +210,11 @@
 		</plugins>
 	</build>
 
+	<properties>
+		<MODULE_ID>${project.parent.artifactId}</MODULE_ID>
+		<MODULE_NAME>${project.parent.name}</MODULE_NAME>
+		<MODULE_VERSION>${project.parent.version}</MODULE_VERSION>
+		<MODULE_PACKAGE>${project.parent.groupId}.${project.parent.artifactId}</MODULE_PACKAGE>
+	</properties>
+
 </project>
diff --git a/omod/src/main/webapp/landing.jsp b/omod/src/main/webapp/landing.jsp
diff --git a/omod/target/classes/META-INF/maven/org.openmrs.module/tbcase-api/pom.properties b/omod/target/classes/META-INF/maven/org.openmrs.module/tbcase-api/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Sat Jun 30 16:46:01 EDT 2012
+#Sun Jul 01 11:36:17 EDT 2012
 version=0.5-SNAPSHOT
 groupId=org.openmrs.module
 artifactId=tbcase-api
diff --git a/omod/target/classes/META-INF/maven/org.openmrs.module/tbcase-omod/pom.properties b/omod/target/classes/META-INF/maven/org.openmrs.module/tbcase-omod/pom.properties
diff --git a/omod/target/classes/META-INF/maven/org.openmrs.module/tbcase-omod/pom.xml b/omod/target/classes/META-INF/maven/org.openmrs.module/tbcase-omod/pom.xml
diff --git a/omod/target/classes/TBCaseReport.hbm.xml b/omod/target/classes/TBCaseReport.hbm.xml
@@ -23,7 +23,7 @@
 				<column name="reportId" />
 			</key>
 			 <list-index column="parameter_id"/>
-			<composite-element class="TBCaseReportParameter">
+			<composite-element class="TBCaseParameter">
 				<property name="displayName" type="string" column="display_name" />
 				<property name="name" type="string" column="name" not-null="true" />
 				<property name="valueClass" type="class" column="class" not-null="true" />

diff --git a/omod/target/classes/config.xml b/omod/target/classes/config.xml
@@ -6,35 +6,35 @@
 	<id>tbcase</id>
 	<name>TB Case Report Module</name>
 	<version>0.5</version>
-	<package>org.openmrs.module.@MODULE_ID@</package>
+	<package>org.openmrs.module.tbcase</package>
 	<author>Ivan Tellez</author>
 	<description>
 			TB Case Report Module for the Dominican Republic
 	</description>
 
-	<activator>@MODULE_PACKAGE@.TBCaseModuleActivator</activator>
+	<activator>org.openmrs.module.tbcase.TBCaseModuleActivator</activator>
 
-	<!-- <updateURL>https://dev.openmrs.org/modules/download/@MODULE_ID@/update.rdf</updateURL> -->
+	<!-- <updateURL>https://dev.openmrs.org/modules/download/tbcase/update.rdf</updateURL> -->
 	<!-- /Base Module Properties -->
 
 	<require_version>1.9.0</require_version>
 
 	<!-- Extensions -->
 	<extension>
 		<point>org.openmrs.admin.list</point>
-		<class>@MODULE_PACKAGE@.api.extension.html.AdminList</class>
+		<class>org.openmrs.module.tbcase.api.extension.html.AdminList</class>
 	</extension>
 	<extension>
 	<point>org.openmrs.gutter.tools</point>
-	<class>@MODULE_PACKAGE@.api.extension.html.TBCaseGutterLinkExt
+	<class>org.openmrs.module.tbcase.api.extension.html.TBCaseGutterLinkExt
 	</class>
 	</extension>
 
 
 
 
 	<!-- Internationalization -->
-	<!-- All message codes should start with @MODULE_ID@.* -->
+	<!-- All message codes should start with tbcase.* -->
 	<messages>
 		<lang>en</lang>
 		<file>messages.properties</file>

diff --git a/omod/target/classes/liquibase.xml b/omod/target/classes/liquibase.xml
diff --git a/omod/target/classes/messages.properties b/omod/target/classes/messages.properties
@@ -1 +1 @@
-@MODULE_ID@.title=TB Case Report Module
+tbcase.title=TB Case Report Module
diff --git a/omod/target/classes/org/openmrs/module/tbcase/api/extension/html/AdminList.class b/omod/target/classes/org/openmrs/module/tbcase/api/extension/html/AdminList.class
diff --git a/omod/target/classes/org/openmrs/module/tbcase/api/extension/html/TBCaseGutterLinkExt.class b/omod/target/classes/org/openmrs/module/tbcase/api/extension/html/TBCaseGutterLinkExt.class
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		@MODULE_ID@.title=TB Case Report Module
		tbcase.title=TB Case Report Module