You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2011/04/15 14:49:41 UTC
svn commit: r1092688 - in /commons/sandbox/runtime/trunk/src/main:
java/org/apache/commons/runtime/ java/org/apache/commons/runtime/exception/
java/org/apache/commons/runtime/platform/linux/
java/org/apache/commons/runtime/platform/unix/ java/org/apach...
Author: mturk
Date: Fri Apr 15 12:49:40 2011
New Revision: 1092688
URL: http://svn.apache.org/viewvc?rev=1092688&view=rev
Log:
Do not use separate exception package
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AlreadyExistsException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/AlreadyExistsException.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ClosedDescriptorException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/ClosedDescriptorException.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/InvalidDescriptorException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/InvalidDescriptorException.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/NoSuchObjectException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/NoSuchObjectException.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/SystemException.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/TimeoutException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/TimeoutException.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/UnsupportedOperatingSystemException.java
- copied, changed from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/UnsupportedOperatingSystemException.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Mutex.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MutexImpl.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Native.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Semaphore.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SemaphoreImpl.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/linux/SELinux.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/FcntlMutex.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/Posix.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutex.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutexImpl.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphore.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphoreImpl.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/SysVMutex.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Win32.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutex.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutexImpl.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphore.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphoreImpl.java
commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AlreadyExistsException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/AlreadyExistsException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AlreadyExistsException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AlreadyExistsException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/AlreadyExistsException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/AlreadyExistsException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AlreadyExistsException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
/**
* AlreadyExistsException thrown when an attempt is made to
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ClosedDescriptorException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/ClosedDescriptorException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ClosedDescriptorException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ClosedDescriptorException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/ClosedDescriptorException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/ClosedDescriptorException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ClosedDescriptorException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
import java.io.IOException;
/**
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/InvalidDescriptorException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/InvalidDescriptorException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/InvalidDescriptorException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/InvalidDescriptorException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/InvalidDescriptorException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/InvalidDescriptorException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/InvalidDescriptorException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
import java.io.IOException;
/**
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java Fri Apr 15 12:49:40 2011
@@ -16,7 +16,6 @@
package org.apache.commons.runtime;
-import org.apache.commons.runtime.exception.UnsupportedOperatingSystemException;
import org.apache.commons.runtime.util.Utils;
import java.io.File;
import java.net.URL;
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Mutex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Mutex.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Mutex.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Mutex.java Fri Apr 15 12:49:40 2011
@@ -15,8 +15,6 @@
*/
package org.apache.commons.runtime;
-import org.apache.commons.runtime.exception.SystemException;
-
/**
* Mutex class.
* <p>
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MutexImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MutexImpl.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MutexImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MutexImpl.java Fri Apr 15 12:49:40 2011
@@ -15,10 +15,6 @@
*/
package org.apache.commons.runtime;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.SystemException;
-
/**
* MutexImpl class.
* <p>
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Native.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Native.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Native.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Native.java Fri Apr 15 12:49:40 2011
@@ -16,8 +16,6 @@
package org.apache.commons.runtime;
-import org.apache.commons.runtime.exception.UnsupportedOperatingSystemException;
-
/**
* Native library management.
*
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/NoSuchObjectException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/NoSuchObjectException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/NoSuchObjectException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/NoSuchObjectException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/NoSuchObjectException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/NoSuchObjectException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/NoSuchObjectException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
/**
* NoSuchObjectException thrown when an attempt is made to
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Semaphore.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Semaphore.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Semaphore.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Semaphore.java Fri Apr 15 12:49:40 2011
@@ -15,8 +15,6 @@
*/
package org.apache.commons.runtime;
-import org.apache.commons.runtime.exception.SystemException;
-
/**
* Semaphore class.
* <p>
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SemaphoreImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SemaphoreImpl.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SemaphoreImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SemaphoreImpl.java Fri Apr 15 12:49:40 2011
@@ -15,10 +15,6 @@
*/
package org.apache.commons.runtime;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.SystemException;
-
/**
* SemaphoreImpl class.
* <p>
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/SystemException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/SystemException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/SystemException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
/**
* SystemException
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/TimeoutException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/TimeoutException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/TimeoutException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/TimeoutException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/TimeoutException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/TimeoutException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/TimeoutException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
import java.io.IOException;
/**
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/UnsupportedOperatingSystemException.java (from r1092684, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/UnsupportedOperatingSystemException.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/UnsupportedOperatingSystemException.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/UnsupportedOperatingSystemException.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/UnsupportedOperatingSystemException.java&r1=1092684&r2=1092688&rev=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/exception/UnsupportedOperatingSystemException.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/UnsupportedOperatingSystemException.java Fri Apr 15 12:49:40 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.exception;
+package org.apache.commons.runtime;
/** UnsupportedOperatingSystemException
*
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/linux/SELinux.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/linux/SELinux.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/linux/SELinux.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/linux/SELinux.java Fri Apr 15 12:49:40 2011
@@ -16,8 +16,8 @@
package org.apache.commons.runtime.platform.linux;
-import org.apache.commons.runtime.exception.SystemException;
-import org.apache.commons.runtime.exception.UnsupportedOperatingSystemException;
+import org.apache.commons.runtime.SystemException;
+import org.apache.commons.runtime.UnsupportedOperatingSystemException;
/**
* Security-Enhanced Linux support.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/FcntlMutex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/FcntlMutex.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/FcntlMutex.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/FcntlMutex.java Fri Apr 15 12:49:40 2011
@@ -17,10 +17,10 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Mutex;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.ClosedDescriptorException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.ClosedDescriptorException;
+import org.apache.commons.runtime.SystemException;
/**
* FcntlMutex class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/Posix.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/Posix.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/Posix.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/Posix.java Fri Apr 15 12:49:40 2011
@@ -16,10 +16,10 @@
package org.apache.commons.runtime.platform.unix;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.ClosedDescriptorException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.ClosedDescriptorException;
+import org.apache.commons.runtime.SystemException;
/**
* Posix Api class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutex.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutex.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutex.java Fri Apr 15 12:49:40 2011
@@ -17,8 +17,8 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Mutex;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.SystemException;
/**
* PosixMutex class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutexImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutexImpl.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutexImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixMutexImpl.java Fri Apr 15 12:49:40 2011
@@ -18,9 +18,9 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Mutex;
import org.apache.commons.runtime.MutexImpl;
import org.apache.commons.runtime.MutexType;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.SystemException;
/**
* Posix MutexImpl class.
@@ -37,11 +37,11 @@ final class PosixMutexImpl extends Mutex
// No Instance
}
- private static native int getdefault0();
+ private static native int dt0();
private static final MutexType mtype;
static
{
- mtype = MutexType.valueOf(getdefault0());
+ mtype = MutexType.valueOf(dt0());
}
public Mutex create(MutexType type, String name)
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphore.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphore.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphore.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphore.java Fri Apr 15 12:49:40 2011
@@ -17,10 +17,10 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Semaphore;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.ClosedDescriptorException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.ClosedDescriptorException;
+import org.apache.commons.runtime.SystemException;
/**
* PosixSemaphore class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphoreImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphoreImpl.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphoreImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/PosixSemaphoreImpl.java Fri Apr 15 12:49:40 2011
@@ -17,9 +17,9 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Semaphore;
import org.apache.commons.runtime.SemaphoreImpl;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.SystemException;
/**
* SemaphoreImpl class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/SysVMutex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/SysVMutex.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/SysVMutex.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/unix/SysVMutex.java Fri Apr 15 12:49:40 2011
@@ -17,8 +17,8 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Mutex;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.SystemException;
/**
* SysVMutex class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Win32.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Win32.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Win32.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Win32.java Fri Apr 15 12:49:40 2011
@@ -17,10 +17,10 @@
package org.apache.commons.runtime.platform.windows;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.ClosedDescriptorException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.ClosedDescriptorException;
+import org.apache.commons.runtime.SystemException;
/**
* Win32 API class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutex.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutex.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutex.java Fri Apr 15 12:49:40 2011
@@ -17,10 +17,10 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Mutex;
import org.apache.commons.runtime.Status;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.ClosedDescriptorException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.ClosedDescriptorException;
+import org.apache.commons.runtime.SystemException;
/**
* WindowsMutex class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutexImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutexImpl.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutexImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsMutexImpl.java Fri Apr 15 12:49:40 2011
@@ -18,9 +18,9 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Mutex;
import org.apache.commons.runtime.MutexImpl;
import org.apache.commons.runtime.MutexType;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.SystemException;
/**
* Windows MutexImpl class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphore.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphore.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphore.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphore.java Fri Apr 15 12:49:40 2011
@@ -16,10 +16,10 @@
package org.apache.commons.runtime.platform.windows;
import org.apache.commons.runtime.Semaphore;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.ClosedDescriptorException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.ClosedDescriptorException;
+import org.apache.commons.runtime.SystemException;
/**
* WindowsSemaphore class.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphoreImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphoreImpl.java?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphoreImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/WindowsSemaphoreImpl.java Fri Apr 15 12:49:40 2011
@@ -17,9 +17,9 @@ package org.apache.commons.runtime.platf
import org.apache.commons.runtime.Semaphore;
import org.apache.commons.runtime.SemaphoreImpl;
-import org.apache.commons.runtime.exception.AlreadyExistsException;
-import org.apache.commons.runtime.exception.NoSuchObjectException;
-import org.apache.commons.runtime.exception.SystemException;
+import org.apache.commons.runtime.AlreadyExistsException;
+import org.apache.commons.runtime.NoSuchObjectException;
+import org.apache.commons.runtime.SystemException;
/**
* WindowsSemaphoreImpl class.
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c?rev=1092688&r1=1092687&r2=1092688&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c Fri Apr 15 12:49:40 2011
@@ -45,7 +45,7 @@
# error "Cannot have multiple mutex types"
# else
# undef _DEFAULT_MUTEX_TYPE
-# define _DEFAULT_MUTEX_TYPE 1
+# define _DEFAULT_MUTEX_TYPE 2
# endif
#endif
#if defined(USE_FCNTL_MUTEX)
@@ -60,10 +60,6 @@
# error "Mutex type not configured"
#endif
-#define _PR_MUTEX_OWNER 0x00010000
-#if HAVE_POSIX_SEMAPHORE
-static volatile unsigned int _proc_mutex_counter = 1;
-#endif
#if !HAVE_UNION_SEMUN
union semun {
int val;
@@ -78,7 +74,8 @@ typedef struct semblock_t {
acr_uint32_t value; /* Maximum semaphore value */
} semblock_t;
-ACR_UNX_EXPORT(jint, PosixMutexImpl, getdefault0)(JNI_STDARGS)
+ACR_UNX_EXPORT(jint, PosixMutexImpl, dt0)(JNI_STDARGS)
{
return _DEFAULT_MUTEX_TYPE;
}
+