[Aplaws-commit] r2487 - in trunk/ccm-auth-http: src/com/arsdigita/auth/http src/com/arsdigita/auth/http/ui web/WEB-INF

[<pb...@fe...>]

Author: pboy
Date: 2013-02-03 13:29:16 +0000 (Sun, 03 Feb 2013)
New Revision: 2487

Modified:
   trunk/ccm-auth-http/src/com/arsdigita/auth/http/Inet4AddressRange.java
   trunk/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java
   trunk/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserCSVEntry.java
   trunk/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
Log:
Supplementing some files which were lost somehow.

Modified: trunk/ccm-auth-http/src/com/arsdigita/auth/http/Inet4AddressRange.java
===================================================================
--- trunk/ccm-auth-http/src/com/arsdigita/auth/http/Inet4AddressRange.java	2013-02-03 12:37:55 UTC (rev 2486)
+++ trunk/ccm-auth-http/src/com/arsdigita/auth/http/Inet4AddressRange.java	2013-02-03 13:29:16 UTC (rev 2487)
@@ -248,32 +248,32 @@
     String addrStr = inetAddressToString (addr);
     String addr2Str = inetAddressToString (addr2);
     System.out.println ("addr = " + addrStr + "; addr2 = " + addr2Str);
-    Assert.truth (addrStr.equals (addr2Str));
+    Assert.isTrue (addrStr.equals (addr2Str));
 
     // Test makeNetmask.
     addr = makeNetmask (0);
     System.out.println ("makeNetmask(0) = " + addr);
-    Assert.truth (inetAddressToString (addr).equals ("0.0.0.0"));
+    Assert.isTrue (inetAddressToString (addr).equals ("0.0.0.0"));
 
     addr = makeNetmask (8);
     System.out.println ("makeNetmask(8) = " + addr);
-    Assert.truth (inetAddressToString (addr).equals ("255.0.0.0"));
+    Assert.isTrue (inetAddressToString (addr).equals ("255.0.0.0"));
 
     addr = makeNetmask (16);
     System.out.println ("makeNetmask(16) = " + addr);
-    Assert.truth (inetAddressToString (addr).equals ("255.255.0.0"));
+    Assert.isTrue (inetAddressToString (addr).equals ("255.255.0.0"));
 
     addr = makeNetmask (24);
     System.out.println ("makeNetmask(24) = " + addr);
-    Assert.truth (inetAddressToString (addr).equals ("255.255.255.0"));
+    Assert.isTrue (inetAddressToString (addr).equals ("255.255.255.0"));
 
     addr = makeNetmask (28);
     System.out.println ("makeNetmask(28) = " + addr);
-    Assert.truth (inetAddressToString (addr).equals ("255.255.255.240"));
+    Assert.isTrue (inetAddressToString (addr).equals ("255.255.255.240"));
 
     addr = makeNetmask (32);
     System.out.println ("makeNetmask(32) = " + addr);
-    Assert.truth (inetAddressToString (addr).equals ("255.255.255.255"));
+    Assert.isTrue (inetAddressToString (addr).equals ("255.255.255.255"));
 
     // Test getByName.
     Inet4AddressRange range
@@ -284,7 +284,7 @@
       = Inet4AddressRange.getByName ("192.168.0.0/255.255.0.0");
     System.out.println ("range = " + range.toString ());
     // Test equals.
-    Assert.truth (range.equals (range2));
+    Assert.isTrue (range.equals (range2));
 
     range = Inet4AddressRange.getByName ("192.168.0.99");
     System.out.println ("range = " + range.toString ());
@@ -292,19 +292,19 @@
     // Test inRange.
     range = Inet4AddressRange.getByName ("192.168.0.0/16");
     addr = InetAddress.getByName ("192.168.0.99");
-    Assert.truth (range.inRange (addr));
+    Assert.isTrue (range.inRange (addr));
 
     range = Inet4AddressRange.getByName ("192.168.0.0/24");
     addr = InetAddress.getByName ("192.168.2.99");
-    Assert.truth (! range.inRange (addr));
+    Assert.isTrue (! range.inRange (addr));
 
     range = Inet4AddressRange.getByName ("192.168.0.99");
     addr = InetAddress.getByName ("192.168.0.99");
-    Assert.truth (range.inRange (addr));
+    Assert.isTrue (range.inRange (addr));
 
     range = Inet4AddressRange.getByName ("192.168.0.99");
     addr = InetAddress.getByName ("192.168.3.99");
-    Assert.truth (! range.inRange (addr));
+    Assert.isTrue (! range.inRange (addr));
 
     System.out.println ("All test completed OK.");
   }

Modified: trunk/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java
===================================================================
--- trunk/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java	2013-02-03 12:37:55 UTC (rev 2486)
+++ trunk/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java	2013-02-03 13:29:16 UTC (rev 2487)
@@ -82,12 +82,6 @@
      * instantiates a (single) default instance.
      */
     private void setupHTTPAuth() {
-/*
-        ApplicationType type = ApplicationType
-            .createApplicationType("auth-http",
-                                   "CCM HTTP Authentication Admin",
-                                   HTTPAuth.BASE_DATA_OBJECT_TYPE);
-*/
 
         /* Create new type legacy free application type                 
          * NOTE: The wording in the title parameter of ApplicationType

Modified: trunk/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserCSVEntry.java
===================================================================
--- trunk/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserCSVEntry.java	2013-02-03 12:37:55 UTC (rev 2486)
+++ trunk/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserCSVEntry.java	2013-02-03 13:29:16 UTC (rev 2487)
@@ -80,7 +80,7 @@
     }
 
     public static synchronized UserCSVEntry nextEntry() {
-        Assert.truth(hasMore(), "has more entries");
+        Assert.isTrue(hasMore(), "has more entries");
 
         UserCSVEntry entry = new UserCSVEntry();
         s_log.debug("Starting entry");

Modified: trunk/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
===================================================================
--- trunk/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml	2013-02-03 12:37:55 UTC (rev 2486)
+++ trunk/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml	2013-02-03 13:29:16 UTC (rev 2487)
@@ -22,4 +22,4 @@
   </servlet-mapping>
   <!-- module ccm-auth-http  -  servlet mappings END  -->
 
-</web-app>
\ No newline at end of file
+</web-app>