[libjnr-posix-java] 01/02: Merge tag 'upstream/3.0.10'
Tim Potter
tpot-guest at moszumanska.debian.org
Tue Apr 7 04:06:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
tpot-guest pushed a commit to branch master
in repository libjnr-posix-java.
commit 3eaa4f25ead1aaa91c5dba16d13b1702b63a31b1
Merge: c147a17 36a5950
Author: Tim Potter <tpot at hp.com>
Date: Tue Apr 7 13:42:42 2015 +1000
Merge tag 'upstream/3.0.10'
Conflicts:
.gitignore
pom.xml
.gitignore | 5 +-
.hgignore | 13 -
.travis.yml | 7 +
README.txt | 2 +-
build.xml | 100 --
nbproject/build-impl.xml | 1069 --------------------
nbproject/genfiles.properties | 8 -
nbproject/private/private.properties.tmpl | 2 -
nbproject/private/private.xml | 4 -
nbproject/project.properties | 78 --
nbproject/project.xml | 34 -
pom.xml | 99 +-
src/main/java/jnr/posix/AixFileStat.java | 135 +++
.../java/jnr/posix/AixLibC.java} | 21 +-
.../java/jnr/posix/AixPOSIX.java} | 45 +-
.../java/jnr/posix/AixPasswd.java} | 73 +-
src/main/java/jnr/posix/BaseCmsgHdr.java | 50 +
.../java/jnr/posix/BaseFileStat.java} | 15 +-
src/main/java/jnr/posix/BaseIovec.java | 70 ++
src/main/java/jnr/posix/BaseMsgHdr.java | 149 +++
src/main/java/jnr/posix/BaseNativePOSIX.java | 685 +++++++++++++
src/main/java/jnr/posix/CheckedPOSIX.java | 469 +++++++++
src/main/java/jnr/posix/CmsgHdr.java | 24 +
.../java/jnr}/posix/DefaultNativeGroup.java | 54 +-
.../java/jnr}/posix/DefaultNativeTimeval.java | 6 +-
.../ext => main/java/jnr}/posix/FileStat.java | 2 +-
src/main/java/jnr/posix/FileTime.java | 12 +
src/main/java/jnr/posix/FreeBSDFileStat.java | 127 +++
.../ext => main/java/jnr}/posix/FreeBSDPOSIX.java | 37 +-
.../ext => main/java/jnr}/posix/FreeBSDPasswd.java | 61 +-
.../jruby/ext => main/java/jnr}/posix/Group.java | 2 +-
src/main/java/jnr/posix/HANDLE.java | 46 +
src/main/java/jnr/posix/Iovec.java | 12 +
.../ext => main/java/jnr}/posix/JavaFileStat.java | 4 +-
src/main/java/jnr/posix/JavaLibCHelper.java | 436 ++++++++
.../ext => main/java/jnr}/posix/JavaPOSIX.java | 304 +++++-
.../ext => main/java/jnr}/posix/JavaPasswd.java | 2 +-
.../java/jnr}/posix/JavaSecuredFile.java | 2 +-
src/main/java/jnr/posix/JavaTimes.java | 22 +
.../ext => main/java/jnr}/posix/LazyPOSIX.java | 200 +++-
.../jruby/ext => main/java/jnr}/posix/LibC.java | 58 +-
.../ext => main/java/jnr}/posix/LibCProvider.java | 2 +-
src/main/java/jnr/posix/LinuxCmsgHdr.java | 70 ++
src/main/java/jnr/posix/LinuxFileStat32.java | 125 +++
src/main/java/jnr/posix/LinuxFileStat64.java | 90 ++
.../ext => main/java/jnr}/posix/LinuxLibC.java | 12 +-
src/main/java/jnr/posix/LinuxMsgHdr.java | 149 +++
src/main/java/jnr/posix/LinuxPOSIX.java | 175 ++++
src/main/java/jnr/posix/LinuxPasswd.java | 57 ++
src/main/java/jnr/posix/LinuxSocketMacros.java | 29 +
src/main/java/jnr/posix/MacOSCmsgHdr.java | 69 ++
src/main/java/jnr/posix/MacOSFileStat.java | 124 +++
src/main/java/jnr/posix/MacOSMsgHdr.java | 151 +++
src/main/java/jnr/posix/MacOSPOSIX.java | 39 +
src/main/java/jnr/posix/MacOSPasswd.java | 74 ++
src/main/java/jnr/posix/MacOSSocketMacros.java | 27 +
src/main/java/jnr/posix/MsgHdr.java | 25 +
src/main/java/jnr/posix/NativeGroup.java | 12 +
src/main/java/jnr/posix/NativePOSIX.java | 15 +
src/main/java/jnr/posix/NativePasswd.java | 12 +
src/main/java/jnr/posix/NativeTimes.java | 51 +
src/main/java/jnr/posix/OpenBSDFileStat.java | 123 +++
.../ext => main/java/jnr}/posix/OpenBSDPOSIX.java | 46 +-
.../ext => main/java/jnr}/posix/OpenBSDPasswd.java | 58 +-
.../java/jnr/posix/OpenBSDTimeval.java} | 10 +-
src/main/java/jnr/posix/POSIX.java | 150 +++
src/main/java/jnr/posix/POSIXFactory.java | 230 +++++
.../java/jnr}/posix/POSIXFunctionMapper.java | 4 +-
.../ext => main/java/jnr}/posix/POSIXHandler.java | 5 +-
src/main/java/jnr/posix/POSIXTypeMapper.java | 70 ++
.../jruby/ext => main/java/jnr}/posix/Passwd.java | 2 +-
src/main/java/jnr/posix/SignalHandler.java | 5 +
src/main/java/jnr/posix/SimpleFunctionMapper.java | 31 +
src/main/java/jnr/posix/SocketMacros.java | 12 +
src/main/java/jnr/posix/SolarisFileStat32.java | 92 ++
src/main/java/jnr/posix/SolarisFileStat64.java | 93 ++
src/main/java/jnr/posix/SolarisLibC.java | 4 +
src/main/java/jnr/posix/SolarisPOSIX.java | 46 +
src/main/java/jnr/posix/SolarisPasswd.java | 59 ++
src/main/java/jnr/posix/SpawnAttribute.java | 99 ++
src/main/java/jnr/posix/SpawnFileAction.java | 73 ++
src/main/java/jnr/posix/Times.java | 9 +
src/main/java/jnr/posix/Timeval.java | 10 +
.../ext => main/java/jnr}/posix/UTimBuf64.java | 7 +-
src/main/java/jnr/posix/UnixLibC.java | 37 +
src/main/java/jnr/posix/WString.java | 42 +
.../java/jnr}/posix/WindowsChildRecord.java | 12 +-
src/main/java/jnr/posix/WindowsFileStat.java | 169 ++++
src/main/java/jnr/posix/WindowsLibC.java | 103 ++
.../ext => main/java/jnr}/posix/WindowsPOSIX.java | 231 +++--
.../java/jnr/posix/WindowsProcessInformation.java | 33 +
.../java/jnr}/posix/WindowsSecurityAttributes.java | 12 +-
src/main/java/jnr/posix/WindowsStartupInfo.java | 51 +
.../ext => main/java/jnr}/posix/util/Chmod.java | 3 +-
.../java/jnr/posix/util/DefaultPOSIXHandler.java | 74 ++
.../ext => main/java/jnr}/posix/util/ExecIt.java | 16 +-
.../java/jnr}/posix/util/FieldAccess.java | 2 +-
.../ext => main/java/jnr}/posix/util/Finder.java | 45 +-
.../java/jnr/posix/util/Java5ProcessMaker.java | 160 +++
src/main/java/jnr/posix/util/JavaCrypt.java | 232 +++++
src/main/java/jnr/posix/util/MethodName.java | 25 +
.../ext => main/java/jnr}/posix/util/Platform.java | 9 +-
src/main/java/jnr/posix/util/ProcessMaker.java | 103 ++
.../java/jnr}/posix/util/WindowsHelpers.java | 38 +-
src/org/jruby/ext/posix/BaseNativePOSIX.java | 330 ------
src/org/jruby/ext/posix/FileTime.java | 8 -
src/org/jruby/ext/posix/FreeBSDHeapFileStat.java | 119 ---
src/org/jruby/ext/posix/JavaLibCHelper.java | 228 -----
src/org/jruby/ext/posix/Linux64HeapFileStat.java | 83 --
src/org/jruby/ext/posix/LinuxHeapFileStat.java | 114 ---
src/org/jruby/ext/posix/LinuxPOSIX.java | 129 ---
src/org/jruby/ext/posix/LinuxPasswd.java | 48 -
src/org/jruby/ext/posix/MacOSHeapFileStat.java | 116 ---
src/org/jruby/ext/posix/MacOSPOSIX.java | 41 -
src/org/jruby/ext/posix/MacOSPasswd.java | 64 --
src/org/jruby/ext/posix/NativeGroup.java | 6 -
src/org/jruby/ext/posix/NativePasswd.java | 7 -
src/org/jruby/ext/posix/OpenBSDHeapFileStat.java | 119 ---
src/org/jruby/ext/posix/POSIX.java | 78 --
src/org/jruby/ext/posix/POSIXFactory.java | 143 ---
src/org/jruby/ext/posix/POSIXTypeMapper.java | 41 -
src/org/jruby/ext/posix/Solaris64FileStat.java | 83 --
src/org/jruby/ext/posix/SolarisHeapFileStat.java | 88 --
src/org/jruby/ext/posix/SolarisLibC.java | 4 -
src/org/jruby/ext/posix/SolarisPOSIX.java | 59 --
src/org/jruby/ext/posix/SolarisPasswd.java | 49 -
src/org/jruby/ext/posix/Timeval.java | 7 -
src/org/jruby/ext/posix/WindowsFileStat.java | 157 ---
src/org/jruby/ext/posix/WindowsLibC.java | 80 --
.../jruby/ext/posix/WindowsLibCFunctionMapper.java | 33 -
.../jruby/ext/posix/WindowsProcessInformation.java | 33 -
src/org/jruby/ext/posix/WindowsStartupInfo.java | 51 -
src/test/java/jnr/posix/DTableSizeTest.java | 22 +
.../test/java/jnr}/posix/DummyPOSIXHandler.java | 8 +-
src/test/java/jnr/posix/FileStatTest.java | 112 ++
src/test/java/jnr/posix/FileTest.java | 305 ++++++
src/test/java/jnr/posix/GroupTest.java | 83 ++
src/test/java/jnr/posix/HANDLETest.java | 57 ++
.../ext => src/test/java/jnr}/posix/IDTest.java | 2 +-
src/test/java/jnr/posix/IOTest.java | 208 ++++
.../test/java/jnr}/posix/JavaFileStatTest.java | 5 +-
.../test/java/jnr}/posix/JavaPOSIXTest.java | 49 +-
.../test/java/jnr}/posix/PasswdTest.java | 26 +-
src/test/java/jnr/posix/ProcessTest.java | 38 +
src/test/java/jnr/posix/SignalTest.java | 63 ++
src/test/java/jnr/posix/SpawnTest.java | 201 ++++
.../jnr/posix/util/DefaultPOSIXHandlerTest.java | 25 +
.../test/java/jnr}/posix/util/PlatformTest.java | 3 +-
.../java/jnr/posix/util/WindowsHelpersTest.java} | 33 +-
test/org/jruby/ext/posix/FileStatTest.java | 59 --
test/org/jruby/ext/posix/FileTest.java | 59 --
test/org/jruby/ext/posix/GroupTest.java | 74 --
test/org/jruby/ext/posix/HeapStructTest.java | 81 --
153 files changed, 8001 insertions(+), 4317 deletions(-)
diff --cc .gitignore
index 9f92bbd,11c8642..9e70d08
--- a/.gitignore
+++ b/.gitignore
@@@ -7,4 -9,5 +9,5 @@@ buil
dist
target
lib/nblibraries-private.properties
- .pc
+ /nbproject/
-/.redcar/
++/.redcar/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjnr-posix-java.git
More information about the pkg-java-commits
mailing list