svn commit: r1140151 - in /commons/sandbox/runtime/trunk/src/main: java/org/apache/commons/runtime/util/ native/ native/include/acr/ native/os/unix/ native/shared/ test/org/apache/commons/runtime/

Mon, 27 Jun 2011 06:16:18 -0700 

Author: mturk
Date: Mon Jun 27 13:15:51 2011
New Revision: 1140151

URL: http://svn.apache.org/viewvc?rev=1140151&view=rev
Log:
Axe java.net.Socket hacks

Removed:
    
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Sockets.java
    commons/sandbox/runtime/trunk/src/main/native/include/acr/socks.h
    commons/sandbox/runtime/trunk/src/main/native/shared/dsock.c
    commons/sandbox/runtime/trunk/src/main/native/shared/dsockimpl.c
    commons/sandbox/runtime/trunk/src/main/native/shared/psock.c
    commons/sandbox/runtime/trunk/src/main/native/shared/psockimpl.c
    commons/sandbox/runtime/trunk/src/main/native/shared/ssock.c
    
commons/sandbox/runtime/trunk/src/main/test/org/apache/commons/runtime/TestSocketUtils.java
Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
    commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
    commons/sandbox/runtime/trunk/src/main/native/os/unix/usock.c
    commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=1140151&r1=1140150&r2=1140151&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Mon Jun 27 
13:15:51 2011
@@ -115,8 +115,6 @@ LIBSOURCES=\
        $(TOPDIR)\shared\debug.c \
        $(TOPDIR)\shared\descriptor.c \
        $(TOPDIR)\shared\directbb.c \
-       $(TOPDIR)\shared\dsock.c \
-       $(TOPDIR)\shared\dsockimpl.c \
        $(TOPDIR)\shared\error.c \
        $(TOPDIR)\shared\iofd.c \
        $(TOPDIR)\shared\memory.c \
@@ -124,8 +122,6 @@ LIBSOURCES=\
        $(TOPDIR)\shared\netaddr.c \
        $(TOPDIR)\shared\netserv.c \
        $(TOPDIR)\shared\pointer.c \
-       $(TOPDIR)\shared\psock.c \
-       $(TOPDIR)\shared\psockimpl.c \
        $(TOPDIR)\shared\object.c \
        $(TOPDIR)\shared\observer.c \
        $(TOPDIR)\shared\reflect.c \
@@ -133,7 +129,6 @@ LIBSOURCES=\
        $(TOPDIR)\shared\select.c \
        $(TOPDIR)\shared\selectkey.c \
        $(TOPDIR)\shared\sliceptr.c \
-       $(TOPDIR)\shared\ssock.c \
        $(TOPDIR)\shared\string.c \
        $(TOPDIR)\shared\system.c \
        $(TOPDIR)\shared\table.c \

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in?rev=1140151&r1=1140150&r2=1140151&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in Mon Jun 27 
13:15:51 2011
@@ -109,8 +109,6 @@ LIBSOURCES=\
        $(TOPDIR)/shared/debug.c \
        $(TOPDIR)/shared/descriptor.c \
        $(TOPDIR)/shared/directbb.c \
-       $(TOPDIR)/shared/dsock.c \
-       $(TOPDIR)/shared/dsockimpl.c \
        $(TOPDIR)/shared/error.c \
        $(TOPDIR)/shared/iofd.c \
        $(TOPDIR)/shared/memory.c \
@@ -118,8 +116,6 @@ LIBSOURCES=\
        $(TOPDIR)/shared/netaddr.c \
        $(TOPDIR)/shared/netserv.c \
        $(TOPDIR)/shared/pointer.c \
-       $(TOPDIR)/shared/psock.c \
-       $(TOPDIR)/shared/psockimpl.c \
        $(TOPDIR)/shared/object.c \
        $(TOPDIR)/shared/observer.c \
        $(TOPDIR)/shared/reflect.c \
@@ -127,7 +123,6 @@ LIBSOURCES=\
        $(TOPDIR)/shared/sliceptr.c \
        $(TOPDIR)/shared/select.c \
        $(TOPDIR)/shared/selectkey.c \
-       $(TOPDIR)/shared/ssock.c \
        $(TOPDIR)/shared/string.c \
        $(TOPDIR)/shared/system.c \
        $(TOPDIR)/shared/table.c \

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/usock.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/usock.c?rev=1140151&r1=1140150&r2=1140151&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/usock.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/usock.c Mon Jun 27 
13:15:51 2011
@@ -16,7 +16,6 @@
 
 #include "acr/error.h"
 #include "acr/iodefs.h"
-#include "acr/socks.h"
 #include "acr/clazz.h"
 #include "acr/string.h"
 #include "acr/memory.h"

Modified: commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c?rev=1140151&r1=1140150&r2=1140151&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c Mon Jun 27 
13:15:51 2011
@@ -24,7 +24,6 @@
 #include "acr/callback.h"
 #include "acr/observer.h"
 #include "acr/iofd.h"
-#include "acr/socks.h"
 #include "acr/pointer.h"
 
 J_DECLARE_CLAZZ = {
@@ -240,11 +239,6 @@ AcrUnloadRuntimeClasses(JNI_STDENV)
     ACR_CLASS_UNLOAD(ConstPointer);
     ACR_CLASS_UNLOAD(HeapPointer);
     ACR_CLASS_UNLOAD(SlicePointer);
-    ACR_CLASS_UNLOAD(Socket);
-    ACR_CLASS_UNLOAD(SocketImpl);
-    ACR_CLASS_UNLOAD(ServerSocket);
-    ACR_CLASS_UNLOAD(DatagramSocket);
-    ACR_CLASS_UNLOAD(DatagramSocketImpl);
     ACR_CLASS_UNLOAD(FileDescriptor);
     ACR_CLASS_UNLOAD(Callback);
     ACR_CLASS_UNLOAD(HashSet);

Reply via email to