Index: modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java (revision 382285) +++ modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java (working copy) @@ -51,7 +51,7 @@ File.separator + "apache" + File.separator + "harmony" + File.separator + "security" + File.separator + "x" + File.separator + "security" + File.separator + "auth" + - File.separator + "login" + File.separator + "jaas.conf"; + File.separator + "login" + File.separator + "auth.conf"; Properties p; @@ -167,7 +167,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); Index: modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java =================================================================== --- modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java (revision 382285) +++ modules/security/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java (working copy) @@ -49,7 +49,7 @@ File.separator + "apache" + File.separator + "harmony" + File.separator + "security" + File.separator + "x" + File.separator + "security" + File.separator + "auth" + - File.separator + "login" + File.separator + "jaas.conf"; + File.separator + "login" + File.separator + "auth.conf"; private static File defaultConfFile; Index: modules/security/test/common/unit/javax/security/auth/PolicyTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/PolicyTest.java (revision 382285) +++ modules/security/test/common/unit/javax/security/auth/PolicyTest.java (working copy) @@ -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"; public void test_GetPermissions() throws Exception { Index: modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java =================================================================== --- modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java (revision 383809) +++ modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java (working copy) @@ -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) { Index: modules/security/src/common/javasrc/org/apache/harmony/security/x/security/auth/DefaultSubjectPolicy.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x/security/auth/DefaultSubjectPolicy.java (revision 382285) +++ modules/security/src/common/javasrc/org/apache/harmony/security/x/security/auth/DefaultSubjectPolicy.java (working copy) @@ -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 { Index: modules/security/src/common/javasrc/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationParser.java =================================================================== --- modules/security/src/common/javasrc/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationParser.java (revision 382285) +++ modules/security/src/common/javasrc/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationParser.java (working copy) @@ -42,7 +42,7 @@ /** - * jaas configuration parser + * Auth configuration parser */ public class DefaultConfigurationParser { Index: modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java =================================================================== --- modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java (revision 383809) +++ modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java (working copy) @@ -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 neccessary. - * @throws UnsatisfiedLinkError if library jaaswin not found + * The default ctor. Loads hyauth library if neccessary. + * @throws UnsatisfiedLinkError if library hyauth not found */ public NTSystem() { if (!loadLibDone) { Index: native-src/win.IA32/auth/authwin32.h =================================================================== --- native-src/win.IA32/auth/authwin32.h (revision 383809) +++ native-src/win.IA32/auth/authwin32.h (working copy) @@ -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 );