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/05/07 21:47:44 UTC
svn commit: r1100607 - in /commons/sandbox/runtime/trunk/src/main:
java/org/apache/commons/runtime/net/ java/org/apache/commons/runtime/util/
native/shared/ test/org/apache/commons/runtime/
Author: mturk
Date: Sat May 7 19:47:43 2011
New Revision: 1100607
URL: http://svn.apache.org/viewvc?rev=1100607&view=rev
Log:
Move java.net.Sockets to util package
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Sockets.java
- copied, changed from r1099854, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/net/Sockets.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/net/Sockets.java
Modified:
commons/sandbox/runtime/trunk/src/main/native/shared/dsock.c
commons/sandbox/runtime/trunk/src/main/native/shared/psock.c
commons/sandbox/runtime/trunk/src/main/native/shared/ssock.c
commons/sandbox/runtime/trunk/src/main/test/org/apache/commons/runtime/TestNetworkImpl.java
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Sockets.java (from r1099854, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/net/Sockets.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Sockets.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Sockets.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/net/Sockets.java&r1=1099854&r2=1100607&rev=1100607&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/net/Sockets.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Sockets.java Sat May 7 19:47:43 2011
@@ -16,7 +16,7 @@
*/
-package org.apache.commons.runtime.net;
+package org.apache.commons.runtime.util;
import java.io.FileDescriptor;
import java.io.IOException;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/dsock.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/dsock.c?rev=1100607&r1=1100606&r2=1100607&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/dsock.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/dsock.c Sat May 7 19:47:43 2011
@@ -56,7 +56,7 @@ ACR_CLASS_DTOR(DatagramSocket)
AcrUnloadClass(env, &_clazzn);
}
-ACR_NET_EXPORT(jobject, Sockets, fd3)(JNI_STDARGS, jobject sock)
+ACR_UTIL_EXPORT(jobject, Sockets, fd3)(JNI_STDARGS, jobject sock)
{
jobject impl = 0;
@@ -96,12 +96,12 @@ AcrGetDatagramSocketFd(JNI_STDARGS)
return -1;
}
-ACR_NET_EXPORT(jint, Sockets, nd3)(JNI_STDARGS, jobject sock)
+ACR_UTIL_EXPORT(jint, Sockets, nd3)(JNI_STDARGS, jobject sock)
{
return AcrGetDatagramSocketFd(env, sock);
}
-ACR_NET_EXPORT(jint, Sockets, sd3)(JNI_STDARGS, jobject sock, jint sd)
+ACR_UTIL_EXPORT(jint, Sockets, sd3)(JNI_STDARGS, jobject sock, jint sd)
{
jobject impl = 0;
jobject fd;
@@ -122,7 +122,7 @@ ACR_NET_EXPORT(jint, Sockets, sd3)(JNI_S
return ACR_EBADF;
}
-ACR_NET_EXPORT(jint, Sockets, nb3)(JNI_STDARGS, jobject sock, jboolean on)
+ACR_UTIL_EXPORT(jint, Sockets, nb3)(JNI_STDARGS, jobject sock, jboolean on)
{
jobject impl = 0;
jobject fd;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/psock.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/psock.c?rev=1100607&r1=1100606&r2=1100607&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/psock.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/psock.c Sat May 7 19:47:43 2011
@@ -57,7 +57,7 @@ ACR_CLASS_DTOR(Socket)
AcrUnloadClass(env, &_clazzn);
}
-ACR_NET_EXPORT(jboolean, Sockets, init0)(JNI_STDARGS)
+ACR_UTIL_EXPORT(jboolean, Sockets, init0)(JNI_STDARGS)
{
ACR_CLASS_LOAD(Socket);
ACR_CLASS_LOAD(SocketImpl);
@@ -67,7 +67,7 @@ ACR_NET_EXPORT(jboolean, Sockets, init0)
return JNI_TRUE;
}
-ACR_NET_EXPORT(jobject, Sockets, fd0)(JNI_STDARGS, jobject sock)
+ACR_UTIL_EXPORT(jobject, Sockets, fd0)(JNI_STDARGS, jobject sock)
{
jobject impl = 0;
@@ -107,12 +107,12 @@ AcrGetSocketFd(JNI_STDARGS)
return -1;
}
-ACR_NET_EXPORT(jint, Sockets, nd0)(JNI_STDARGS, jobject sock)
+ACR_UTIL_EXPORT(jint, Sockets, nd0)(JNI_STDARGS, jobject sock)
{
return AcrGetSocketFd(env, sock);
}
-ACR_NET_EXPORT(jint, Sockets, sd0)(JNI_STDARGS, jobject sock, jint sd)
+ACR_UTIL_EXPORT(jint, Sockets, sd0)(JNI_STDARGS, jobject sock, jint sd)
{
jobject impl = 0;
jobject fd;
@@ -133,7 +133,7 @@ ACR_NET_EXPORT(jint, Sockets, sd0)(JNI_S
return ACR_EBADF;
}
-ACR_NET_EXPORT(jint, Sockets, nb0)(JNI_STDARGS, jobject sock, jboolean on)
+ACR_UTIL_EXPORT(jint, Sockets, nb0)(JNI_STDARGS, jobject sock, jboolean on)
{
jobject impl = 0;
jobject fd;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/ssock.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/ssock.c?rev=1100607&r1=1100606&r2=1100607&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/ssock.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/ssock.c Sat May 7 19:47:43 2011
@@ -56,7 +56,7 @@ ACR_CLASS_DTOR(ServerSocket)
AcrUnloadClass(env, &_clazzn);
}
-ACR_NET_EXPORT(jobject, Sockets, fd1)(JNI_STDARGS, jobject sock)
+ACR_UTIL_EXPORT(jobject, Sockets, fd1)(JNI_STDARGS, jobject sock)
{
jobject impl = 0;
@@ -96,12 +96,12 @@ AcrGetServerSocketFd(JNI_STDARGS)
return -1;
}
-ACR_NET_EXPORT(jint, Sockets, nd1)(JNI_STDARGS, jobject sock)
+ACR_UTIL_EXPORT(jint, Sockets, nd1)(JNI_STDARGS, jobject sock)
{
return AcrGetServerSocketFd(env, sock);
}
-ACR_NET_EXPORT(jint, Sockets, sd1)(JNI_STDARGS, jobject sock, jint sd)
+ACR_UTIL_EXPORT(jint, Sockets, sd1)(JNI_STDARGS, jobject sock, jint sd)
{
jobject impl = 0;
jobject fd;
@@ -122,7 +122,7 @@ ACR_NET_EXPORT(jint, Sockets, sd1)(JNI_S
return ACR_EBADF;
}
-ACR_NET_EXPORT(jint, Sockets, nb1)(JNI_STDARGS, jobject sock, jboolean on)
+ACR_UTIL_EXPORT(jint, Sockets, nb1)(JNI_STDARGS, jobject sock, jboolean on)
{
jobject impl = 0;
jobject fd;
Modified: commons/sandbox/runtime/trunk/src/main/test/org/apache/commons/runtime/TestNetworkImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/test/org/apache/commons/runtime/TestNetworkImpl.java?rev=1100607&r1=1100606&r2=1100607&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/test/org/apache/commons/runtime/TestNetworkImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/test/org/apache/commons/runtime/TestNetworkImpl.java Sat May 7 19:47:43 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.net;
+package org.apache.commons.runtime.util;
import java.io.IOException;
import java.io.File;