From 30ddbd4004cd73024c209162229575d104ba0c67 Mon Sep 17 00:00:00 2001
From: sblaz <sblaz@1bcf3343-bbc7-4d28-9858-dce3e5f44ddd>
Date: Sat, 10 Sep 2011 21:59:28 +0000
Subject: [PATCH] integrated tracking-help into build, added build output
 ('target') directories to svn:ignore

---
 java/tracking-ear/pom.xml                     | 117 +++++++++---------
 java/tracking-help/pom.xml                    |  25 ++++
 .../src/main/webapp/WEB-INF/web.xml           |   4 +
 java/tracking-parent/pom.xml                  |   2 +-
 4 files changed, 88 insertions(+), 60 deletions(-)
 create mode 100644 java/tracking-help/pom.xml
 create mode 100644 java/tracking-help/src/main/webapp/WEB-INF/web.xml

diff --git a/java/tracking-ear/pom.xml b/java/tracking-ear/pom.xml
index b8a7e3d..7aab64e 100644
--- a/java/tracking-ear/pom.xml
+++ b/java/tracking-ear/pom.xml
@@ -1,65 +1,64 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>gov.va.med.edp</groupId>
-        <artifactId>edis-tracking-parent</artifactId>
-        <version>1.0.1.WorldVistA-SNAPSHOT</version>
-        <relativePath>../tracking-parent</relativePath>
-    </parent>
-    <groupId>gov.va.med.edp</groupId>
-    <artifactId>edis-tracking-application</artifactId>
-    <packaging>ear</packaging>
-    <name>EDIS Tracking Application Bundle</name>
-    <version>1.0.1.WorldVistA-SNAPSHOT</version>
-    <description>Emergency Department Integration Software - Tracking Application Bundle</description>
-    <dependencies>
-        <dependency>
-            <groupId>gov.va.med.edp</groupId>
-            <artifactId>edis-tracking-server-main</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>gov.va.med.edp</groupId>
-            <artifactId>edis-tracking-server-bigboard</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <!-- <dependency>
-                   <groupId>gov.va.med.edp</groupId>
-                   <artifactId>edis-tracking-help</artifactId>
-                   <version>${project.version}</version>
-                   <type>war</type>
-               </dependency> -->
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ear-plugin</artifactId>
-                <configuration>
-                    <!-- <unpackTypes>war</unpackTypes> -->
-                    <modules>
-                        <webModule>
-                            <groupId>gov.va.med.edp</groupId>
-                            <artifactId>edis-tracking-server-main</artifactId>
-                            <contextRoot>${edis.tracking.trackingContextRoot}</contextRoot>
-                        </webModule>
-                        <webModule>
-                            <groupId>gov.va.med.edp</groupId>
-                            <artifactId>edis-tracking-server-bigboard</artifactId>
-                            <contextRoot>${edis.tracking.boardContextRoot}</contextRoot>
-                        </webModule>
-                        <!-- <webModule>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>gov.va.med.edp</groupId>
+		<artifactId>edis-tracking-parent</artifactId>
+		<version>1.0.1.WorldVistA-SNAPSHOT</version>
+		<relativePath>../tracking-parent</relativePath>
+	</parent>
+	<groupId>gov.va.med.edp</groupId>
+	<artifactId>edis-tracking-application</artifactId>
+	<packaging>ear</packaging>
+	<name>EDIS Tracking Application Bundle</name>
+	<version>1.0.1.WorldVistA-SNAPSHOT</version>
+	<description>Emergency Department Integration Software - Tracking Application Bundle</description>
+	<dependencies>
+		<dependency>
+			<groupId>gov.va.med.edp</groupId>
+			<artifactId>edis-tracking-server-main</artifactId>
+			<version>${project.version}</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>gov.va.med.edp</groupId>
+			<artifactId>edis-tracking-server-bigboard</artifactId>
+			<version>${project.version}</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>gov.va.med.edp</groupId>
+			<artifactId>edis-tracking-help</artifactId>
+			<version>${project.version}</version>
+			<type>war</type>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-ear-plugin</artifactId>
+				<configuration>
+					<!-- <unpackTypes>war</unpackTypes> -->
+					<modules>
+						<webModule>
+							<groupId>gov.va.med.edp</groupId>
+							<artifactId>edis-tracking-server-main</artifactId>
+							<contextRoot>${edis.tracking.trackingContextRoot}</contextRoot>
+						</webModule>
+						<webModule>
+							<groupId>gov.va.med.edp</groupId>
+							<artifactId>edis-tracking-server-bigboard</artifactId>
+							<contextRoot>${edis.tracking.boardContextRoot}</contextRoot>
+						</webModule>
+						<!-- <webModule>
                                                    <groupId>gov.va.med.edp</groupId>
                                                    <artifactId>edis-tracking-help</artifactId>
                                                    <contextRoot>${edis.tracking.helpContextRoot}</contextRoot>
                                                </webModule> -->
-                    </modules>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+					</modules>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/java/tracking-help/pom.xml b/java/tracking-help/pom.xml
new file mode 100644
index 0000000..fbdd260
--- /dev/null
+++ b/java/tracking-help/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>gov.va.med.edp</groupId>
+		<artifactId>edis-tracking-parent</artifactId>
+		<version>1.0.1.WorldVistA-SNAPSHOT</version>
+		<relativePath>../tracking-parent</relativePath>
+	</parent>
+	<groupId>gov.va.med.edp</groupId>
+	<artifactId>edis-tracking-help</artifactId>
+	<packaging>war</packaging>
+	<name>EDIS Tracking Server Help</name>
+	<version>1.0.1.WorldVistA-SNAPSHOT</version>
+	<description>Emergency Department Integration Software - Tracking Server Help</description>
+	<build>
+		<finalName>${edis.tracking.helpContextRoot}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/java/tracking-help/src/main/webapp/WEB-INF/web.xml b/java/tracking-help/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..04cc9ce
--- /dev/null
+++ b/java/tracking-help/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+	<display-name>EDIS Tracking Server Help</display-name>
+</web-app>
diff --git a/java/tracking-parent/pom.xml b/java/tracking-parent/pom.xml
index 2a5064a..5f1cd6c 100644
--- a/java/tracking-parent/pom.xml
+++ b/java/tracking-parent/pom.xml
@@ -16,7 +16,7 @@
         <module>../tracking-server-core</module>
         <module>../tracking-server-main</module>
         <module>../tracking-server-bigboard</module>
-        <!--<module>../tracking-help</module>-->
+        <module>../tracking-help</module>
         <module>../tracking-ear</module>
     </modules>
     <organization>