geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r775403 - in /geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7: handler/InstanceContextHandler.java handler/UserTransactionHandler.java security/auth/JAASLoginService.java
Date Sat, 16 May 2009 00:23:32 GMT
Author: djencks
Date: Sat May 16 00:23:31 2009
New Revision: 775403

URL: http://svn.apache.org/viewvc?rev=775403&view=rev
Log:
tweak jetty7 integration to recent api change

Modified:
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java?rev=775403&r1=775402&r2=775403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
Sat May 16 00:23:31 2009
@@ -51,7 +51,7 @@
     }
 
     public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse
response) throws IOException, ServletException {
-        DispatcherType dispatch = ((Request)request).getDispatcherType();
+        DispatcherType dispatch = baseRequest.getDispatcherType();
         try {
             if (DispatcherType.REQUEST.equals(dispatch)) {
                 ConnectorInstanceContext oldContext = trackedConnectionAssociator.enter(new
SharedConnectorInstanceContext(unshareableResources, applicationManagedSecurityResources,
false));

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java?rev=775403&r1=775402&r2=775403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
Sat May 16 00:23:31 2009
@@ -50,7 +50,7 @@
         try {
             next.handle(target, baseRequest, request, response);
         } finally {
-             DispatcherType dispatch = ((Request)request).getDispatcherType();
+             DispatcherType dispatch = baseRequest.getDispatcherType();
              if ((!active && isMarkedRollback()) || (DispatcherType.REQUEST.equals(dispatch)
&& isActive())) {
                 try {
                     userTransaction.rollback();

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java?rev=775403&r1=775402&r2=775403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
Sat May 16 00:23:31 2009
@@ -55,7 +55,7 @@
     }
 
     public UserIdentity login(String username, Object credentials) {
-        char[] password = (char[]) credentials;
+        char[] password = credentials instanceof  String? ((String)credentials).toCharArray():
(char[]) credentials;
         CallbackHandler callbackHandler = new PasswordCallbackHandler(username, password);
         try {
             LoginContext loginContext = ContextManager.login(securityRealm, callbackHandler);



Mime
View raw message