You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2006/04/25 08:23:47 UTC
svn commit: r396782 - in /incubator/harmony/enhanced/classlib/trunk:
modules/auth/src/main/java/common/org/apache/harmony/auth/
modules/auth/src/main/java/common/org/apache/harmony/auth/login/
modules/auth/src/main/java/linux/org/apache/harmony/auth/mo...
Author: smishura
Date: Mon Apr 24 23:23:43 2006
New Revision: 396782
URL: http://svn.apache.org/viewcvs?rev=396782&view=rev
Log:
Apply patch for HARMONY-198 (Eliminate using word 'JAAS' from source files)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/auth_policy1.txt
- copied unchanged from r396387, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/jaas_policy1.txt
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/auth_policy2.txt
- copied unchanged from r396387, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/jaas_policy2.txt
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/auth.conf
- copied unchanged from r396387, incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/jaas.conf
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/jaas_policy1.txt
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/jaas_policy2.txt
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/jaas.conf
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/DefaultSubjectPolicy.java (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/login/DefaultConfigurationParser.java (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/org/apache/harmony/auth/module/UnixSystem.java (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/windows/org/apache/harmony/auth/module/NTSystem.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java
incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.h (contents, props changed)
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/DefaultSubjectPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/DefaultSubjectPolicy.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/DefaultSubjectPolicy.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/DefaultSubjectPolicy.java Mon Apr 24 23:23:43 2006
@@ -51,7 +51,7 @@
"refreshPolicy");
// System property for dynamically added policy location.
- private static final String JAAS_SECURITY_POLICY = "java.security.auth.policy";
+ private static final String AUTH_SECURITY_POLICY = "java.security.auth.policy";
// Prefix for numbered Policy locations specified in security.properties.
private static final String POLICY_URL_PREFIX = "auth.policy.url.";
@@ -119,7 +119,7 @@
.doPrivileged(new PolicyUtils.SystemKit()));
system.setProperty("/", File.separator);
URL[] policyLocations = PolicyUtils.getPolicyURLs(system,
- JAAS_SECURITY_POLICY, POLICY_URL_PREFIX);
+ AUTH_SECURITY_POLICY, POLICY_URL_PREFIX);
for (int i = 0; i < policyLocations.length; i++) {
try {
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/DefaultSubjectPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/login/DefaultConfigurationParser.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/login/DefaultConfigurationParser.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/login/DefaultConfigurationParser.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/login/DefaultConfigurationParser.java Mon Apr 24 23:23:43 2006
@@ -42,7 +42,7 @@
/**
- * jaas configuration parser
+ * Auth configuration parser
*/
public class DefaultConfigurationParser {
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/login/DefaultConfigurationParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/org/apache/harmony/auth/module/UnixSystem.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/org/apache/harmony/auth/module/UnixSystem.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/org/apache/harmony/auth/module/UnixSystem.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/org/apache/harmony/auth/module/UnixSystem.java Mon Apr 24 23:23:43 2006
@@ -25,7 +25,7 @@
*/
public class UnixSystem {
- // Shows whether the jassnix library was loaded already
+ // Shows whether the hyauth library was loaded already
private static boolean loadLibDone;
/**
@@ -60,7 +60,7 @@
/**
* Sole constructor.
- * @throws UnsatisfiedLinkError if jaasnix library could not be loaded
+ * @throws UnsatisfiedLinkError if hyauth library could not be loaded
*/
public UnixSystem() {
if (!loadLibDone) {
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/org/apache/harmony/auth/module/UnixSystem.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/windows/org/apache/harmony/auth/module/NTSystem.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/windows/org/apache/harmony/auth/module/NTSystem.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/windows/org/apache/harmony/auth/module/NTSystem.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/windows/org/apache/harmony/auth/module/NTSystem.java Mon Apr 24 23:23:43 2006
@@ -32,7 +32,7 @@
*/
public final class NTSystem {
- // Shows whether the jaaswin library was loaded or not
+ // Shows whether the hyauth library was loaded or not
private static boolean loadLibDone = false;
// User's sid, domain and name
@@ -54,8 +54,8 @@
private boolean debugNative;
/**
- * The default ctor. Loads jaaswin library if necessary.
- * @throws UnsatisfiedLinkError if library jaaswin not found
+ * The default ctor. Loads hyauth library if necessary.
+ * @throws UnsatisfiedLinkError if library hyauth not found
*/
public NTSystem() {
if (!loadLibDone) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java Mon Apr 24 23:23:43 2006
@@ -173,11 +173,11 @@
static String inputFile1 = outputPath + File.separator + "javax"
+ File.separator + "security" + File.separator + "auth"
- + File.separator + "jaas_policy1.txt";
+ + File.separator + "auth_policy1.txt";
static String inputFile2 = outputPath + File.separator + "javax"
+ File.separator + "security" + File.separator + "auth"
- + File.separator + "jaas_policy2.txt";
+ + File.separator + "auth_policy2.txt";
private static final String POLICY_PROP = "java.security.auth.policy";
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java Mon Apr 24 23:23:43 2006
@@ -50,7 +50,7 @@
static String fconf = outputPath + File.separator + "org" +
File.separator + "apache" + File.separator + "harmony" +
File.separator + "auth" + File.separator + "login" +
- File.separator + "jaas.conf";
+ File.separator + "auth.conf";
Properties p;
@@ -163,7 +163,7 @@
};
for (int i = 0; i < str.length; i++) {
- File file = File.createTempFile("jaas_neg_", ".conf");
+ File file = File.createTempFile("auth_neg_", ".conf");
byte[] b = str[i].getBytes();
OutputStream os = new FileOutputStream(file);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java Mon Apr 24 23:23:43 2006
@@ -51,7 +51,7 @@
static String otherConfFile = outputPath + File.separator + "org" +
File.separator + "apache" + File.separator + "harmony" +
File.separator + "auth" + File.separator + "login" +
- File.separator + "jaas.conf";
+ File.separator + "auth.conf";
private static File defaultConfFile;
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.h?rev=396782&r1=396781&r2=396782&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.h Mon Apr 24 23:23:43 2006
@@ -15,18 +15,18 @@
*/
// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the JAASWIN_EXPORTS
+// from a DLL simpler. All files within this DLL are compiled with the AUTHWIN_EXPORTS
// symbol defined on the command line. this symbol should not be defined on any project
// that uses this DLL. This way any other project whose source files include this file see
-// JAASWIN_API functions as being imported from a DLL, whereas this DLL sees symbols
+// AUTHWIN_API functions as being imported from a DLL, whereas this DLL sees symbols
// defined with this macro as being exported.
-#ifdef JAASWIN_EXPORTS
-#define JAASWIN_API __declspec(dllexport)
+#ifdef AUTHWIN_EXPORTS
+#define AUTHWIN_API __declspec(dllexport)
#else
-#define JAASWIN_API __declspec(dllimport)
+#define AUTHWIN_API __declspec(dllimport)
#endif
-//JAASWIN_API void fillitup(LPVOID lpJEnv, LPVOID lpJObj);
-//JAASWIN_API void error(LPVOID lpJEnv, LPCSTR msg, DWORD dwErr );
+//AUTHWIN_API void fillitup(LPVOID lpJEnv, LPVOID lpJObj);
+//AUTHWIN_API void error(LPVOID lpJEnv, LPCSTR msg, DWORD dwErr );
Propchange: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.h
------------------------------------------------------------------------------
svn:eol-style = native