Allow logout button to work where no Java app used

[guacamole.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b69fafe..3892fd9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,20 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.guacamole</groupId>
-    <artifactId>guacamole-default-webapp</artifactId>
+    <artifactId>guacamole</artifactId>
     <packaging>war</packaging>
-    <version>0.3.0rc1</version>
-    <name>guacamole-default-webapp</name>
-    <url>http://guacamole.sourceforge.net/</url>
+    <version>0.6.1</version>
+    <name>guacamole</name>
+    <url>http://guac-dev.org/</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <build>
         <plugins>
+
+            <!-- Written for 1.6 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -19,20 +25,38 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
-        </plugins>
 
-        <extensions>
-            <!-- Required for SSH deploy -->
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-            </extension>
-        </extensions>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    
+                    <!-- Filter webapp dir --> 
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
+                    
+                    <!-- Add files from guacamole-common-js -->
+                    <overlays>
+                        <overlay>
+                            <groupId>net.sourceforge.guacamole</groupId>
+                            <artifactId>guacamole-common-js</artifactId>
+                            <type>zip</type>
+                        </overlay>
+                    </overlays>
+                    
+                </configuration>
+            </plugin>
 
+        </plugins>
     </build>
 
     <dependencies>
 
+        <!-- Java servlet API -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -40,27 +64,52 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- SLF4J - logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jcl</artifactId>
+            <version>1.6.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Guacamole Java API -->
         <dependency>
             <groupId>net.sourceforge.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
-            <version>0.3.0rc1</version>
-            <scope>compile</scope>
+            <version>0.6.1</version>
+        </dependency>
+
+        <!-- Guacamole Extension API -->
+        <dependency>
+            <groupId>net.sourceforge.guacamole</groupId>
+            <artifactId>guacamole-ext</artifactId>
+            <version>0.6.1</version>
+        </dependency>
+
+        <!-- Guacamole JavaScript API -->
+        <dependency>
+            <groupId>net.sourceforge.guacamole</groupId>
+            <artifactId>guacamole-common-js</artifactId>
+            <version>0.6.1</version>
+            <type>zip</type>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>
 
     <repositories>
+        
+        <!-- Central Guacamole repository -->
         <repository>
             <id>guac-dev</id>
             <url>http://guac-dev.org/repo</url>
         </repository>
+        
     </repositories>
 
-    <distributionManagement>
-        <repository>
-            <id>guac-dev</id>
-            <url>scpexe://guac-dev.org/var/www/repo</url>
-        </repository>
-    </distributionManagement>
-
 </project>