[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller Controller.java

JCorporate Ltd jcorp at jcorp2.servlets.net
Sun Sep 26 22:27:25 PDT 2004


Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller
In directory jcorp2.servlets.net:/tmp/cvs-serv23386/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller

Modified Files:
	Controller.java 
Log Message:
remove unused, deadwood code


Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** Controller.java	10 Sep 2004 22:27:14 -0000	1.96
--- Controller.java	27 Sep 2004 05:27:23 -0000	1.97
***************
*** 2108,2121 ****
              } else {
                  // If we get here, then we have a recognised user with
!                 // a genuine login account.  First we get the
!                 // associated registration controller as stated in the
!                 // expresso-config
! 
!                 String className = ConfigManager.getClassHandler("registration");
!                 if (className == null || className.length() == 0) {
!                     className = com.jcorporate.expresso.services.controller.Registration.class.getName();
!                 }
  
!                 // See if there is a regDomain out there assigned to that groupname.
                  try {
                      ControllerSecurity cs = new ControllerSecurity();
--- 2108,2114 ----
              } else {
                  // If we get here, then we have a recognised user with
!                 // a genuine login account.
  
!                 // See if there is a regDomain out there assigned to
                  try {
                      ControllerSecurity cs = new ControllerSecurity();
***************
*** 2178,2184 ****
                              return null;
  
!                         } else
                              log.warn(
                                      "Registration Domain for " + groupName + " and class " + getClass().getName() + " not found");
                      }
                  } catch (DBException dbe) {
--- 2171,2178 ----
                              return null;
  
!                         } else {
                              log.warn(
                                      "Registration Domain for " + groupName + " and class " + getClass().getName() + " not found");
+                         }
                      }
                  } catch (DBException dbe) {



More information about the cvs mailing list