harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r382161 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/security/make/ modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/ modules/security/src/windows/javasrc/org/apache/harmony/security/x/...
Date Wed, 01 Mar 2006 21:14:02 GMT
Author: tellison
Date: Wed Mar  1 13:14:00 2006
New Revision: 382161

URL: http://svn.apache.org/viewcvs?rev=382161&view=rev
Log:
Apply Stepan's patch to complete auth native separation.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/NTUserPrincipal.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=382161&r1=382160&r2=382161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Wed Mar  1 13:14:00 2006
@@ -180,6 +180,7 @@
             <src path="nio_char/src/main/java" />
             <src path="security/src/common/javasrc" />
             <src path="security/src/windows/javasrc" />
+            <src path="security/src/linux/javasrc" />
 
             <src path="x-net/src/main/java/" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml?rev=382161&r1=382160&r2=382161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml Wed Mar  1 13:14:00
2006
@@ -512,6 +512,9 @@
             <formatter type="xml" />
 <!--            <batchtest todir="${build.path}/tests_report"> -->
                 <batchtest todir="${tests.output}">
+                <fileset dir="${src.tst.common.ps}/unit">
+                    <include name="**/*Test*.java"/>
+                </fileset>
                 <fileset dir="${src.tst.common}/unit">
                     <include name="**/*Test*.java"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java?rev=382161&r1=382160&r2=382161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/apache/harmony/security/x/security/auth/module/UnixSystem.java
Wed Mar  1 13:14:00 2006
@@ -64,7 +64,7 @@
      */
     public UnixSystem() {
         if (!loadLibDone) {
-            System.loadLibrary("jaasnix");
+            System.loadLibrary("hyauth");
             loadLibDone = true;
         }
         load();
@@ -149,4 +149,4 @@
         }
         return buf.toString();
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/NTUserPrincipal.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/NTUserPrincipal.java?rev=382161&r1=382160&r2=382161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/NTUserPrincipal.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/NTUserPrincipal.java
Wed Mar  1 13:14:00 2006
@@ -65,7 +65,7 @@
         if (obj == this) {
             return true;
         }
-        if (obj instanceof NTSid) {
+        if (obj instanceof NTUserPrincipal) {
             return name.equals(((NTUserPrincipal) obj).name);
         }
         return false;
@@ -77,4 +77,4 @@
     public int hashCode() {
         return name.hashCode();
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java?rev=382161&r1=382160&r2=382161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/apache/harmony/security/x/security/auth/module/NTSystem.java
Wed Mar  1 13:14:00 2006
@@ -59,7 +59,7 @@
      */
     public NTSystem() {
         if (!loadLibDone) {
-            System.loadLibrary("jaaswin");
+            System.loadLibrary("hyauth");
             initNatives();
             loadLibDone = true;
         }
@@ -176,4 +176,4 @@
         System.arraycopy(groups, 0, tmp, 0, groups.length);
         return tmp;
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile?rev=382161&r1=382160&r2=382161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile Wed Mar
 1 13:14:00 2006
@@ -20,6 +20,10 @@
 
 CFLAGS += -fpic 
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
+MDLLIBFILES = \
+        ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
+        ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+
 DLLNAME = ../libhyauth.so
 
 include ../rules.mk



Mime
View raw message