harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r392256 [2/2] - in /incubator/harmony/enhanced/classlib/trunk: depends/files/ make/ make/patternsets/ modules/auth/ modules/auth/META-INF/ modules/auth/make/ modules/auth/make/common/ modules/auth/src/ modules/auth/src/main/ modules/auth/sr...
Date Fri, 07 Apr 2006 11:40:47 GMT
Copied: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java
(from r392209, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/test/SecurityTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/test/SecurityTest.java&r1=392209&r2=392256&rev=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/apache/harmony/security/test/SecurityTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java
Fri Apr  7 04:40:08 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package org.apache.harmony.security.test;
+package org.apache.harmony.auth.internal;
 
 import java.security.AccessControlContext;
 import java.security.AccessControlException;
@@ -365,7 +365,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext_EmptySet()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext_EmptySet()
          */
         public void testHasNext_EmptySet() {
             setReadOnly();
@@ -373,7 +373,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext()
          */
         public void testHasNext() {
 
@@ -384,7 +384,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
          */
         public void testNext_EmptySet_NoSuchElementException() {
             setReadOnly();
@@ -392,7 +392,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext()
          */
         public void testNext() {
 
@@ -406,7 +406,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_NoSuchElementException()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_NoSuchElementException()
          */
         public void testNext_NoSuchElementException() {
 
@@ -444,7 +444,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
          */
         public void testRemove_EmptySet_IllegalStateException() {
             setReadOnly();
@@ -502,7 +502,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext_EmptySet()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext_EmptySet()
          */
         public void testHasNext_EmptySet() {
             setSecure();
@@ -510,7 +510,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext()
          */
         public void testHasNext() {
             set.add(element);
@@ -520,7 +520,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
          */
         public void testNext_EmptySet_NoSuchElementException() {
             setSecure();
@@ -528,7 +528,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_NoSuchElementException()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_NoSuchElementException()
          */
         public void testNext_NoSuchElementException() {
             set.add(element);
@@ -545,7 +545,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext()
          */
         public void testNext() {
             set.add(element);
@@ -579,7 +579,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
          * 
          * Expected: AccessControlException instead IllegalStateException for empty set
          */
@@ -595,7 +595,7 @@
         }
 
         /**
-         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testRemove_IllegalStateException_NoNext()
+         * @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testRemove_IllegalStateException_NoNext()
          * 
          * Expected: AccessControlException instead IllegalStateException
          */

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=392256&r1=392248&r2=392256&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
Fri Apr  7 04:40:08 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package org.apache.harmony.security.x.security.auth.login;
+package org.apache.harmony.auth.login;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -35,8 +35,8 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import junit.framework.TestCase;
-import org.apache.harmony.security.x.security.auth.login.DefaultConfigurationParser;
-import org.apache.harmony.security.x.security.auth.login.DefaultConfigurationParser.InvalidFormatException;
+import org.apache.harmony.auth.login.DefaultConfigurationParser;
+import org.apache.harmony.auth.login.DefaultConfigurationParser.InvalidFormatException;
 
 
 /**
@@ -49,9 +49,8 @@
     
     static String fconf = outputPath + File.separator + "org" + 
         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 + "auth" + File.separator + "login" +
+        File.separator + "jaas.conf";
     
 	Properties p;
 

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=392256&r1=392248&r2=392256&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
Fri Apr  7 04:40:08 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package org.apache.harmony.security.x.security.auth.login;
+package org.apache.harmony.auth.login;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -35,7 +35,7 @@
 
 import junit.framework.TestCase;
 import org.apache.harmony.security.test.TestUtils;
-import org.apache.harmony.security.x.security.auth.login.DefaultConfiguration;
+import org.apache.harmony.auth.login.DefaultConfiguration;
 
 
 /**
@@ -50,9 +50,8 @@
     
     static String otherConfFile = outputPath + File.separator + "org" + 
         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 + "auth" + File.separator + "login" +
+        File.separator + "jaas.conf";
 
 	private static File defaultConfFile;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java?rev=392256&r1=392248&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java
Fri Apr  7 04:40:08 2006
@@ -18,7 +18,7 @@
  * @author Alexander V. Astapchuk
  * @version $Revision$
  */
-package org.apache.harmony.security.x.security.auth.module;
+package org.apache.harmony.auth.module;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +29,7 @@
 import javax.security.auth.login.LoginException;
 
 import junit.framework.TestCase;
-import org.apache.harmony.security.x.security.auth.module.UnixLoginModule;
+import org.apache.harmony.auth.module.UnixLoginModule;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java?rev=392256&r1=392248&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java
Fri Apr  7 04:40:08 2006
@@ -18,7 +18,7 @@
  * @author Alexander V. Astapchuk
  * @version $Revision$
  */
-package org.apache.harmony.security.x.security.auth.module;
+package org.apache.harmony.auth.module;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +29,7 @@
 import javax.security.auth.login.LoginException;
 
 import junit.framework.TestCase;
-import org.apache.harmony.security.x.security.auth.module.NTLoginModule;
+import org.apache.harmony.auth.module.NTLoginModule;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF?rev=392256&r1=392255&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF Fri Apr
 7 04:40:08 2006
@@ -16,22 +16,14 @@
  java.util,
  java.util.zip,
  javax.crypto,
- javax.crypto.spec,
  org.apache.harmony.crypto.utils
 Export-Package: java.security,
  java.security.acl,
  java.security.cert,
  java.security.interfaces,
  java.security.spec,
- javax.security.auth,
- javax.security.auth.callback,
- javax.security.auth.kerberos,
- javax.security.auth.login,
- javax.security.auth.spi,
- javax.security.auth.x500,
  javax.security.cert,
- javax.security.sasl,
- org.ietf.jgss,
+ org.apache.harmony.security;version="1.0.0",
  org.apache.harmony.security.asn1;version="1.0.0",
  org.apache.harmony.security.x509;version="1.0.0",
  org.apache.harmony.security.utils;version="1.0.0";x-friends:="org.apache.harmony.archive,org.apache.harmony.luni",

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=392256&r1=392255&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Fri Apr
 7 04:40:08 2006
@@ -19,27 +19,17 @@
 
 	<property file="../../../../make/depends.properties" />
 
-	<property name="hy.security.src.main.java.platform"
-		value="${hy.security.src.main.java}/../${hy.os_family}" />
-
-	<property name="hy.security.src.test.java.platform"
-		value="${hy.security.src.test.java}/../${hy.os_family}" />
-	
 	<target name="compile.java" description="Compile SECURITY java code">
 		<echo message="Compiling SECURITY classes from ${hy.security.src.main.java}" />
 		
 		<mkdir dir="${hy.security.bin.main}" />
 
 		<javac sourcepath=""
+			srcdir="${hy.security.src.main.java}"
 			destdir="${hy.security.bin.main}"
 			source="${source.ver}"
 			debug="${java.debug.option}">
 
-			<src>
-				<pathelement location="${hy.security.src.main.java}"/>
-				<pathelement location="${hy.security.src.main.java.platform}"/>
-			</src>
-
 			<bootclasspath>
 				<fileset dir="${hy.target}/jre/lib/boot">
 					<include name="**/*.jar" />
@@ -55,27 +45,17 @@
 		</jar>
 	</target>
 
-	
 	<target name="compile.tests">
 		<echo message="Compiling SECURITY tests from ${hy.security.src.test.java}" />
 
 		<mkdir dir="${hy.security.bin.test}" />
 
 		<javac 	destdir="${hy.security.bin.test}"
+			srcdir="${hy.security.src.test.java}"
 			source="${source.ver}"
 			sourcepath=""
 			debug="${java.debug.option}">
 
-			<src>
-				<pathelement location="${hy.security.src.test.java}"/>
-				<pathelement location="${hy.security.src.test.java.platform}"/>
-			</src>
-
-			<exclude name="org/apache/harmony/security/test/SecurityTest.java"/>
-			<exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
-			<exclude name="javax/security/auth/SubjectTest.java"/>
-			<exclude name="javax/security/auth/login/LoginContextTest.java"/>
-
 			<bootclasspath>
 				<fileset dir="${hy.target}/jre/lib/boot">
 					<include name="**/*.jar" />
@@ -113,9 +93,6 @@
 			<formatter type="xml" />
 
 			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.security.src.test.java.platform}">
-					<include name="**/*Test.java"/>
-				</fileset>
 				<fileset dir="${hy.security.src.test.java}">
 					<include name="**/*Test.java"/>
 
@@ -128,12 +105,6 @@
 
 					<!-- Harmony exclude list -->
 					<exclude name="java/security/serialization/KeyPairTest.java"/>
-					<exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
-					<exclude name="javax/security/auth/SubjectTest.java"/>
-					<exclude name="javax/security/auth/login/LoginContextTest.java"/>
-					<exclude name="javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java"/>
-					<exclude name="javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java"/>
-					<exclude name="javax/security/auth/x500/X500PrincipalTest.java" />
 
 				</fileset>
 			</batchtest>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/authnix.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/authnix.c?rev=392256&r1=392255&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/authnix.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/authnix.c Fri Apr
 7 04:40:08 2006
@@ -53,7 +53,7 @@
 jclass jclassString = NULL;
 
 JNIEXPORT void JNICALL
-Java_org_apache_harmony_security_x_security_auth_module_UnixSystem_load
+Java_org_apache_harmony_auth_module_UnixSystem_load
   (JNIEnv * jenv, jobject thiz)
 {
 	PORT_ACCESS_FROM_ENV(jenv);

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/libhyauth.exp
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/libhyauth.exp?rev=392256&r1=392255&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/libhyauth.exp (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/libhyauth.exp Fri
Apr  7 04:40:08 2006
@@ -1,6 +1,6 @@
 HYAUTH_0.1 {
 	global :
-		Java_org_apache_harmony_security_x_security_auth_module_UnixSystem_load;
+		Java_org_apache_harmony_auth_module_UnixSystem_load;
 		JNI_OnLoad;
 		JNI_OnUnload;
 	local : *;

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.c?rev=392256&r1=392255&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/authwin32.c Fri Apr
 7 04:40:08 2006
@@ -51,12 +51,12 @@
 
 
 JNIEXPORT void JNICALL 
-Java_org_apache_harmony_security_x_security_auth_module_NTSystem_initNatives
+Java_org_apache_harmony_auth_module_NTSystem_initNatives
 (JNIEnv * jenv, jclass klass)
 {
 	jclass klassErr = NULL;
 
-	if( NULL == (jf_user = (*jenv)->GetFieldID (jenv, klass, "user", "Lorg/apache/harmony/security/x/security/auth/NTSidUserPrincipal;")))
{
+	if( NULL == (jf_user = (*jenv)->GetFieldID (jenv, klass, "user", "Lorg/apache/harmony/auth/NTSidUserPrincipal;")))
{
 		klassErr = (*jenv)->FindClass (jenv, "java/lang/Error");
 		assert(klassErr);
 		(*jenv)->ThrowNew (jenv, klassErr, "Could not find field \"user\" of type NTSidUserPrincipal");
@@ -70,14 +70,14 @@
 		return;
 	}
 
-	if( NULL == (jf_mainGroup = (*jenv)->GetFieldID (jenv, klass, "mainGroup", "Lorg/apache/harmony/security/x/security/auth/NTSidPrimaryGroupPrincipal;"))
) {
+	if( NULL == (jf_mainGroup = (*jenv)->GetFieldID (jenv, klass, "mainGroup", "Lorg/apache/harmony/auth/NTSidPrimaryGroupPrincipal;"))
) {
 		klassErr = (*jenv)->FindClass (jenv, "java/lang/Error");
 		assert(klassErr);
 		(*jenv)->ThrowNew (jenv, klassErr, "Could not find field \"mainGroup\" of type NTSidPrimaryGroupPrincipal");
 		return;
 	}
 
-	if( NULL == (jf_groups = (*jenv)->GetFieldID (jenv, klass, "groups", "[Lorg/apache/harmony/security/x/security/auth/NTSidGroupPrincipal;"))
) {
+	if( NULL == (jf_groups = (*jenv)->GetFieldID (jenv, klass, "groups", "[Lorg/apache/harmony/auth/NTSidGroupPrincipal;"))
) {
 		klassErr = (*jenv)->FindClass (jenv, "java/lang/Error");
 		assert(klassErr);
 		(*jenv)->ThrowNew (jenv, klassErr, "Could not find field \"groups\" of type NTSidPrimaryGroupPrincipal");
@@ -167,7 +167,7 @@
 
 
 JNIEXPORT void JNICALL
-Java_org_apache_harmony_security_x_security_auth_module_NTSystem_load
+Java_org_apache_harmony_auth_module_NTSystem_load
 (JNIEnv * jenv, jobject thiz)
 {
 	DWORD i; /* tmp */
@@ -254,7 +254,7 @@
 		goto exit;
 	};
 
-	jkl = (*jenv)->FindClass (jenv, "org/apache/harmony/security/x/security/auth/NTSidUserPrincipal");
+	jkl = (*jenv)->FindClass (jenv, "org/apache/harmony/auth/NTSidUserPrincipal");
 	if( NULL == jkl || (*jenv)->ExceptionCheck (jenv) ) {
 		errMsg = "Could not find class NTSidUserPrincipal";
 		goto exit;
@@ -333,7 +333,7 @@
 	}
 	ConvertSidToStringSid(groupSid, &lpStr2);
 
-	jklassPrimaryGroup = (*jenv)->FindClass (jenv, "org/apache/harmony/security/x/security/auth/NTSidPrimaryGroupPrincipal");
+	jklassPrimaryGroup = (*jenv)->FindClass (jenv, "org/apache/harmony/auth/NTSidPrimaryGroupPrincipal");
 	if( NULL == jklassPrimaryGroup || (*jenv)->ExceptionCheck (jenv) ) {
 		errMsg = "Could not find class NTSidPrimaryGroupPrincipal";
 		goto exit;
@@ -368,7 +368,7 @@
 
 	ptgs = (PTOKEN_GROUPS)lpAllGroupsData;
 
-	klassGroup = (*jenv)->FindClass (jenv, "org/apache/harmony/security/x/security/auth/NTSidGroupPrincipal");
+	klassGroup = (*jenv)->FindClass (jenv, "org/apache/harmony/auth/NTSidGroupPrincipal");
 	if( NULL == klassGroup || (*jenv)->ExceptionCheck (jenv) ) {
 		errMsg = "Could not find NTSidGroupPrincipal";
 		goto exit;
@@ -471,12 +471,12 @@
 }
 
 /*
-* Class:     org_apache_harmony_security_x_security_auth_module_NTSystem
+* Class:     org_apache_harmony_auth_module_NTSystem
 * Method:    free
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_org_apache_harmony_security_x_security_auth_module_NTSystem_free
+Java_org_apache_harmony_auth_module_NTSystem_free
 (JNIEnv * jenv, jobject thiz)
 {
 	HANDLE hTok = (HANDLE)(*jenv)->GetLongField (jenv, thiz, jf_token);

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/hyauth.def
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/hyauth.def?rev=392256&r1=392255&r2=392256&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/hyauth.def (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/hyauth.def Fri Apr
 7 04:40:08 2006
@@ -5,6 +5,6 @@
 	.text	EXECUTE READ
 
 EXPORTS
-	Java_org_apache_harmony_security_x_security_auth_module_NTSystem_free
-	Java_org_apache_harmony_security_x_security_auth_module_NTSystem_initNatives
-	Java_org_apache_harmony_security_x_security_auth_module_NTSystem_load
+	Java_org_apache_harmony_auth_module_NTSystem_free
+	Java_org_apache_harmony_auth_module_NTSystem_initNatives
+	Java_org_apache_harmony_auth_module_NTSystem_load



Mime
View raw message