From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Fri, 7 Jun 2013 16:53:21 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into... 
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=cd63f324cf98a553f9cea33c50b0d68985552a8d;p=mkjsf-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into glassfish-version

Conflicts:
	pom.xml
---

cd63f324cf98a553f9cea33c50b0d68985552a8d
diff --cc pom.xml
index 4de438a,eccdddc..598ab0d
--- a/pom.xml
+++ b/pom.xml
@@@ -18,8 -18,7 +18,8 @@@
      <dependency>
        <groupId>org.glassfish</groupId>
        <artifactId>javax.faces</artifactId>
-       <version>2.1.16</version>
 +      <scope>provided</scope>
+       <version>2.1.21</version>
      </dependency>
      <dependency>
        <groupId>javax.servlet.jsp.jstl</groupId>
@@@ -31,20 -29,33 +31,34 @@@
      <dependency>
        <groupId>org.jboss.weld.servlet</groupId>
        <artifactId>weld-servlet</artifactId>
 -      <version>1.1.10.Final</version>      
 +      <version>1.1.10.Final</version>
 +      <scope>provided</scope>
+     </dependency>    
+     <dependency>
+       <groupId>org.apache.httpcomponents</groupId>
+       <artifactId>httpclient</artifactId>
+       <version>4.2.3</version>
+     </dependency>
+     <!-- File upload -->
+     <dependency>
+       <groupId>org.apache.myfaces.tomahawk</groupId>
+       <artifactId>tomahawk20</artifactId>
+       <version>1.1.10</version>
      </dependency>
-     
+     <dependency>
+       <groupId>commons-io</groupId>
+       <artifactId>commons-io</artifactId>
+       <version>2.1</version>
+     </dependency>    
      <dependency>
        <groupId>com.indexdata</groupId>
        <artifactId>masterkey-common</artifactId>
-       <version>0.1.10-SNAPSHOT</version>
+       <version>0.1.10</version>
      </dependency>
    </dependencies>
- 
    <build>
 -    <directory>target</directory>
 -    <outputDirectory>target/classes</outputDirectory>
 +    <directory>target-as</directory>
 +    <outputDirectory>target-as/classes</outputDirectory>
      <sourceDirectory>src/main/java</sourceDirectory>
      <resources>
        <resource>