# HG changeset patch
# User Kostis Kyzirakos <kkyzir@di.uoa.gr>
# Date 1356354848 -3600
# Node ID 674f8f91162b33f1d756210244e78f1910a9b026
# Parent  14c05dfc64d00a6e0a5e410622cce68b7f094413
Added an <endpoint-exec> module. This module builds an executable jar file with an embedded Apache Tomcat 7.
To create and run the executable jar just type:

$ mvn clean package
$ java -jar endpoint-exec/target/strabon-endpoint-executable-*.jar

(Copying usage from http://tomcat.apache.org/maven-plugin-2.0/executable-war-jar.html)

Usage: java -jar [path to your exec war jar]
 -ajpPort <ajpPort>                     ajp port to use
 -clientAuth                            enable client authentication for https
 -D <arg>                               key=value
 -extractDirectory <extractDirectory>   path to extract war content, default value: .extract
 -h,--help                              help
 -httpPort <httpPort>                   http port to use
 -httpProtocol <httpProtocol>           http protocol to use: HTTP/1.1 or org.apache.coyote.http11.Http11Nio Protocol
 -httpsPort <httpsPort>                 https port to use
 -keyAlias <keyAlias>                   alias from keystore for ssl
 -loggerName <loggerName>               logger to use: slf4j to use slf4j bridge on top of jul
 -obfuscate <password>                  obfuscate the password and exit
 -resetExtract                          clean previous extract directory
 -serverXmlPath <serverXmlPath>         server.xml to use, optional
 -X,--debug                             debug

diff -r 14c05dfc64d0 -r 674f8f91162b endpoint-exec/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/endpoint-exec/pom.xml	Mon Dec 24 14:14:08 2012 +0100
@@ -0,0 +1,98 @@
+<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>eu.earthobservatory</groupId>
+		<artifactId>strabon</artifactId>
+		<version>3.2.7-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>strabon-endpoint-exec</artifactId>
+
+	<name>Strabon: Executable endpoint</name>
+	<description>A Strabon endpoint packaged with Tomcat 7 as a single executable jar file</description>
+	<packaging>pom</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>eu.earthobservatory</groupId>
+			<artifactId>strabon-endpoint</artifactId>
+			<version>${eu.earthobservatory.version}</version>
+			<type>war</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.0</version>
+				<executions>
+					<execution>
+						<id>tomcat-run</id>
+						<goals>
+							<goal>exec-war-only</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<path>/</path>
+							<uriEncoding>UTF-8</uriEncoding>
+							<finalName>strabon-endpoint-executable-${project.version}.jar</finalName>
+							<!-- Override the default server.xml if nessecary
+							<serverXml>src/main/tomcatconf/server.xml</serverXml>
+							-->
+							<!--
+							<extraResources>
+								<extraResource>
+									<directory>${basedir}/src/main/resources</directory>
+									<includes>
+										<include>**/log4j.xml</include>
+									</includes>
+								</extraResource>
+							</extraResources>
+							-->
+							<warRunDependencies>
+								<warRunDependency>
+									<dependency>
+										<groupId>eu.earthobservatory</groupId>
+										<artifactId>strabon-endpoint</artifactId>
+										<version>${eu.earthobservatory.version}</version>
+										<type>war</type>
+									</dependency>
+									<contextPath>/</contextPath>
+								</warRunDependency>
+							</warRunDependencies>
+							<!--
+							<extraDependencies>
+								<extraDependency>
+									<groupId>org.slf4j</groupId>
+									<artifactId>jul-to-slf4j</artifactId>
+									<version>${slf4jVersion}</version>
+								</extraDependency>
+								<extraDependency>
+									<groupId>org.slf4j</groupId>
+									<artifactId>slf4j-api</artifactId>
+									<version>${slf4jVersion}</version>
+								</extraDependency>
+								<extraDependency>
+									<groupId>org.slf4j</groupId>
+									<artifactId>slf4j-log4j12</artifactId>
+									<version>${slf4jVersion}</version>
+								</extraDependency>
+								<extraDependency>
+									<groupId>log4j</groupId>
+									<artifactId>log4j</artifactId>
+									<version>1.2.12</version>
+								</extraDependency>	
+							</extraDependencies>
+							-->
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff -r 14c05dfc64d0 -r 674f8f91162b endpoint/pom.xml
--- a/endpoint/pom.xml	Tue Dec 18 12:20:31 2012 +0200
+++ b/endpoint/pom.xml	Mon Dec 24 14:14:08 2012 +0100
@@ -250,23 +250,6 @@
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.tomcat.maven</groupId>
-				<artifactId>tomcat7-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>tomcat-run</id>
-						<goals>
-							<goal>exec-war-only</goal>
-						</goals>
-						<!-- <phase>package</phase> -->
-						<phase>integration-test</phase>
-						<configuration>
-							<enableNaming>true</enableNaming>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 
 		<pluginManagement>
diff -r 14c05dfc64d0 -r 674f8f91162b pom.xml
--- a/pom.xml	Tue Dec 18 12:20:31 2012 +0200
+++ b/pom.xml	Mon Dec 24 14:14:08 2012 +0100
@@ -27,10 +27,11 @@
 		<module>resultio-spatial</module>
 		<module>endpoint</module>
 		<module>endpoint-client</module>
+		<module>endpoint-exec</module>
 	</modules>
 
 	<properties>
-        	<eu.earthobservatory.version>3.2.7-SNAPSHOT</eu.earthobservatory.version>
+        <eu.earthobservatory.version>3.2.7-SNAPSHOT</eu.earthobservatory.version>
 		<sesame.version>2.6.3</sesame.version>
 		<aduna.appbase.version>3.5.0</aduna.appbase.version>
 		<!--slf4j.version>1.5.8</slf4j.version-->