[Columba-cvs] SF.net SVN: columba: [92] columba/trunk

[<mli...@us...>]

Revision: 92
          http://svn.sourceforge.net/columba/?rev=92&view=rev
Author:   mlivingstone
Date:     2006-09-27 02:40:24 -0700 (Wed, 27 Sep 2006)

Log Message:
-----------


Modified Paths:
--------------
    columba/trunk/dist/webstart/columba.jnlp
    columba/trunk/lib.properties
    columba/trunk/src.properties

Modified: columba/trunk/dist/webstart/columba.jnlp
===================================================================
--- columba/trunk/dist/webstart/columba.jnlp	2006-09-27 07:18:13 UTC (rev 91)
+++ columba/trunk/dist/webstart/columba.jnlp	2006-09-27 09:40:24 UTC (rev 92)
@@ -58,16 +58,18 @@
    <jar href="@jboss-archive-browsing@" />
    <jar href="@jta@" />
    
-   <!-- JavaHelp is signed by SUN already -->
-   <!-- it therefor can't be in the same jnlp file -->
+   <jar href="@quaqua@" />
+   
+   <!-- JavaHelp is signed by SUN already. -->
+   <!-- Therefore, it can't be in the same jnlp file -->
    <!-- because it is signed by someone else -->
      
    <extension href="javahelp.jnlp" />   
    
  </resources>
  <resources os="Windows">
-   <!-- JNIWrapper is signed by jniwrapper.com already -->
-   <!-- it therefor can't be in the same jnlp file -->
+   <!-- JNIWrapper is signed by jniwrapper.com already. -->
+   <!-- Therefore, it can't be in the same jnlp file -->
    <!-- because it is signed by someone else -->
    
    <extension name="jniwrapper" href="jniwrapper.jnlp"/>
@@ -78,5 +80,9 @@
    <jar href="native/linux/@jdic@"/>
    <nativelib href="native/linux/@native@"/>
  </resources>
+  <resources os="Mac">
+   <jar href="native/mac/@libquaqua@"/>
+   <nativelib href="native/mac/@native@"/>
+ </resources>
  <application-desc/>
 </jnlp>

Modified: columba/trunk/lib.properties
===================================================================
--- columba/trunk/lib.properties	2006-09-27 07:18:13 UTC (rev 91)
+++ columba/trunk/lib.properties	2006-09-27 09:40:24 UTC (rev 92)
@@ -50,4 +50,8 @@
 lib.hsqldb.jar=${lib.basedir}/jpa/hsqldb.jar
 lib.javassist.jar=${lib.basedir}/jpa/javassist.jar
 lib.jboss-archive-browsing.jar=${lib.basedir}/jpa/jboss-archive-browsing.jar
-lib.jta.jar=${lib.basedir}/jpa/jta.jar
\ No newline at end of file
+lib.jta.jar=${lib.basedir}/jpa/jta.jar
+
+# Quaqua Mac OS X libs
+lib.quaqua=${lib.basedir}/quaqua.jar
+lib.libquaqua=${lib.basedir}/libquaqua.jnilib

Modified: columba/trunk/src.properties
===================================================================
--- columba/trunk/src.properties	2006-09-27 07:18:13 UTC (rev 91)
+++ columba/trunk/src.properties	2006-09-27 09:40:24 UTC (rev 92)
@@ -55,9 +55,8 @@
 
 native.win32=native/win32/
 native.linux=native/linux/
-native.mac=native/mac/
 
 # set it to off to disable the deprecation warnings
-deprecation=on
+deprecation=off
 #set it to -Xlint:-unchecked to disable the unchecked warnings
 unchecked=-Xlint:-unchecked


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.