Merge branch 'release/1.1.0'

Author: xerial

Makefile

@@ -16,19 +16,27 @@ SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
 
 CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR)
 
+ifeq ($(OS_NAME),SunOS)
+	TAR:= gtar
+else
+	TAR:= tar
+endif
+
 $(SNAPPY_ARCHIVE):
 	@mkdir -p $(@D)
 	curl -o$@ http://snappy.googlecode.com/files/snappy-$(VERSION).tar.gz
 
 $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
-	tar xvfz $< -C $(TARGET)	
+	$(TAR) xvfz $< -C $(TARGET)	
 	touch $@
 
 jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
 
-
-$(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java
+$(TARGET)/classes/org/xerial/snappy/SnappyNative.class : $(SRC)/org/xerial/snappy/SnappyNative.java
 	@mkdir -p $(TARGET)/classes
+	$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/classes -sourcepath $(SRC) $< 
+
+$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/classes/org/xerial/snappy/SnappyNative.class
 	$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
 
 bytecode: src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode
@@ -86,16 +94,16 @@ win32:
 
 # for cross-compilation on Ubuntu, install the g++-mingw-w64-x86-64 package
 win64:
-	$(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=amd64
+	$(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=x86_64
 
 mac32: 
-	$(MAKE) native OS_NAME=Mac OS_ARCH=i386
+	$(MAKE) native OS_NAME=Mac OS_ARCH=x86
 
 linux32:
-	$(MAKE) native OS_NAME=Linux OS_ARCH=i386
+	$(MAKE) native OS_NAME=Linux OS_ARCH=x86
 
 freebsd64:
-	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64
+	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64
 
 # for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
 linux-arm:
@@ -106,7 +114,7 @@ linux-armhf:
 	$(MAKE) native CROSS_PREFIX=arm-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armhf
 
 clean-native-linux32:
-	$(MAKE) clean-native OS_NAME=Linux OS_ARCH=i386
+	$(MAKE) clean-native OS_NAME=Linux OS_ARCH=x86
 
 clean-native-win32:
 	$(MAKE) clean-native OS_NAME=Windows OS_ARCH=x86

Makefile.common

@@ -33,15 +33,15 @@ endif
 snappy := snappy-$(VERSION)
 
 
-jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h)
+jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h | head -1)
 ifneq ($(jni_md),)
 jni_include := $(shell dirname "$(jni_md)")
 endif
 
 
 # os=Default is meant to be generic unix/linux
 
-known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 Windows-x86 Windows-amd64
+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc
 os_arch := $(OS_NAME)-$(OS_ARCH)
 
 ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs)))
@@ -58,19 +58,33 @@ Default_LINKFLAGS    := -shared -static
 Default_LIBNAME      := libsnappyjava.so
 Default_SNAPPY_FLAGS := 
 
-Linux-i386_CXX       := $(CROSS_PREFIX)g++
-Linux-i386_STRIP     := $(CROSS_PREFIX)strip
-Linux-i386_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32
-Linux-i386_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-Linux-i386_LIBNAME   := libsnappyjava.so
-Linux-i386_SNAPPY_FLAGS:= 
-
-Linux-amd64_CXX       := $(CROSS_PREFIX)g++ 
-Linux-amd64_STRIP     := $(CROSS_PREFIX)strip
-Linux-amd64_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64
-Linux-amd64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-Linux-amd64_LIBNAME   := libsnappyjava.so
-Linux-amd64_SNAPPY_FLAGS  := 
+Linux-x86_CXX       := $(CROSS_PREFIX)g++
+Linux-x86_STRIP     := $(CROSS_PREFIX)strip
+Linux-x86_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32
+Linux-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-x86_LIBNAME   := libsnappyjava.so
+Linux-x86_SNAPPY_FLAGS:= 
+
+Linux-x86_64_CXX       := $(CROSS_PREFIX)g++ 
+Linux-x86_64_STRIP     := $(CROSS_PREFIX)strip
+Linux-x86_64_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64
+Linux-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-x86_64_LIBNAME   := libsnappyjava.so
+Linux-x86_64_SNAPPY_FLAGS  := 
+
+SunOS-x86_CXX       := g++ 
+SunOS-x86_STRIP     := strip
+SunOS-x86_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden
+SunOS-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+SunOS-x86_LIBNAME   := libsnappyjava.so
+SunOS-x86_SNAPPY_FLAGS  := 
+
+SunOS-sparc_CXX       := g++ 
+SunOS-sparc_STRIP     := strip
+SunOS-sparc_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden
+SunOS-sparc_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+SunOS-sparc_LIBNAME   := libsnappyjava.so
+SunOS-sparc_SNAPPY_FLAGS  := 
 
 # '-include lib/inc_linux/jni_md.h' is used to force the use of our version,
 # which defines JNIEXPORT differently; otherwise, since OpenJDK includes
@@ -91,12 +105,12 @@ Linux-armhf_LINKFLAGS := -shared -static-libgcc
 Linux-armhf_LIBNAME   := libsnappyjava.so
 Linux-armhf_SNAPPY_FLAGS:= 
 
-Mac-i386_CXX       := g++ -arch $(OS_ARCH) 
-Mac-i386_STRIP     := strip -x
-Mac-i386_CXXFLAGS  := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden
-Mac-i386_LINKFLAGS := -dynamiclib -static-libgcc
-Mac-i386_LIBNAME   := libsnappyjava.jnilib
-Mac-i386_SNAPPY_FLAGS  :=
+Mac-x86_CXX       := g++ -arch i386
+Mac-x86_STRIP     := strip -x
+Mac-x86_CXXFLAGS  := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden
+Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc
+Mac-x86_LIBNAME   := libsnappyjava.jnilib
+Mac-x86_SNAPPY_FLAGS  :=
 
 Mac-x86_64_CXX       := g++ -arch $(OS_ARCH) 
 Mac-x86_64_STRIP     := strip -x
@@ -105,12 +119,12 @@ Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc
 Mac-x86_64_LIBNAME   := libsnappyjava.jnilib 
 Mac-x86_64_SNAPPY_FLAGS  := 
 
-FreeBSD-amd64_CXX          := $(CROSS_PREFIX)g++
-FreeBSD-amd64_STRIP        := $(CROSS_PREFIX)strip
-FreeBSD-amd64_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
-FreeBSD-amd64_LINKFLAGS    := -shared -static-libgcc
-FreeBSD-amd64_LIBNAME      := libsnappyjava.so
-FreeBSD-amd64_SNAPPY_FLAGS := 
+FreeBSD-x86_64_CXX          := $(CROSS_PREFIX)g++
+FreeBSD-x86_64_STRIP        := $(CROSS_PREFIX)strip
+FreeBSD-x86_64_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
+FreeBSD-x86_64_LINKFLAGS    := -shared -static-libgcc
+FreeBSD-x86_64_LIBNAME      := libsnappyjava.so
+FreeBSD-x86_64_SNAPPY_FLAGS := 
 
 Windows-x86_CXX          := $(CROSS_PREFIX)g++
 Windows-x86_STRIP        := $(CROSS_PREFIX)strip
@@ -119,12 +133,12 @@ Windows-x86_LINKFLAGS    := -Wl,--kill-at -shared -static
 Windows-x86_LIBNAME      := snappyjava.dll
 Windows-x86_SNAPPY_FLAGS := 
 
-Windows-amd64_CXX          := $(CROSS_PREFIX)g++
-Windows-amd64_STRIP        := $(CROSS_PREFIX)strip
-Windows-amd64_CXXFLAGS     := -Ilib/inc_win -O2 
-Windows-amd64_LINKFLAGS    := -Wl,--kill-at -shared -static 
-Windows-amd64_LIBNAME      := snappyjava.dll
-Windows-amd64_SNAPPY_FLAGS := 
+Windows-x86_64_CXX          := $(CROSS_PREFIX)g++
+Windows-x86_64_STRIP        := $(CROSS_PREFIX)strip
+Windows-x86_64_CXXFLAGS     := -Ilib/inc_win -O2 
+Windows-x86_64_LINKFLAGS    := -Wl,--kill-at -shared -static 
+Windows-x86_64_LIBNAME      := snappyjava.dll
+Windows-x86_64_SNAPPY_FLAGS := 
 
 
 CXX        := $($(os_arch)_CXX)

Milestone.md

@@ -2,6 +2,21 @@
   * `SnappyIndexer` for parallel compression/decompression
   * CUI commands (snap/unsnap)
 
+## snappy-java-1.1.0  (17 October 2013)
+  * Add Snappy framed format support (SnappyFramedInputStream, SnappyFramedOutputStream)
+  * Add SunOS support
+  * Dropped OpenBSD support
+  * OSGi support
+
+## snappy-java-1.1.0-M4 (20 August 2013)
+  * New JNI native code loading mechanism, which does not rely on native code injection.
+  * Add OpenBSD support
+  * Add Framed format support
+  * Recovered 32-bit Mac support
+  * Fixes several issues
+  * Target to Java6 (Java5 will be no longer supported)
+  * Add zero-copy compression, decompression and isValidCompressedData for LArray <https://github.com/xerial/larray>
+
 ## snappy-java-1.1.0-M3 (28 March 2013)
   * Fix linux amd64 build (embed libstdc++)
   * Fixes #26

NOTICE

@@ -1,6 +1,9 @@
 This product includes software developed by Google
  Snappy: http://code.google.com/p/snappy/ (New BSD License)
 
+This product includes software developed by Apache
+ PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/
+ (Apache 2.0 license)
 
 This library containd statically linked libstdc++. This inclusion is allowed by 
 "GCC RUntime Library Exception" 

README.md

@@ -8,6 +8,7 @@ The snappy-java is a Java port of the snappy
      * Although snappy-java uses JNI, it can be used safely with multiple class loaders (e.g. Tomcat, etc.). 
   * Portable across various operating systems; Snappy-java contains native libraries built for Window/Mac/Linux (64-bit). At runtime, snappy-java loads one of these libraries according to your machine environment (It looks system properties, `os.name` and `os.arch`). 
   * Simple usage. Add the snappy-java-(version).jar file to your classpath. Then call compression/decompression methods in org.xerial.snappy.Snappy. 
+  * [Framing-format support](http://snappy.googlecode.com/svn/trunk/framing_format.txt) (Since 1.1.0-SNAPSHOT version)
 
 ## Performance 
   * Snappy's main target is very high-speed compression/decompression with reasonable compression size. So the compression ratio of snappy-java is modest and about the same as `LZF` (ranging 20%-100% according to the dataset).
@@ -24,7 +25,7 @@ The snappy-java is a Java port of the snappy
 ## Download 
 The current stable version is available from here:
   * Release version: http://code.google.com/p/snappy-java/downloads/list
-     * [Release plans](https://github.com/xerial/snappy-java/blob/develop/Milestone.md) 
+     * [Release plans](Milestone.md) 
   * Snapshot version (the latest beta version): https://oss.sonatype.org/content/repositories/snapshots/org/xerial/snappy/snappy-java/
 If you are a Maven user, see [pom.xml example](#using-with-maven).
 
@@ -53,7 +54,7 @@ In addition, high-level methods (`Snappy.compress(String)`, `Snappy.compress(flo
 ### Stream-based API
 Stream-based compressor/decompressor `SnappyOutputStream`/`SnappyInputStream` are also available for reading/writing large data sets.
 
- * [Javadoc API](https://oss.sonatype.org/service/local/repositories/releases/archive/org/xerial/snappy/snappy-java/1.1.0-M3/snappy-java-1.1.0-M3-javadoc.jar/!/index.html)
+ * [Javadoc API](https://oss.sonatype.org/service/local/repositories/releases/archive/org/xerial/snappy/snappy-java/1.1.0/snappy-java-1.1.0-javadoc.jar/!/index.html)
 
 ### Setting classpath
 If you have snappy-java-(VERSION).jar in the current directory, use `-classpath` option as follows:
@@ -90,6 +91,9 @@ See the [installation instruction](https://github.com/xerial/snappy-java/blob/de
     $ cd snappy-java
     $ make
 
+When building on Solaris use
+    
+    $ gmake
 
 A file `target/snappy-java-$(version).jar` is the product additionally containing the native library built for your platform.
 
@@ -125,7 +129,7 @@ If you are using Mac and openjdk7 (or higher), use the following option:
 ## Miscellaneous Notes
 ### Using snappy-java with Tomcat 6 (or higher) Web Server
 
-Simply put the snappy-java's jar to WEB-INF/lib folder of your web application. Usual JNI-library specific problem no longer exists since snappy-java version 1.0.3 or higher can be loaded by multiple class loaders in the same JVM by using native code injection to the parent class loader (Issue 21). 
+Simply put the snappy-java's jar to WEB-INF/lib folder of your web application. Usual JNI-library specific problem no longer exists since snappy-java version 1.0.3 or higher can be loaded by multiple class loaders. 
 
 ----
 Snappy-java is developed by [Taro L. Saito](http://www.xerial.org/leo). Twitter  [@taroleo](http://twitter.com/#!/taroleo)

lib/org/xerial/snappy/OSInfo.class

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xerial.snappy</groupId>
     <artifactId>snappy-java</artifactId>
-    <version>1.1.0-M3</version>
+    <version>1.1.0</version>
     <name>Snappy for Java</name>
     <description>snappy-java: A fast compression/decompression library</description>
     <packaging>bundle</packaging>
@@ -182,12 +182,15 @@
                         <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package>
                         <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                         <Bundle-NativeCode>
-                        	org/xerial/snappy/native/Windows/amd64/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=win32))",
-                        	org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=win32))",
-                        	org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=macosx))",
-                        	org/xerial/snappy/native/Linux/amd64/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86_64)(osgi.os=linux))",
-                        	org/xerial/snappy/native/Linux/i386/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=linux))",
-                        	org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=arm)(osgi.os=linux))"
+                        	org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x86-64,
+                        	org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86,
+                        	org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;osname=macosx;processor=x86,
+                        	org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;osname=macosx;processor=x86-64,
+                        	org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x86-64,
+                        	org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86,
+                        	org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86,
+                        	org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;osname=sunos;processor=sparc,
+                        	org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm
                         </Bundle-NativeCode>
                         <!-- TODO: unsure about ARMHF -->
                     </instructions>
@@ -214,7 +217,7 @@
 					</archive>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -231,7 +234,7 @@
                     </filesets>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2.1</version>
@@ -252,7 +255,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
         </plugins>
 
         <extensions>
@@ -278,30 +281,6 @@
         <url>[email protected]:xerial/snappy-java.git</url>
     </scm>
 
-    <profiles>
-        <!-- for local updates -->
-        <profile>
-            <id>xerial.local</id>
-            <distributionManagement>
-                <repository>
-                    <id>xerial.local</id>
-                    <name>Xerial Maven Repository</name>
-                    <url>file:///home/web/maven.xerial.org/repository/artifact</url>
-                </repository>
-                <snapshotRepository>
-                    <id>xerial.local</id>
-                    <name>Xerial Maven Snapshot Repository</name>
-                    <url>file:///home/web/maven.xerial.org/repository/snapshot</url>
-                    <uniqueVersion>false</uniqueVersion>
-                </snapshotRepository>
-                <site>
-                    <id>xerial.local</id>
-                    <url>file:///home/web/maven.xerial.org/repository/site</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -332,7 +311,7 @@
             <type>jar</type>
             <scope>test</scope>
         </dependency>
-        
+
     </dependencies>
-    
+
 </project>