This is the mail archive of the java-patches@sources.redhat.com mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]

Importing AccessController and friends from Classpath

To: java-patches at sources dot redhat dot com
Subject: Importing AccessController and friends from Classpath
From: Mark Wielaard <mark at klomp dot org>
Date: Thu, 25 Jan 2001 18:07:59 +0100

Hi,

I wanted to import the following files from Classpath.
It allows some more code to compile that needs the AccessController and
friends, but since the code in AccessController is just dummy code it does
not actually do any access control checks.

I added the files to Makefile.am and regenerated the Makefile.in files
with the "magic libgcj automake". Could someone look at the regenerated
Makefile.in files. They work for me, but I don't completely understand
all the changes in the regenerated files.
(I have not included the new java files in the patch since they are the
same as the Classpath version.)

OK to commit?

Cheers,

Mark

    Import from Classpath
    * java/net/SocketPermission.java: new file
    * java/security/AccessController.java: idem
    * java/security/PrivilegedAction.java: idem
    * java/security/PrivilegedActionException.java: idem
    * java/security/PrivilegedExceptionAction.java: idem
    * java/security/AccessControlContext.java: idem
    * java/security/DomainCombiner.java: idem
    * java/security/ProtectionDomain.java: idem
    * java/security/CodeSource.java: idem
    * java/security/AccessControlException.java: idem
    * Makefile.am: add above files
    * Makefile.in: regenerate
    * gcj/Makefile.in: idem
    * include/Makefile.in: idem
    * testsuite/Makefile.in: idem

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.128
diff -u -u -r1.128 Makefile.am
--- Makefile.am	2001/01/24 17:43:25	1.128
+++ Makefile.am	2001/01/25 16:57:03
@@ -1062,6 +1062,7 @@
 java/net/SocketImpl.java \
 java/net/SocketImplFactory.java	\
 java/net/SocketOptions.java \
+java/net/SocketPermission.java \
 java/net/URL.java \
 java/net/URLClassLoader.java \
 java/net/URLConnection.java \
@@ -1071,10 +1072,15 @@
 java/net/URLStreamHandlerFactory.java \
 java/net/UnknownHostException.java \
 java/net/UnknownServiceException.java \
+java/security/AccessControlContext.java \
+java/security/AccessControlException.java \
+java/security/AccessController.java \
 java/security/AlgorithmParameterGeneratorSpi.java \
 java/security/BasicPermission.java \
+java/security/CodeSource.java \
 java/security/DigestException.java \
 java/security/DigestOutputStream.java \
+java/security/DomainCombiner.java \
 java/security/GeneralSecurityException.java \
 java/security/Guard.java \
 java/security/InvalidAlgorithmParameterException.java \
@@ -1092,6 +1098,10 @@
 java/security/PermissionCollection.java	\
 java/security/Principal.java \
 java/security/PrivateKey.java \
+java/security/PrivilegedAction.java \
+java/security/PrivilegedActionException.java \
+java/security/PrivilegedExceptionAction.java \
+java/security/ProtectionDomain.java \
 java/security/Provider.java \
 java/security/PublicKey.java \
 java/security/SecureClassLoader.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.138
diff -u -u -r1.138 Makefile.in
--- Makefile.in	2001/01/24 17:43:25	1.138
+++ Makefile.in	2001/01/25 16:57:05
@@ -120,43 +120,29 @@
 libgcj_basedir = @libgcj_basedir@
 
 AUTOMAKE_OPTIONS = foreign no-installinfo
-@TESTSUBDIR_TRUE@SUBDIRS = \
-@TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
-@TESTSUBDIR_FALSE@SUBDIRS = \
-@TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
-@USE_LIBDIR_TRUE@toolexeclibdir = \
-@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = \
-@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexecdir = \
-@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
-@NO_X_TRUE@cond_x_ltlibrary = \
-@NO_X_FALSE@cond_x_ltlibrary = \
-@NO_X_FALSE@libgcjx.la
+@TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
+@TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
+@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
+@NO_X_TRUE@cond_x_ltlibrary = 
+@NO_X_FALSE@cond_x_ltlibrary = @NO_X_FALSE@libgcjx.la
 
 toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
 toolexeclib_DATA = libgcj.spec
 data_DATA = libgcj.jar
 
-@NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = \
-@NEEDS_DATA_START_TRUE@libgcjdata.a
-@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = \
-@NEEDS_DATA_START_TRUE@libgcjdata.c
+@NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = @NEEDS_DATA_START_TRUE@libgcjdata.a
+@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = @NEEDS_DATA_START_TRUE@libgcjdata.c
 
-@NATIVE_TRUE@bin_PROGRAMS = \
-@NATIVE_TRUE@jv-convert gij
+@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij
 
 bin_SCRIPTS = addr2name.awk
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar
-@CANADIAN_FALSE@ZIP = \
-@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
-@CANADIAN_TRUE@GCJH = \
-@CANADIAN_TRUE@gcjh
-@CANADIAN_FALSE@GCJH = \
-@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
+@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar
+@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
+@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
 
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
 
@@ -173,10 +159,8 @@
 	-fdollars-in-identifiers \
 	@LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE
 
-@USING_GCC_TRUE@AM_CFLAGS = \
-@USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
-@USING_GCC_FALSE@AM_CFLAGS = \
-@USING_GCC_FALSE@@LIBGCJ_CFLAGS@
+@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
+@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
 
 JCFLAGS = -g
 JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
@@ -248,8 +232,7 @@
 
 NM = nm
 
-@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
-@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
+@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
 
 CONVERT_DIR = gnu/gcj/convert
 
@@ -822,6 +805,7 @@
 java/net/SocketImpl.java \
 java/net/SocketImplFactory.java	\
 java/net/SocketOptions.java \
+java/net/SocketPermission.java \
 java/net/URL.java \
 java/net/URLClassLoader.java \
 java/net/URLConnection.java \
@@ -831,10 +815,15 @@
 java/net/URLStreamHandlerFactory.java \
 java/net/UnknownHostException.java \
 java/net/UnknownServiceException.java \
+java/security/AccessControlContext.java \
+java/security/AccessControlException.java \
+java/security/AccessController.java \
 java/security/AlgorithmParameterGeneratorSpi.java \
 java/security/BasicPermission.java \
+java/security/CodeSource.java \
 java/security/DigestException.java \
 java/security/DigestOutputStream.java \
+java/security/DomainCombiner.java \
 java/security/GeneralSecurityException.java \
 java/security/Guard.java \
 java/security/InvalidAlgorithmParameterException.java \
@@ -852,6 +841,10 @@
 java/security/PermissionCollection.java	\
 java/security/Principal.java \
 java/security/PrivateKey.java \
+java/security/PrivilegedAction.java \
+java/security/PrivilegedActionException.java \
+java/security/PrivilegedExceptionAction.java \
+java/security/ProtectionDomain.java \
 java/security/Provider.java \
 java/security/PublicKey.java \
 java/security/SecureClassLoader.java \
@@ -1612,19 +1605,24 @@
 .deps/java/net/ServerSocket.P .deps/java/net/Socket.P \
 .deps/java/net/SocketException.P .deps/java/net/SocketImpl.P \
 .deps/java/net/SocketImplFactory.P .deps/java/net/SocketOptions.P \
-.deps/java/net/URL.P .deps/java/net/URLClassLoader.P \
-.deps/java/net/URLConnection.P .deps/java/net/URLDecoder.P \
-.deps/java/net/URLEncoder.P .deps/java/net/URLStreamHandler.P \
+.deps/java/net/SocketPermission.P .deps/java/net/URL.P \
+.deps/java/net/URLClassLoader.P .deps/java/net/URLConnection.P \
+.deps/java/net/URLDecoder.P .deps/java/net/URLEncoder.P \
+.deps/java/net/URLStreamHandler.P \
 .deps/java/net/URLStreamHandlerFactory.P \
 .deps/java/net/UnknownHostException.P \
 .deps/java/net/UnknownServiceException.P \
 .deps/java/net/natInetAddress.P \
 .deps/java/net/natPlainDatagramSocketImpl.P \
 .deps/java/net/natPlainSocketImpl.P \
+.deps/java/security/AccessControlContext.P \
+.deps/java/security/AccessControlException.P \
+.deps/java/security/AccessController.P \
 .deps/java/security/AlgorithmParameterGeneratorSpi.P \
-.deps/java/security/BasicPermission.P \
+.deps/java/security/BasicPermission.P .deps/java/security/CodeSource.P \
 .deps/java/security/DigestException.P \
 .deps/java/security/DigestOutputStream.P \
+.deps/java/security/DomainCombiner.P \
 .deps/java/security/GeneralSecurityException.P \
 .deps/java/security/Guard.P \
 .deps/java/security/InvalidAlgorithmParameterException.P \
@@ -1639,8 +1637,11 @@
 .deps/java/security/Permission.P \
 .deps/java/security/PermissionCollection.P \
 .deps/java/security/Principal.P .deps/java/security/PrivateKey.P \
-.deps/java/security/Provider.P .deps/java/security/PublicKey.P \
-.deps/java/security/SecureClassLoader.P \
+.deps/java/security/PrivilegedAction.P \
+.deps/java/security/PrivilegedActionException.P \
+.deps/java/security/PrivilegedExceptionAction.P \
+.deps/java/security/ProtectionDomain.P .deps/java/security/Provider.P \
+.deps/java/security/PublicKey.P .deps/java/security/SecureClassLoader.P \
 .deps/java/security/SecureRandom.P .deps/java/security/Security.P \
 .deps/java/security/Signature.P \
 .deps/java/security/SignatureException.P .deps/java/security/cert/CRL.P \
@@ -2117,7 +2118,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
Index: gcj/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gcj/Makefile.in,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile.in
--- Makefile.in	2000/11/27 04:07:47	1.13
+++ Makefile.in	2001/01/25 16:57:05
@@ -203,7 +203,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
Index: include/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/Makefile.in,v
retrieving revision 1.15
diff -u -u -r1.15 Makefile.in
--- Makefile.in	2000/11/27 04:07:47	1.15
+++ Makefile.in	2001/01/25 16:57:05
@@ -230,7 +230,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
Index: testsuite/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/Makefile.in,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile.in
--- Makefile.in	2000/11/26 23:24:21	1.25
+++ Makefile.in	2001/01/25 16:57:05
@@ -170,7 +170,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

Follow-Ups:
- Re: Importing AccessController and friends from Classpath
  - From: Warren Levy
- Re: Importing AccessController and friends from Classpath
  - From: Tom Tromey

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]