You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/08/10 20:42:40 UTC
svn commit: r684568 [2/2] - in /geronimo/sandbox/djencks/jetty7: ./
geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/
geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/
geronimo-jetty7-clustering-bui...
Added: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java?rev=684568&view=auto
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java (added)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java Sun Aug 10 11:42:39 2008
@@ -0,0 +1,403 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.jetty7.security.auth;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.security.Principal;
+import java.util.Arrays;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.message.AuthException;
+import javax.security.auth.message.AuthStatus;
+import javax.security.auth.message.MessageInfo;
+import javax.security.auth.message.MessagePolicy;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
+import org.mortbay.jetty.security.Constraint;
+import org.mortbay.jetty.security.CrossContextPsuedoSession;
+import org.mortbay.jetty.security.JettyMessageInfo;
+import org.mortbay.jetty.security.jaspi.modules.UserInfo;
+import org.mortbay.jetty.security.jaspi.modules.LoginResult;
+import org.mortbay.jetty.security.jaspi.modules.LoginCredentials;
+import org.mortbay.jetty.security.jaspi.modules.UserPasswordLoginCredentials;
+import org.mortbay.log.Log;
+import org.mortbay.util.StringUtil;
+import org.mortbay.util.URIUtil;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class FormAuthModule extends BaseAuthModule
+{
+ /* ------------------------------------------------------------ */
+ public final static String __J_URI = "org.mortbay.jetty.URI";
+ public final static String __J_AUTHENTICATED = "org.mortbay.jetty.Auth";
+ public final static String __J_SECURITY_CHECK = "/j_security_check";
+ public final static String __J_USERNAME = "j_username";
+ public final static String __J_PASSWORD = "j_password";
+
+ // private String realmName;
+ public static final String LOGIN_PAGE_KEY = "org.mortbay.jetty.security.jaspi.modules.LoginPage";
+ public static final String ERROR_PAGE_KEY = "org.mortbay.jetty.security.jaspi.modules.ErrorPage";
+ public static final String SSO_SOURCE_KEY = "org.mortbay.jetty.security.jaspi.modules.SsoSource";
+
+ private String _formErrorPage;
+ private String _formErrorPath;
+ private String _formLoginPage;
+ private String _formLoginPath;
+
+ private CrossContextPsuedoSession<UserInfo> ssoSource;
+
+ public FormAuthModule()
+ {
+ }
+
+ public FormAuthModule(CallbackHandler callbackHandler, String securityRealm, String loginPage, String errorPage)
+ {
+ super(callbackHandler, securityRealm);
+ setLoginPage(loginPage);
+ setErrorPage(errorPage);
+ }
+
+ public FormAuthModule(CallbackHandler callbackHandler, String securityRealm, CrossContextPsuedoSession<UserInfo> ssoSource, String loginPage, String errorPage)
+ {
+ super(callbackHandler, securityRealm);
+ this.ssoSource = ssoSource;
+ setLoginPage(loginPage);
+ setErrorPage(errorPage);
+ }
+
+ @Override
+ public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException
+ {
+ super.initialize(requestPolicy, responsePolicy, handler, options);
+ setLoginPage((String) options.get(LOGIN_PAGE_KEY));
+ setErrorPage((String) options.get(ERROR_PAGE_KEY));
+ ssoSource = (CrossContextPsuedoSession<UserInfo>) options.get(SSO_SOURCE_KEY);
+ }
+
+ private void setLoginPage(String path)
+ {
+ if (!path.startsWith("/"))
+ {
+ Log.warn("form-login-page must start with /");
+ path = "/" + path;
+ }
+ _formLoginPage = path;
+ _formLoginPath = path;
+ if (_formLoginPath.indexOf('?') > 0)
+ _formLoginPath = _formLoginPath.substring(0, _formLoginPath.indexOf('?'));
+ }
+
+ /* ------------------------------------------------------------ */
+ private void setErrorPage(String path)
+ {
+ if (path == null || path.trim().length() == 0)
+ {
+ _formErrorPath = null;
+ _formErrorPage = null;
+ }
+ else
+ {
+ if (!path.startsWith("/"))
+ {
+ Log.warn("form-error-page must start with /");
+ path = "/" + path;
+ }
+ _formErrorPage = path;
+ _formErrorPath = path;
+
+ if (_formErrorPath.indexOf('?') > 0)
+ _formErrorPath = _formErrorPath.substring(0, _formErrorPath.indexOf('?'));
+ }
+ }
+
+ @Override
+ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) throws AuthException
+ {
+ HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage();
+ HttpServletResponse response = (HttpServletResponse) messageInfo.getResponseMessage();
+ HttpSession session = request.getSession(isMandatory(messageInfo));
+ String uri = request.getPathInfo();
+ //not mandatory and not authenticated
+ if (session == null || isLoginOrErrorPage(uri))
+ return AuthStatus.SUCCESS;
+
+ try
+ {
+ // Handle a request for authentication.
+ // TODO perhaps j_securitycheck can be uri suffix?
+ if (uri.endsWith(__J_SECURITY_CHECK))
+ {
+
+ final String username = request.getParameter(__J_USERNAME);
+ final char[] password = request.getParameter(__J_PASSWORD).toCharArray();
+ boolean success = tryLogin(messageInfo, clientSubject, response, session, username, password);
+ if (success)
+ {
+ // Redirect to original request
+ String nuri = (String) session.getAttribute(__J_URI);
+ if (nuri == null || nuri.length() == 0)
+ {
+ nuri = request.getContextPath();
+ if (nuri.length() == 0)
+ nuri = URIUtil.SLASH;
+ }
+ session.removeAttribute(__J_URI); // Remove popped return URI.
+ response.setContentLength(0);
+ response.sendRedirect(response.encodeRedirectURL(nuri));
+
+ return AuthStatus.SEND_CONTINUE;
+ }
+ //not authenticated
+ if (Log.isDebugEnabled()) Log.debug("Form authentication FAILED for " + StringUtil.printable(username));
+ if (_formErrorPage == null)
+ {
+ if (response != null)
+ response.sendError(HttpServletResponse.SC_FORBIDDEN);
+ }
+ else
+ {
+ response.setContentLength(0);
+ response.sendRedirect(response.encodeRedirectURL
+ (URIUtil.addPaths(request.getContextPath(),
+ _formErrorPage)));
+ }
+ //TODO is this correct response if isMandatory false??? Can that occur?
+ return AuthStatus.SEND_FAILURE;
+ }
+ // Check if the session is already authenticated.
+ FormCredential form_cred = (FormCredential) session.getAttribute(__J_AUTHENTICATED);
+
+ if (form_cred != null)
+ {
+ boolean success = tryLogin(messageInfo, clientSubject, response, session, form_cred._jUserName, form_cred._jPassword);
+ if (success)
+ {
+ return AuthStatus.SUCCESS;
+ }
+// CallbackHandler loginCallbackHandler = new UserPasswordCallbackHandler(form_cred._jUserName, form_cred._jPassword);
+// LoginResult loginResult = securityRealm.login(clientSubject, loginCallbackHandler);
+// //TODO what should happen if !isMandatory but credentials exist and are wrong?
+// if (loginResult.isSuccess())
+// {
+// callbackHandler.handle(new Callback[]{loginResult.getCallerPrincipalCallback(), loginResult.getGroupPrincipalCallback()});
+// messageInfo.getMap().put(JettyMessageInfo.AUTH_METHOD_KEY, Constraint.__FORM_AUTH);
+//
+// form_cred = new FormCredential(form_cred._jUserName, form_cred._jPassword, loginResult.getCallerPrincipalCallback().getPrincipal());
+//
+// session.setAttribute(__J_AUTHENTICATED, form_cred);
+// if (ssoSource != null && ssoSource.fetch(request) == null)
+// {
+// UserInfo userInfo = new UserInfo(form_cred._jUserName, form_cred._jPassword);
+// ssoSource.store(userInfo, response);
+// }
+// messageInfo.getMap().put(JettyMessageInfo.AUTH_METHOD_KEY, Constraint.__FORM_AUTH);
+// return AuthStatus.SUCCESS;
+// }
+
+
+// // We have a form credential. Has it been distributed?
+// if (form_cred._userPrincipal==null)
+// {
+// // This form_cred appears to have been distributed. Need to reauth
+// form_cred.authenticate(realm, request);
+//
+// // Sign-on to SSO mechanism
+// if (form_cred._userPrincipal!=null && realm instanceof SSORealm)
+// ((SSORealm)realm).setSingleSignOn(request,response,form_cred._userPrincipal,new Password(form_cred._jPassword));
+//
+// }
+// else if (!realm.reauthenticate(form_cred._userPrincipal))
+// // Else check that it is still authenticated.
+// form_cred._userPrincipal=null;
+//
+// // If this credential is still authenticated
+// if (form_cred._userPrincipal!=null)
+// {
+// if(Log.isDebugEnabled())Log.debug("FORM Authenticated for "+form_cred._userPrincipal.getName());
+// request.setAuthType(Constraint.__FORM_AUTH);
+// //jaspi
+//// request.setUserPrincipal(form_cred._userPrincipal);
+// return form_cred._userPrincipal;
+// }
+// else
+// session.setAttribute(__J_AUTHENTICATED,null);
+// }
+// else if (realm instanceof SSORealm)
+// {
+// // Try a single sign on.
+// Credential cred = ((SSORealm)realm).getSingleSignOn(request,response);
+//
+// if (request.getUserPrincipal()!=null)
+// {
+// form_cred=new FormCredential();
+// form_cred._userPrincipal=request.getUserPrincipal();
+// form_cred._jUserName=form_cred._userPrincipal.getName();
+// if (cred!=null)
+// form_cred._jPassword=cred.toString();
+// if(Log.isDebugEnabled())Log.debug("SSO for "+form_cred._userPrincipal);
+//
+// request.setAuthType(Constraint.__FORM_AUTH);
+// session.setAttribute(__J_AUTHENTICATED,form_cred);
+// return form_cred._userPrincipal;
+// }
+ }
+ else if (ssoSource != null)
+ {
+ UserInfo userInfo = ssoSource.fetch(request);
+ if (userInfo != null)
+ {
+ boolean success = tryLogin(messageInfo, clientSubject, response, session, userInfo.getUserName(), userInfo.getPassword());
+ if (success)
+ {
+ return AuthStatus.SUCCESS;
+ }
+ }
+ }
+
+ // Don't authenticate authform or errorpage
+ if (!isMandatory(messageInfo) || isLoginOrErrorPage(uri))
+ //TODO verify this is correct action
+ return AuthStatus.SUCCESS;
+
+ // redirect to login page
+ if (request.getQueryString() != null)
+ uri += "?" + request.getQueryString();
+ session.setAttribute(__J_URI,
+ request.getScheme() +
+ "://" + request.getServerName() +
+ ":" + request.getServerPort() +
+ URIUtil.addPaths(request.getContextPath(), uri));
+ response.setContentLength(0);
+ response.sendRedirect(response.encodeRedirectURL(URIUtil.addPaths(request.getContextPath(),
+ _formLoginPage)));
+ return AuthStatus.SEND_CONTINUE;
+ }
+ catch (IOException e)
+ {
+ throw new AuthException(e.getMessage());
+ }
+ catch (UnsupportedCallbackException e)
+ {
+ throw new AuthException(e.getMessage());
+ }
+
+ }
+
+ private boolean tryLogin(MessageInfo messageInfo, Subject clientSubject, HttpServletResponse response, HttpSession session, String username, char[] password)
+ throws AuthException, IOException, UnsupportedCallbackException
+ {
+ LoginCredentials loginCredentials = new UserPasswordLoginCredentials(username, password);
+ LoginResult loginResult = loginService.login(clientSubject, loginCredentials);
+ //TODO what should happen if !isMandatory but credentials exist and are wrong?
+ if (loginResult.isSuccess())
+ {
+ callbackHandler.handle(new Callback[]{loginResult.getCallerPrincipalCallback(), loginResult.getGroupPrincipalCallback()});
+ messageInfo.getMap().put(JettyMessageInfo.AUTH_METHOD_KEY, Constraint.__FORM_AUTH);
+
+ FormCredential form_cred = new FormCredential(username, password, loginResult.getCallerPrincipalCallback().getPrincipal());
+
+ session.setAttribute(__J_AUTHENTICATED, form_cred);
+ // Sign-on to SSO mechanism
+ if (ssoSource != null)
+ {
+ UserInfo userInfo = new UserInfo(username, password);
+ ssoSource.store(userInfo, response);
+ }
+
+ }
+ return loginResult.isSuccess();
+ }
+
+
+ public boolean isLoginOrErrorPage(String pathInContext)
+ {
+ return pathInContext != null &&
+ (pathInContext.equals(_formErrorPath) || pathInContext.equals(_formLoginPath));
+ }
+
+ /* ------------------------------------------------------------ */
+ /**
+ * FORM Authentication credential holder.
+ */
+ private static class FormCredential implements Serializable, HttpSessionBindingListener
+ {
+ String _jUserName;
+ char[] _jPassword;
+ transient Principal _userPrincipal;
+
+ private FormCredential(String _jUserName, char[] _jPassword, Principal _userPrincipal)
+ {
+ this._jUserName = _jUserName;
+ this._jPassword = _jPassword;
+ this._userPrincipal = _userPrincipal;
+ }
+
+
+ public void valueBound(HttpSessionBindingEvent event)
+ {
+ }
+
+ public void valueUnbound(HttpSessionBindingEvent event)
+ {
+ if (Log.isDebugEnabled()) Log.debug("Logout " + _jUserName);
+
+ //TODO jaspi call cleanSubject()
+// if (_realm instanceof SSORealm)
+// ((SSORealm) _realm).clearSingleSignOn(_jUserName);
+//
+// if (_realm != null && _userPrincipal != null)
+// _realm.logout(_userPrincipal);
+ }
+
+ public int hashCode()
+ {
+ return _jUserName.hashCode() + _jPassword.hashCode();
+ }
+
+ public boolean equals(Object o)
+ {
+ if (!(o instanceof FormCredential))
+ return false;
+ FormCredential fc = (FormCredential) o;
+ return
+ _jUserName.equals(fc._jUserName) &&
+ Arrays.equals(_jPassword, fc._jPassword);
+ }
+
+ public String toString()
+ {
+ return "Cred[" + _jUserName + "]";
+ }
+
+ }
+
+}
\ No newline at end of file
Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/FormAuthModule.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java?rev=684568&view=auto
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java (added)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java Sun Aug 10 11:42:39 2008
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.jetty7.security.auth;
+
+import java.security.Principal;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.message.AuthException;
+
+import org.mortbay.jetty.security.jaspi.modules.LoginService;
+import org.mortbay.jetty.security.jaspi.modules.LoginResult;
+import org.mortbay.jetty.security.jaspi.modules.LoginCredentials;
+import org.mortbay.jetty.security.jaspi.modules.UserPasswordLoginCredentials;
+import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.realm.providers.PasswordCallbackHandler;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class JAASLoginService implements LoginService {
+ private final String securityRealm;
+
+ public JAASLoginService(String securityRealm) {
+ this.securityRealm = securityRealm;
+ }
+
+ public LoginResult login(Subject subject, LoginCredentials loginCredentials) throws AuthException {
+ String username = ((UserPasswordLoginCredentials)loginCredentials).getUsername();
+ char[] password = ((UserPasswordLoginCredentials)loginCredentials).getPassword();
+ CallbackHandler callbackHandler = new PasswordCallbackHandler(username, password);
+ try {
+ LoginContext loginContext = ContextManager.login(securityRealm, callbackHandler);
+ Subject establishedSubject = loginContext.getSubject();
+ Principal userPrincipal = ContextManager.getCurrentPrincipal(establishedSubject);
+ subject.getPrincipals().addAll(establishedSubject.getPrincipals());
+ subject.getPrivateCredentials().addAll(establishedSubject.getPrivateCredentials());
+ subject.getPublicCredentials().addAll((establishedSubject.getPublicCredentials()));
+ return new LoginResult(true, userPrincipal, null, subject);
+ } catch (LoginException e) {
+ return new LoginResult(false, null, null, null);
+ }
+ }
+
+ public void logout(Subject subject) throws AuthException {
+ //not sure how to do this
+ }
+
+ @Deprecated
+ public String getName() {
+ return securityRealm;
+ }
+}
Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=684568&r1=684567&r2=684568&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java Sun Aug 10 11:42:39 2008
@@ -33,7 +33,6 @@
import javax.security.auth.message.MessageInfo;
import javax.security.jacc.WebUserDataPermission;
import javax.security.jacc.WebResourcePermission;
-import javax.security.jacc.PolicyContextException;
import javax.transaction.TransactionManager;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
@@ -116,7 +115,9 @@
}
});
}
+ String contextPath = "/test";
JettyWebAppContext app = new JettyWebAppContext(null,
+ contextPath,
null,
Collections.<String, Object>emptyMap(),
cl,
@@ -149,7 +150,6 @@
null,
null,
null);
- app.setContextPath("/test");
app.doStart();
return app;
}
Modified: geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml?rev=684568&r1=684567&r2=684568&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml Sun Aug 10 11:42:39 2008
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetty6-clustering-wadi</artifactId>
+ <artifactId>jetty7-clustering-wadi</artifactId>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml?rev=684568&r1=684567&r2=684568&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml Sun Aug 10 11:42:39 2008
@@ -126,7 +126,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetty6</artifactId>
+ <artifactId>jetty7</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -179,6 +179,6 @@
<attribute name="servletName">dummy</attribute>
</gbean>
- <gbean name="Jetty6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+ <gbean name="jetty7WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
</module>
Modified: geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml?rev=684568&r1=684567&r2=684568&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml Sun Aug 10 11:42:39 2008
@@ -88,7 +88,7 @@
<!-- DONT USE THIS ONE -->
<!--
- <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSocketConnector">
+ <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty7.connector.HTTPSSocketConnector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPSPort}</attribute>
<attribute name="keyStore">geronimo-default</attribute>
Modified: geronimo/sandbox/djencks/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/pom.xml?rev=684568&r1=684567&r2=684568&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/pom.xml Sun Aug 10 11:42:39 2008
@@ -21,49 +21,54 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
-
+
<artifactId>jetty7</artifactId>
<name>Geronimo Plugins, Jetty7</name>
<packaging>pom</packaging>
-
+
<description>
Jetty7 plugin
</description>
-<dependencyManagement>
-<dependencies>
-<dependency>
-<groupId>org.mortbay.jetty</groupId>
-<artifactId>jetty</artifactId>
-<version>7.0-SNAPSHOT</version>
-</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-ajp</artifactId>
-<version>7.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-ssl</artifactId>
-<version>7.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
-<version>7.0-SNAPSHOT</version>
- </dependency>
-
-</dependencies>
-</dependencyManagement>
-
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-ajp</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-ssl</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>7.0-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>geronimo-jetty7</module>