harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r539793 [1/4] - in /harmony/enhanced/classlib/trunk: depends/build/ make/ modules/archive/ modules/archive/src/main/native/archive/shared/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/archive/windows/ module...
Date Sat, 19 May 2007 19:22:03 GMT
Author: hindessm
Date: Sat May 19 12:22:00 2007
New Revision: 539793

URL: http://svn.apache.org/viewvc?view=rev&rev=539793
Log:
Applying patches from "[#HARMONY-3563] modify VMI to hide internal VM
data structures exposed by getZipCachePool() VMI function".

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.c   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ca.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_cs.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_de.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_es.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_fr.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_hu.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_it.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ja.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ko.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pl.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pt_BR.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ru.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sk.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sl.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_tr.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_zh.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_zh_CN.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_zh_TW.nls
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzipnls.h   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zcpool.c   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipalloc.c   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipcache.c   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipsup.c   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipsup.h   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/unix/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/unix/DoxygenSupport.txt   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/windows/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/windows/DoxygenSupport.txt   (with props)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyzip.h   (with props)
Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mak
    harmony/enhanced/classlib/trunk/depends/build/defines.mk
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/archiveglob.c
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/deflater.c
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/jarfile.c
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.h
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/vmi.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Sat May 19 12:22:00 2007
@@ -71,3 +71,8 @@
 !ELSE  
 HYCFLAGS = $(HYCFLAGS) -DHY_NO_SIG
 !ENDIF
+
+!IF "$(HY_ZIP_API)" == "true"
+HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
+!ENDIF
+

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Sat May 19 12:22:00 2007
@@ -80,3 +80,7 @@
 else
 DEFINES += -DHY_NO_SIG
 endif
+
+ifeq ($(HY_ZIP_API),true)
+DEFINES += -DHY_ZIP_API
+endif
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Sat May 19 12:22:00 2007
@@ -282,6 +282,13 @@
         </not>
     </condition>
 
+    <property name="hy.zip.api" value="false" />
+    <condition property="hy.skip.zip.api" value="true">
+        <not>
+            <equals arg1="${hy.zip.api}" arg2="true" />
+        </not>
+     </condition>
+
     <condition property="hy.libstdc++.suffix" value=".libstdc++6">
         <isset property="use.libstdc++6"/>
     </condition>
@@ -448,6 +455,7 @@
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">
+                <env key="HY_ZIP_API" value="${hy.zip.api}" />
                 <env key="HY_HDK" value="${hy.hdk}" />
                 <env key="HY_CFG" value="${hy.cfg}" />
                 <env key="HY_ARCH" value="${hy.arch}" />

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Sat May 19 12:22:00 2007
@@ -43,17 +43,22 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
     
-    <target name="copy-native-includes" depends="overlay-oss">
+    <target name="copy-native-includes" depends="overlay-oss, copy-zipsup-include">
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/include/shared">
-                <include name="zipsup.h" />
-            </fileset>
             <fileset dir="${hy.archive.src.main.native}/zlib_dist">
                 <include name="zlib.h" />
                 <include name="zconf.h" />
             </fileset>
         </copy>
     </target>
+	
+	<target name="copy-zipsup-include" if="hy.skip.zip.api">
+        <copy todir="${hy.hdk}/include" overwrite="yes">
+            <fileset dir="${hy.archive.src.main.native}/include/shared">
+                <include name="zipsup.h" />
+            </fileset>
+        </copy>
+	</target>
     
     <target name="overlay-oss">
         <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
@@ -66,9 +71,13 @@
     </target>
     
     <!-- Build native code -->
-    <target name="build-native" >
+    <target name="build-native" depends="-build-native-zip,-build-native" />
+
+    <target name="-build-native-zip" if="hy.skip.zip.api">
         <make dir="${hy.archive.src.main.native}/zip/${hy.os.family}" />
+    </target>
         
+    <target name="-build-native">
         <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.archive.src.main.native}/zlib">

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/archiveglob.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/archiveglob.c?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/archiveglob.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/archiveglob.c Sat May 19 12:22:00 2007
@@ -99,6 +99,10 @@
           JCLZipFile *jclZipFile;
 
           PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+          VMI_ACCESS_FROM_ENV(env);
+          HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
           /* Detach from the common library */
           ClearLibDetach (env);
@@ -111,7 +115,11 @@
               while (jclZipFile != NULL)
                 {
                   JCLZipFile *next = jclZipFile->next;
+#ifndef HY_ZIP_API
                   zip_closeZipFile (PORTLIB, &jclZipFile->hyZipFile);
+#else /* HY_ZIP_API */
+                  zipFuncs->zip_closeZipFile (VMI, &jclZipFile->hyZipFile);
+#endif /* HY_ZIP_API */
                   jclmem_free_memory (env, jclZipFile);
                   jclZipFile = next;
                 }

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/deflater.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/deflater.c?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/deflater.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/deflater.c Sat May 19 12:22:00 2007
@@ -24,8 +24,10 @@
 #include "jclglob.h"
 #include "jclprots.h"
 
+#ifndef HY_ZIP_API
 void zfree PROTOTYPE ((void *opaque, void *address));
 void *zalloc PROTOTYPE ((void *opaque, U_32 items, U_32 size));
+#endif
 
 JNIEXPORT void JNICALL
 Java_java_util_zip_Deflater_setDictionaryImpl (JNIEnv * env, jobject recv,
@@ -92,11 +94,15 @@
 					  jboolean noHeader)
 {  
   PORT_ACCESS_FROM_ENV (env);
-
   JCLZipStream *jstream;
   z_stream *stream;
   int err = 0;
   int wbits = 15;		/*Use MAX for fastest */
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV (env);
+  HyZipFunctionTable *zipFuncs;
+  zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif
 
   /*Allocate mem for wrapped struct */
   jstream = jclmem_allocate_memory (env, sizeof (JCLZipStream));
@@ -113,9 +119,15 @@
       throwNewOutOfMemoryError (env, "");
       return -1;
     }
+#ifndef HY_ZIP_API
   stream->opaque = (void *) privatePortLibrary;
   stream->zalloc = zalloc;
   stream->zfree = zfree;
+#else
+  stream->opaque = (void *) VMI;
+  stream->zalloc = zipFuncs->zip_zalloc;
+  stream->zfree =zipFuncs->zip_zfree;
+#endif
   jstream->stream = stream;
   jstream->dict = NULL;
   jstream->inaddr = NULL;

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/inflater.c Sat May 19 12:22:00 2007
@@ -36,6 +36,11 @@
   z_stream *stream;
   int err = 0;
   int wbits = 15;               /*Use MAX for fastest */
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV (env);
+  HyZipFunctionTable *zipFuncs;
+  zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif
 
   /*Allocate mem for wrapped struct */
   jstream = jclmem_allocate_memory (env, sizeof (JCLZipStream));
@@ -53,9 +58,15 @@
       throwNewOutOfMemoryError (env, "");
       return -1;
     }
+#ifndef HY_ZIP_API
   stream->opaque = (void *) privatePortLibrary;
   stream->zalloc = zalloc;
   stream->zfree = zfree;
+#else
+  stream->opaque = (void *) VMI;
+  stream->zalloc = zipFuncs->zip_zalloc;
+  stream->zfree = zipFuncs->zip_zfree;
+#endif
   stream->adler = 1;
   jstream->stream = stream;
   jstream->dict = NULL;

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/jarfile.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/jarfile.c?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/jarfile.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/jarfile.c Sat May 19 12:22:00 2007
@@ -20,17 +20,27 @@
 #include "exceptions.h"
 #include "jclglob.h"
 #include "jclprots.h"
+#ifndef HY_ZIP_API
 
 #include "zipsup.h"
+#else /* HY_ZIP_API */
+#include "hyzip.h"
+#endif /* HY_ZIP_API */
 
 /* Build a new ZipEntry from the C struct */
 jobject
 createZipEntry (JNIEnv * env, HyZipFile * zipFile, HyZipEntry * zipEntry)
 {
   PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
   jclass javaClass;
   jobject java_ZipEntry, extra, entryName;
   jmethodID mid;
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   /* Build a new ZipEntry from the C struct */
   entryName = ((*env)->NewStringUTF (env, zipEntry->filename));
@@ -40,7 +50,11 @@
   extra = NULL;
   if (zipEntry->extraFieldLength > 0)
     {
+#ifndef HY_ZIP_API
       zip_getZipEntryExtraField (PORTLIB, zipFile, zipEntry, NULL,
+#else /* HY_ZIP_API */
+      zipFuncs->zip_getZipEntryExtraField (VMI, zipFile, zipEntry, NULL,
+#endif /* HY_ZIP_API */
 				 zipEntry->extraFieldLength);
       if (zipEntry->extraField == NULL)
 	return NULL;
@@ -81,6 +95,9 @@
 #define RESULT_BUF_SIZE 256
 
   PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
 
   JCLZipFile *jclZipFile;
   HyZipFile *zipFile;
@@ -97,6 +114,9 @@
   char startNameBuf[MAX_PATH];
   UDATA nameBufSize = MAX_PATH;
   IDATA rc;
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   nameBuf = (char *) &startNameBuf;
 
@@ -113,17 +133,29 @@
 
   if (zipFile->cache)
     {
+#ifndef HY_ZIP_API
       if (zipCache_enumNew (zipFile->cache, "META-INF/", &scanPtr))
+#else /* HY_ZIP_API */
+      if (zipFuncs->zipCache_enumNew (zipFile->cache, "META-INF/", &scanPtr))
+#endif /* HY_ZIP_API */
 	return NULL;
 
       if (0 !=
+#ifndef HY_ZIP_API
 	  zipCache_enumGetDirName (scanPtr, (char *) &metaInfName,
+#else /* HY_ZIP_API */
+	  zipFuncs->zipCache_enumGetDirName (scanPtr, (char *) &metaInfName,
+#endif /* HY_ZIP_API */
 				   sizeof (metaInfName)))
 	return NULL;
 
       for (;;)
 	{
+#ifndef HY_ZIP_API
 	  rc = zipCache_enumElement (scanPtr, nameBuf, nameBufSize, &offset);
+#else /* HY_ZIP_API */
+	  rc = zipFuncs->zipCache_enumElement (scanPtr, nameBuf, nameBufSize, &offset);
+#endif /* HY_ZIP_API */
 	  if (rc < 0)
 	    {
 	      break;		/* we're done, leave the loop */
@@ -144,11 +176,20 @@
 	      continue;		/* go to the top of the loop again */
 	    }
 
+#ifndef HY_ZIP_API
 	  zip_initZipEntry (PORTLIB, &zipEntry);
 	  if (zip_getZipEntryFromOffset (PORTLIB, zipFile, &zipEntry, offset))
+#else /* HY_ZIP_API */
+	  zipFuncs->zip_initZipEntry (VMI, &zipEntry);
+	  if (zipFuncs->zip_getZipEntryFromOffset (VMI, zipFile, &zipEntry, offset))
+#endif /* HY_ZIP_API */
 	    goto cleanup;
 	  current = createZipEntry (env, zipFile, &zipEntry);
+#ifndef HY_ZIP_API
 	  zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+	  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
 	  if (resultCount == RESULT_BUF_SIZE)
 	    goto cleanup;	/* fail - should fix. */
 	  if (current)
@@ -173,7 +214,11 @@
 	  (*env)->SetObjectArrayElement (env, result, i, resultArray[i]);
 	}
     cleanup:
+#ifndef HY_ZIP_API
       zipCache_enumKill (scanPtr);
+#else /* HY_ZIP_API */
+      zipFuncs->zipCache_enumKill (scanPtr);
+#endif /* HY_ZIP_API */
       if (oldNameBuf)
 	jclmem_free_memory (env, oldNameBuf);	/* free old before checking result so we clean up on fail */
       return result;

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c Sat May 19 12:22:00 2007
@@ -54,7 +54,11 @@
   JCLZipFileLink *zipfileHandles;
   jsize length;
   char pathCopy[HyMaxPath];
+#ifndef HY_ZIP_API
   HyZipCachePool *zipCachePool;
+#else /* HY_ZIP_API */
+  HyZipFunctionTable *zipFuncs;
+#endif /* HY_ZIP_API */
 
   jclZipFile = jclmem_allocate_memory (env, sizeof (*jclZipFile));
   if (!jclZipFile)
@@ -66,11 +70,17 @@
   pathCopy[length++] = '\0';
   ioh_convertToPlatform (pathCopy);
 
+#ifndef HY_ZIP_API
   /* Open the zip file (caching will be managed automatically by zipsup) */
   zipCachePool = (*VMI)->GetZipCachePool (VMI);
   retval =
     zip_openZipFile (privatePortLibrary, pathCopy, &(jclZipFile->hyZipFile),
                      zipCachePool);
+#else /* HY_ZIP_API */
+  /* Open the zip file (caching will be managed automatically) */
+  zipFuncs = (*VMI)->GetZipFunctions(VMI);
+  retval = zipFuncs->zip_openZipFile(VMI, pathCopy, &(jclZipFile->hyZipFile));
+#endif /* HY_ZIP_API */
 
   if (retval)
     {
@@ -103,6 +113,9 @@
 Java_java_util_zip_ZipFile_getEntryImpl (JNIEnv * env, jobject recv,
                                          jlong zipPointer, jstring entryName)
 {
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
   PORT_ACCESS_FROM_ENV (env);
 
   I_32 retval;
@@ -113,6 +126,9 @@
   jmethodID mid;
   const char *entryCopy;
   JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) zipPointer;
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   if (jclZipFile == (void *) -1)
     {
@@ -124,29 +140,50 @@
   if (entryCopy == NULL)
     return (jobject) NULL;
 
+#ifndef HY_ZIP_API
   zip_initZipEntry (PORTLIB, &zipEntry);
   retval = zip_getZipEntry (PORTLIB, zipFile, &zipEntry, entryCopy, TRUE);
+#else /* HY_ZIP_API */
+  zipFuncs->zip_initZipEntry (VMI, &zipEntry);
+  retval = zipFuncs->zip_getZipEntry (VMI, zipFile, &zipEntry, entryCopy, TRUE);
+#endif /* HY_ZIP_API */
   (*env)->ReleaseStringUTFChars (env, entryName, entryCopy);
   if (retval)
     {
+#ifndef HY_ZIP_API
       zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+	  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
       return (jobject) NULL;
     }
 
   extra = NULL;
   if (zipEntry.extraFieldLength > 0)
     {
+#ifndef HY_ZIP_API
       zip_getZipEntryExtraField (PORTLIB, zipFile, &zipEntry, NULL,
+#else /* HY_ZIP_API */
+	  zipFuncs->zip_getZipEntryExtraField (VMI, zipFile, &zipEntry, NULL,
+#endif /* HY_ZIP_API */
                                  zipEntry.extraFieldLength);
       if (zipEntry.extraField == NULL)
         {
+#ifndef HY_ZIP_API
           zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+    	  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
           return (jobject) NULL;
         }
       extra = ((*env)->NewByteArray (env, zipEntry.extraFieldLength));
       if (((*env)->ExceptionCheck (env)))
         {
+#ifndef HY_ZIP_API
           zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+    	  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
           return (jobject) NULL;
         }
       ((*env)->
@@ -157,7 +194,11 @@
   entryClass = JCL_CACHE_GET (env, CLS_java_util_zip_ZipEntry);
   entryClass = (*env)->NewLocalRef(env, entryClass);
   if (entryClass == NULL) {
+#ifndef HY_ZIP_API
     zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+    zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
     return (jobject) NULL;
   }
   mid = JCL_CACHE_GET (env, MID_java_util_zip_ZipEntry_init);
@@ -171,7 +212,11 @@
                                       zipEntry.compressionMethod,
                                       (jlong) zipEntry.lastModDate,
                                       (jlong) zipEntry.dataPointer));
+#ifndef HY_ZIP_API
   zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
   return java_ZipEntry;
 }
 
@@ -179,17 +224,27 @@
 Java_java_util_zip_ZipFile_closeZipImpl (JNIEnv * env, jobject recv)
 {
   PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
 
   I_32 retval = 0;
   JCLZipFile *jclZipFile;
   jfieldID descriptorFID =
     JCL_CACHE_GET (env, FID_java_util_zip_ZipFile_descriptor);
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   jclZipFile = (JCLZipFile *) (IDATA) (*env)->GetLongField (env, recv, descriptorFID);
   if (jclZipFile != (void *) -1)
     {
       retval =
+#ifndef HY_ZIP_API
         zip_closeZipFile (privatePortLibrary, &(jclZipFile->hyZipFile));
+#else /* HY_ZIP_API */
+        zipFuncs->zip_closeZipFile (VMI, &(jclZipFile->hyZipFile));
+#endif /* HY_ZIP_API */
       (*env)->SetLongField (env, recv, descriptorFID, -1);
 
       /* Free the zip struct */
@@ -276,16 +331,26 @@
                                                  jlong descriptor)
 {
   PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
 
   IDATA nextEntryPointer;
   JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) descriptor;
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   if (jclZipFile == (void *) -1)
     {
       throwNewIllegalStateException (env, "");
       return 0;
     }
+#ifndef HY_ZIP_API
   zip_resetZipFile (privatePortLibrary,
+#else /* HY_ZIP_API */
+  zipFuncs->zip_resetZipFile (VMI,
+#endif /* HY_ZIP_API */
 		    &(jclZipFile->hyZipFile), 
                     &nextEntryPointer);
   return nextEntryPointer;
@@ -298,6 +363,9 @@
                                                      jlong nextEntry)
 {
   PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
 
   I_32 retval;
   HyZipFile *zipFile;
@@ -308,6 +376,9 @@
   jstring entryName = NULL;
   IDATA nextEntryPointer;
   JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) descriptor;
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   if (jclZipFile == (void *) -1)
     {
@@ -315,11 +386,19 @@
       return NULL;
     }
   zipFile = &(jclZipFile->hyZipFile);
+#ifndef HY_ZIP_API
   zip_initZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+  zipFuncs->zip_initZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
 
   nextEntryPointer = (IDATA) nextEntry;
   retval =
+#ifndef HY_ZIP_API
     zip_getNextZipEntry (PORTLIB, zipFile, &zipEntry, &nextEntryPointer);
+#else /* HY_ZIP_API */
+    zipFuncs->zip_getNextZipEntry (VMI, zipFile, &zipEntry, &nextEntryPointer);
+#endif /* HY_ZIP_API */
   if (retval)
     {
       if (retval != ZIP_ERR_NO_MORE_ENTRIES)
@@ -340,13 +419,21 @@
   extra = NULL;
   if (zipEntry.extraFieldLength > 0)
     {
+#ifndef HY_ZIP_API
       zip_getZipEntryExtraField (PORTLIB, zipFile, &zipEntry, NULL,
+#else /* HY_ZIP_API */
+      zipFuncs->zip_getZipEntryExtraField (VMI, zipFile, &zipEntry, NULL,
+#endif /* HY_ZIP_API */
                                  zipEntry.extraFieldLength);
       extra = ((*env)->NewByteArray (env, zipEntry.extraFieldLength));
       if (((*env)->ExceptionCheck (env)))
         {
           /* free the extraField entry */
+#ifndef HY_ZIP_API
           zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+          zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
           return NULL;
         }
       ((*env)->
@@ -371,7 +458,11 @@
                                       zipEntry.compressionMethod,
                                       (jlong) zipEntry.lastModDate,
                                       (jlong) zipEntry.dataPointer));
+#ifndef HY_ZIP_API
   zip_freeZipEntry (PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
   (*env)->SetLongField (env, recv,
                         JCL_CACHE_GET (env,
                                        FID_java_util_zip_ZipFile_nextEntryPointer),
@@ -385,6 +476,9 @@
                                               jstring entryName)
 {
   PORT_ACCESS_FROM_ENV (env);
+#ifdef HY_ZIP_API
+  VMI_ACCESS_FROM_ENV(env);
+#endif /* HY_ZIP_API */
 
   I_32 retval;
   HyZipFile *zipFile;
@@ -392,6 +486,9 @@
   const char *entryCopy;
   jbyteArray buf;
   JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) descriptor;
+#ifdef HY_ZIP_API
+  HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+#endif /* HY_ZIP_API */
 
   /* Build the zipFile */
   if (jclZipFile == (void *) -1)
@@ -404,13 +501,25 @@
   if (entryCopy == NULL)
     return NULL;
 
+#ifndef HY_ZIP_API
   zip_initZipEntry (privatePortLibrary, &zipEntry);
+#else /* HY_ZIP_API */
+  zipFuncs->zip_initZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
   retval =
+#ifndef HY_ZIP_API
     zip_getZipEntry (privatePortLibrary, zipFile, &zipEntry, entryCopy, TRUE);
+#else /* HY_ZIP_API */
+    zipFuncs->zip_getZipEntry (VMI, zipFile, &zipEntry, entryCopy, TRUE);
+#endif /* HY_ZIP_API */
   (*env)->ReleaseStringUTFChars (env, entryName, entryCopy);
   if (retval)
     {
+#ifndef HY_ZIP_API
       zip_freeZipEntry (privatePortLibrary, &zipEntry);
+#else /* HY_ZIP_API */
+      zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
       if (retval == ZIP_ERR_OUT_OF_MEMORY)
         throwNewOutOfMemoryError (env, "");
       return NULL;
@@ -424,12 +533,20 @@
     }
 
   retval =
+#ifndef HY_ZIP_API
     zip_getZipEntryData (privatePortLibrary, zipFile, &zipEntry, NULL,
+#else /* HY_ZIP_API */
+    zipFuncs->zip_getZipEntryData (VMI, zipFile, &zipEntry, NULL,
+#endif /* HY_ZIP_API */
                          zipEntry.uncompressedSize);
   if (retval == 0)
     (*env)->SetByteArrayRegion (env, buf, 0, zipEntry.uncompressedSize,
                                 zipEntry.data);
+#ifndef HY_ZIP_API
   zip_freeZipEntry (privatePortLibrary, &zipEntry);
+#else /* HY_ZIP_API */
+  zipFuncs->zip_freeZipEntry (VMI, &zipEntry);
+#endif /* HY_ZIP_API */
   if (!retval)
     return buf;
 

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.h?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.h (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.h Sat May 19 12:22:00 2007
@@ -18,7 +18,11 @@
 #if !defined(zip_h)
 #define zip_h
 
+#ifndef HY_ZIP_API
 #include "zipsup.h"
+#else /* HY_ZIP_API */
+#include "hyzip.h"
+#endif /* HY_ZIP_API */
 
 typedef struct JCLZipFile
 {

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile Sat May 19 12:22:00 2007
@@ -26,8 +26,12 @@
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \
 	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
 
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES +=	$(LIBPATH)libhyzip.a
+endif
+
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libhyarchive$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile Sat May 19 12:22:00 2007
@@ -36,9 +36,13 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
+!IF "$(HY_ZIP_API)" != "true"
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX)
+!ENDIF
+
 MDLLIBFILES = $(MDLLIBFILES) \
-	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
-        $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
+        $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
 	$(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13100000
 

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile Sat May 19 12:22:00 2007
@@ -21,9 +21,14 @@
 
 CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
+
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
 MDLLIBFILES += \
-        $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = ../libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile Sat May 19 12:22:00 2007
@@ -28,8 +28,12 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
+!IF "$(HY_ZIP_API)" != "true"
+MDLLIBFILES = $(MDLLIBFILES) \
+	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
+!ENDIF
+
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
 	$(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Sat May 19 12:22:00 2007
@@ -28,9 +28,13 @@
   $(SHAREDSUB)/SurfaceDataStructure.o \
   libpng.a
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a
+endif
+
+MDLLIBFILES += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile Sat May 19 12:22:00 2007
@@ -24,9 +24,12 @@
   $(SHAREDSUB)JpegDecoder.o \
   libjpeg.a
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile Sat May 19 12:22:00 2007
@@ -28,9 +28,12 @@
   $(SHAREDSUB)/NativeImageFormat.o \
   liblcms.a
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Sat May 19 12:22:00 2007
@@ -27,9 +27,12 @@
 
 BUILDFILES = LinuxNativeFont.o
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(XLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Sat May 19 12:22:00 2007
@@ -21,9 +21,12 @@
 BUILDFILES = \
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Sat May 19 12:22:00 2007
@@ -24,9 +24,12 @@
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile Sat May 19 12:22:00 2007
@@ -24,9 +24,12 @@
   $(SHAREDSUB)JpegEncoder.o \
   libjpeg.a
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=../libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile Sat May 19 12:22:00 2007
@@ -30,6 +30,10 @@
   -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
   $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
   -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+!IF "$(HY_ZIP_API)" == "true"
+HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
+!ENDIF
+
 
 BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile Sat May 19 12:22:00 2007
@@ -24,9 +24,12 @@
   $(SHAREDSUB)pngencoder.o \
   libpng.a
 
-MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
+MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c Sat May 19 12:22:00 2007
@@ -21,7 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#ifndef HY_ZIP_API
 #include <zipsup.h>
+#else /* HY_ZIP_API */
+#include <hyzip.h>
+#endif /* HY_ZIP_API */
 #include <jni.h>
 #include <vmi.h>
 
@@ -160,8 +164,16 @@
 	VMI_ACCESS_FROM_JAVAVM(vm);
 	PORT_ACCESS_FROM_JAVAVM(vm);
 
+#ifdef HY_ZIP_API
+	HyZipFunctionTable *zipFuncs = (*VMI)->GetZipFunctions(VMI);
+
+#endif /* HY_ZIP_API */
 	/* open zip file */
+#ifndef HY_ZIP_API
 	retval = zip_openZipFile(privatePortLibrary, (char *)jar_name, &zipFile, NULL);
+#else /* HY_ZIP_API */
+	retval = zipFuncs->zip_openZipFile(VMI, (char *)jar_name, &zipFile);
+#endif /* HY_ZIP_API */
 	if(retval){
 		sprintf(errorMessage,"failed to open file:%s, %d\n", jar_name, retval);
 		(*env)->FatalError(env, errorMessage);
@@ -169,10 +181,19 @@
 	}
 
 	/* get manifest entry */
+#ifndef HY_ZIP_API
 	zip_initZipEntry(privatePortLibrary, &zipEntry);
 	retval = zip_getZipEntry(privatePortLibrary, &zipFile, &zipEntry, "META-INF/MANIFEST.MF", TRUE);
+#else /* HY_ZIP_API */
+	zipFuncs->zip_initZipEntry(VMI, &zipEntry);
+	retval = zipFuncs->zip_getZipEntry(VMI, &zipFile, &zipEntry, "META-INF/MANIFEST.MF", TRUE);
+#endif /* HY_ZIP_API */
 	if (retval) {
+#ifndef HY_ZIP_API
 		zip_freeZipEntry(PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+		zipFuncs->zip_freeZipEntry(VMI, &zipEntry);
+#endif /* HY_ZIP_API */
 		sprintf(errorMessage,"failed to get entry: %d\n", retval);
 		(*env)->FatalError(env, errorMessage);
 		return NULL;
@@ -181,17 +202,30 @@
 	/* read bytes */
 	size = zipEntry.uncompressedSize;
 	result = (char *)hymem_allocate_memory(size*sizeof(char));
+#ifndef HY_ZIP_API
 	retval = zip_getZipEntryData(privatePortLibrary, &zipFile, &zipEntry, result, size);
+#else /* HY_ZIP_API */
+	retval = zipFuncs->zip_getZipEntryData(VMI, &zipFile, &zipEntry, result, size);
+#endif /* HY_ZIP_API */
 	if(retval){
+#ifndef HY_ZIP_API
 		zip_freeZipEntry(PORTLIB, &zipEntry);
+#else /* HY_ZIP_API */
+		zipFuncs->zip_freeZipEntry(VMI, &zipEntry);
+#endif /* HY_ZIP_API */
 		sprintf(errorMessage,"failed to get bytes from zip entry, %d\n", zipEntry.extraFieldLength);
 		(*env)->FatalError(env, errorMessage);
 		return NULL;
 	}
 
 	/* free resource */
+#ifndef HY_ZIP_API
 	zip_freeZipEntry(privatePortLibrary, &zipEntry);
 	retval = zip_closeZipFile(privatePortLibrary, &zipFile);
+#else /* HY_ZIP_API */
+	zipFuncs->zip_freeZipEntry(VMI, &zipEntry);
+	retval = zipFuncs->zip_closeZipFile(VMI, &zipFile);
+#endif /* HY_ZIP_API */
 	if (retval) {
 		sprintf(errorMessage,"failed to close zip file: %s, %d\n", jar_name, retval);
 		(*env)->FatalError(env, errorMessage);

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile Sat May 19 12:22:00 2007
@@ -24,8 +24,11 @@
 BUILDFILES = \
 	../shared/instrument.o ../shared/inst_agt.o 
 
+ifneq ($(HY_ZIP_API),true)
+MDLLIBFILES += $(LIBPATH)libhyzip.a 
+endif
+
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a \
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile Sat May 19 12:22:00 2007
@@ -27,15 +27,18 @@
 
 BUILDFILES = \
   $(SHAREDSUB)instrument.obj $(SHAREDSUB)inst_agt.obj 
-  
+
 VIRTFILES = hyinstrument.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-  
+!IF "$(HY_ZIP_API)" != "true"
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
+!ENDIF
+
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
+  $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+
 DLLBASE=0x13200000
 COMMENT=/comment:"instrument component native code. (c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable."
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=539793&r1=539792&r2=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Sat May 19 12:22:00 2007
@@ -58,6 +58,7 @@
                 <include name="fdlibm.h" />
                 <include name="hymagic.h" />
                 <include name="jsig.h" />
+                <include name="hyzip.h"/>
             </fileset>
         </copy>
         <copy todir="${hy.jdk}/include" overwrite="yes">
@@ -116,7 +117,11 @@
     </target>
 
     <!-- Build secondary native luni components -->
-    <target name="build-native-secondary" >
+    <target name="build-native-secondary"
+        depends="-build-native-secondary,-build-hyzip,-build-native-secondary2"
+        />
+
+    <target name="-build-native-secondary" >
         <!-- Build luni dll -->
         <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -129,6 +134,14 @@
 
         <!-- Build vmls lib -->
         <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" />
+    </target>
+
+    <target name="-build-hyzip" unless="hy.skip.zip.api">
+        <!-- Build hyzip lib -->
+        <make dir="${hy.luni.src.main.native}/hyzip/${hy.os.family}" />
+    </target>
+
+    <target name="-build-native-secondary2" >
 
         <!-- Build launcher executables -->
         <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}" />
@@ -144,7 +157,6 @@
 
         <!-- Make sure the Linux launcher has execute permission -->
         <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
-
     </target>
 
     <!-- Overlay OSS packages into their required locations -->
@@ -164,6 +176,8 @@
         <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" target="clean" />
         <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" target="clean" />
         <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" target="clean" />
+        <make dir="${hy.luni.src.main.native}/hyzip/${hy.os.family}"
+              target="clean" />
         <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}"
               target="clean" />
     </target>

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.c?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.c (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.c Sat May 19 12:22:00 2007
@@ -0,0 +1,204 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "zipsup.h"
+#include "hyzip.h"
+#include "vmi.h"
+#include "hyport.h"
+
+I_32 VMCALL 
+hyzip_getZipEntryData(VMInterface * vmi, struct HyZipFile * zipFile, struct HyZipEntry * entry, U_8 * buffer, U_32 bufferSize) 
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_getZipEntryData(PORTLIB, zipFile, entry, buffer, bufferSize);
+}
+
+I_32 VMCALL
+hyzip_getZipEntryFromOffset(VMInterface * vmi, struct HyZipFile * zipFile, struct HyZipEntry * entry, IDATA offset) 
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_getZipEntryFromOffset(PORTLIB, zipFile, entry, offset);
+}
+
+I_32 VMCALL 
+hyzip_establishCache(VMInterface * vmi, struct HyZipFile * zipFile)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_establishCache(PORTLIB, zipFile);
+}
+
+void VMCALL
+hyzip_resetZipFile(VMInterface * vmi, struct HyZipFile * zipFile, IDATA * nextEntryPointer)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	zip_resetZipFile(PORTLIB, zipFile, nextEntryPointer);
+}
+
+I_32 VMCALL 
+hyzip_getNextZipEntry(VMInterface * vmi, struct HyZipFile * zipFile, struct HyZipEntry * zipEntry, IDATA * nextEntryPointer)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_getNextZipEntry(PORTLIB, zipFile, zipEntry, nextEntryPointer);
+}
+
+I_32 VMCALL 
+hyzip_getZipEntry(VMInterface * vmi, struct HyZipFile * zipFile, struct HyZipEntry * entry, const char *filename, BOOLEAN findDirectory)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_getZipEntry(PORTLIB, zipFile,entry, filename, findDirectory);
+}
+
+I_32 VMCALL 
+hyzip_getZipEntryExtraField(VMInterface * vmi, struct HyZipFile * zipFile, struct HyZipEntry * entry, U_8 * buffer, U_32 bufferSize)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_getZipEntryExtraField(PORTLIB, zipFile, entry, buffer, bufferSize);
+}
+
+void VMCALL
+hyzip_initZipEntry(VMInterface * vmi, struct HyZipEntry * entry)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	zip_initZipEntry(PORTLIB, entry);
+}
+
+I_32 VMCALL
+hyzip_openZipFile(VMInterface * vmi, char *filename, struct HyZipFile * zipFile)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	
+	HyZipFunctionTable *zipFuncs = (*vmi)->GetZipFunctions(vmi);
+	/* This is a synchonization hole, should probably add a mutex to control setting this variable. */
+	if ( zipFuncs->reserved == NULL ) {
+		zipFuncs->reserved = zipCachePool_new(PORTLIB);
+	}
+	
+	return zip_openZipFile(PORTLIB, filename, zipFile, (HyZipCachePool *)zipFuncs->reserved);
+}
+
+void VMCALL
+hyzip_freeZipEntry(VMInterface * vmi, struct HyZipEntry * entry)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	zip_freeZipEntry(PORTLIB, entry);
+}
+
+I_32 VMCALL
+hyzip_closeZipFile(VMInterface * vmi, struct HyZipFile * zipFile)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_closeZipFile(PORTLIB, zipFile);
+}
+
+I_32 VMCALL
+hyzip_getZipEntryComment(VMInterface * vmi, struct HyZipFile * zipFile, struct HyZipEntry * entry, U_8 * buffer, U_32 bufferSize) 
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return zip_getZipEntryComment(PORTLIB, zipFile, entry, buffer, bufferSize);
+}
+
+UDATA VMCALL
+hyzipCache_findElement(struct HyZipCache * zipCache, const char *elementName, BOOLEAN searchDirList)
+{
+	return zipCache_findElement(zipCache, elementName, searchDirList);
+}
+
+void VMCALL
+hyzipCache_kill(struct HyZipCache * zipCache)
+{
+	zipCache_kill(zipCache);
+}
+
+IDATA VMCALL
+hyzipCache_enumGetDirName(void *handle, char *nameBuf, UDATA nameBufSize)
+{
+	return zipCache_enumGetDirName(handle, nameBuf, nameBufSize);
+}
+
+struct HyZipCache *VMCALL 
+hyzipCache_new(VMInterface * vmi, char *zipName, IDATA zipNameLength)
+{
+	PORT_ACCESS_FROM_VMI(vmi);
+	return (struct HyZipCache *)zipCache_new(PORTLIB, zipName, zipNameLength);
+}
+
+IDATA VMCALL
+hyzipCache_enumNew(struct HyZipCache * zipCache, char *directoryName, void **handle)
+{
+	return zipCache_enumNew(zipCache, directoryName, handle);
+}
+	
+IDATA VMCALL 
+hyzipCache_enumElement(void *handle, char *nameBuf, UDATA nameBufSize, UDATA * offset)
+{
+	return zipCache_enumElement(handle, nameBuf, nameBufSize, offset);
+}
+
+void VMCALL
+hyzipCache_enumKill(void *handle)
+{
+	zipCache_enumKill(handle);
+}
+
+BOOLEAN VMCALL
+hyzipCache_addElement(struct HyZipCache * zipCache, char *elementName, UDATA elementOffset)
+{
+	return zipCache_addElement(zipCache, elementName, elementOffset);
+}
+
+void * VMCALL
+hyzip_zalloc(void *opaque, U_32 items, U_32 size)
+{
+	PORT_ACCESS_FROM_VMI (((VMInterface *) opaque));
+
+	return hymem_allocate_memory (items * size);
+}
+
+void VMCALL 
+hyzip_zfree(void *opaque, void *address)
+{
+	PORT_ACCESS_FROM_VMI ((VMInterface *) opaque);
+
+	hymem_free_memory (address);
+
+}
+
+HyZipFunctionTable HyZipLibraryTable = {
+	hyzip_getZipEntryData,
+	hyzip_getZipEntryFromOffset,
+	hyzip_establishCache,
+	hyzip_resetZipFile,
+	hyzip_getNextZipEntry,
+	hyzip_getZipEntry,
+	hyzip_getZipEntryExtraField,
+	hyzip_initZipEntry,
+	hyzip_openZipFile,
+	hyzip_freeZipEntry,
+	hyzip_closeZipFile,
+	hyzip_getZipEntryComment,
+	hyzipCache_findElement,
+	hyzipCache_kill,
+	hyzipCache_enumGetDirName,
+	hyzipCache_new,
+	hyzipCache_enumNew,
+	hyzipCache_enumElement,
+	hyzipCache_enumKill,
+	hyzipCache_addElement,
+	hyzip_zalloc,
+	hyzip_zfree,
+	NULL
+};

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+#
+# Note to developers:
+#
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+#
+# Note to translators:
+#
+# This file uses printf style substitutions. Sequences such as %s, %.*s, %10d
+# etc. will be subsituted at runtime. The special case of %% is not a substitution.
+# It indicates a single percent sign. Please do not modify the format specifiers, or 
+# change their order. For instance, in a message like "from %d to %s", %d
+# MUST appear before %s in any translated message, or a run-time crash
+# could occur. This is a known limitation of the product.
+#
+# NLS_MESSAGEFORMAT_NONE
+#
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Unable to open %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Unable to open %s (Missing export)
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ca.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ca.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ca.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ca.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=No es pot obrir %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=No es pot obrir %s (falta l'exportaci\u00f3)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_cs.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_cs.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_cs.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_cs.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Nelze otev\u0159\u00edt %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Nelze otev\u0159\u00edt %s (chyb\u011bj\u00edc\u00ed export)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_de.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_de.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_de.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_de.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=%1$s kann nicht ge\u00f6ffnet werden (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=%s kann nicht ge\u00f6ffnet werden (fehlender Export).
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_es.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_es.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_es.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_es.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=No se puede abrir %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=No se puede abrir %s (falta la exportaci\u00f3n)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_fr.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_fr.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_fr.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_fr.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Impossible d'ouvrir %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Impossible d'ouvrir %s (export manquant)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_hu.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_hu.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_hu.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_hu.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=%1$s nem nyithat\u00f3 meg (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=%s nem nyithat\u00f3 meg (export hi\u00e1nyzik)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_it.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_it.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_it.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_it.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Impossibile aprire %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Impossibile aprire %s (Esportazione mancante)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ja.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ja.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ja.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ja.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=%1$s \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093 (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=%s \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093 (\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ko.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ko.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ko.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ko.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=%1$s\uc744(\ub97c) \uc5f4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(%2$s).
+
+HYNLS_ZIP_MISSING_EXPORT=%s\uc744(\ub97c) \uc5f4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(\ub0b4\ubcf4\ub0b4\uae30 \ub204\ub77d).
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pl.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pl.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pl.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pl.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Nie mo\u017cna otworzy\u0107 %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Nie mo\u017cna otworzy\u0107 %s (Brakuje eksportu)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pt_BR.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pt_BR.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pt_BR.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_pt_BR.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Imposs\u00edvel abrir %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Imposs\u00edvel abrir %s (Exporta\u00e7\u00e3o ausente)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ru.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ru.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ru.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_ru.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043a\u0440\u044b\u0442\u044c %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043a\u0440\u044b\u0442\u044c %s (\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u044d\u043a\u0441\u043f\u043e\u0440\u0442)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sk.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sk.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sk.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sk.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=%1$s sa ned\u00e1 otvori\u0165 (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=%s sa ned\u00e1 otvori\u0165 (ch\u00fdba export)
+
+
+

Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sl.nls
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sl.nls?view=auto&rev=539793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sl.nls (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/hyzip_sl.nls Sat May 19 12:22:00 2007
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Externalised messages for the VM components of the JCL module.
+# New messages MUST be added at the end of this file.
+# DO NOT delete messages from this file, as it will change their indices.
+# If you wish to remove a message, delete its text, but leave the key in place
+# NLS_MESSAGEFORMAT_NONE
+
+HYNLS.MODULE=ZIPS
+HYNLS.HEADER=hyzipnls.h
+
+# first argument is the name of the zip DLL
+# second argument is a platform error message
+HYNLS_ZIP_UNABLE_TO_OPEN_ZIP_DLL=Ni mogo\u010de odpreti %1$s (%2$s)
+
+HYNLS_ZIP_MISSING_EXPORT=Ni mogo\u010de odpreti %s (manjkajo\u010di izvoz)
+
+
+



Mime
View raw message