You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/07/11 10:09:21 UTC
svn commit: r1145058 - in /geronimo/server/trunk: ./
plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/
plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/
plugins/tomcat/geronimo-tomcat7/src/t...
Author: xuhaihong
Date: Mon Jul 11 08:09:20 2011
New Revision: 1145058
URL: http://svn.apache.org/viewvc?rev=1145058&view=rev
Log:
Upgrade Tomcat version to 7.0.18.0-SNAPSHOT
Modified:
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCRealm.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-1.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-2.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java?rev=1145058&r1=1145057&r2=1145058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java Mon Jul 11 08:09:20 2011
@@ -39,6 +39,7 @@ import javax.naming.directory.Modificati
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import org.apache.naming.NamingEntry;
import org.apache.naming.resources.BaseDirContext;
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.ResourceAttributes;
@@ -245,13 +246,13 @@ public class BundleDirContext extends Ba
}
@Override
- protected NamingEnumeration<Binding> doListBindings(String name) throws NamingException {
+ protected List<NamingEntry> doListBindings(String name) throws NamingException {
name = getName(name);
Enumeration entries = BundleUtils.getEntryPaths(bundle, name);
if (entries == null) {
throw new NamingException("Resource not found: " + name);
} else {
- return new BindingEnumeration(bundle, name, entries);
+ return Collections.list(new BindingEnumeration(bundle, name, entries));
}
}
@@ -340,7 +341,7 @@ public class BundleDirContext extends Ba
}
}
- private static class BindingEnumeration implements NamingEnumeration<Binding> {
+ private static class BindingEnumeration implements NamingEnumeration<NamingEntry> {
private Bundle bundle;
@@ -354,7 +355,7 @@ public class BundleDirContext extends Ba
this.entries = entries;
}
- public Binding next() throws NamingException {
+ public NamingEntry next() throws NamingException {
return nextElement();
}
@@ -369,13 +370,13 @@ public class BundleDirContext extends Ba
return (entries != null && entries.hasMoreElements());
}
- public Binding nextElement() {
+ public NamingEntry nextElement() {
String name = (String) entries.nextElement();
String relativeName = getRelativeName(name);
if (name.endsWith("/")) {
- return new Binding(removeSlash(relativeName), new BundleDirContext(bundle, name));
+ return new NamingEntry(removeSlash(relativeName), new BundleDirContext(bundle, name), NamingEntry.CONTEXT);
} else {
- return new Binding(relativeName, relativeName);
+ return new NamingEntry(relativeName, relativeName, NamingEntry.ENTRY);
}
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCRealm.java?rev=1145058&r1=1145057&r2=1145058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCRealm.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/jacc/JACCRealm.java Mon Jul 11 08:09:20 2011
@@ -36,6 +36,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.geronimo.security.ContextManager;
+import org.ietf.jgss.GSSContext;
/**
* @version $Rev$ $Date$
@@ -45,7 +46,7 @@ public class JACCRealm implements Realm
public static final JACCRealm INSTANCE = new JACCRealm();
private static final ThreadLocal<String> currentRequestWrapperName = new ThreadLocal<String>();
-
+
public static String setRequestWrapperName(String requestWrapperName) {
String old = currentRequestWrapperName.get();
currentRequestWrapperName.set(requestWrapperName);
@@ -91,51 +92,64 @@ public class JACCRealm implements Realm
}
}
+ @Override
public Container getContainer() {
return null;
}
+ @Override
public void setContainer(Container container) {
}
+ @Override
public String getInfo() {
return null;
}
+ @Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
}
+ @Override
public Principal authenticate(String username, String credentials) {
return null;
}
- public Principal authenticate(String username, byte[] credentials) {
- return null;
- }
-
+ @Override
public Principal authenticate(String username, String digest, String nonce, String nc, String cnonce, String qop, String realm, String md5a2) {
return null;
}
+ @Override
public Principal authenticate(X509Certificate[] certs) {
return null;
}
+ @Override
public void backgroundProcess() {
}
+ @Override
public SecurityConstraint[] findSecurityConstraints(Request request, Context context) {
return new SecurityConstraint[0];
}
+ @Override
public boolean hasResourcePermission(Request request, Response response, SecurityConstraint[] constraint, Context context) throws IOException {
return false;
}
+ @Override
public boolean hasUserDataPermission(Request request, Response response, SecurityConstraint[] constraint) throws IOException {
return false;
}
+ @Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
}
+
+ @Override
+ public Principal authenticate(GSSContext gssContext, boolean storeCreds) {
+ return null;
+ }
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java?rev=1145058&r1=1145057&r2=1145058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java Mon Jul 11 08:09:20 2011
@@ -45,7 +45,7 @@ public class TomcatServerGBeanTest exten
FileReader in = new FileReader(server1);
try {
ServerType serverType = TomcatServerGBean.loadServerType(in);
- assertEquals(4, serverType.getListener().size());
+ assertEquals(3, serverType.getListener().size());
Server server = serverType.build(getClass().getClassLoader(), null);
try {
((Lifecycle) server).start();
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-1.xml?rev=1145058&r1=1145057&r2=1145058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-1.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-1.xml Mon Jul 11 08:09:20 2011
@@ -28,8 +28,6 @@
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-2.xml?rev=1145058&r1=1145057&r2=1145058&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-2.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/resources/deployables/server-2.xml Mon Jul 11 08:09:20 2011
@@ -28,8 +28,6 @@
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1145058&r1=1145057&r2=1145058&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Jul 11 08:09:20 2011
@@ -66,7 +66,7 @@
FIXME: STOP using properties for dependency versions unless you absolutly need them,
ie. you have a hundred dependencies that all use the same version.
-->
- <tomcatVersion>7.0.6.0-SNAPSHOT</tomcatVersion>
+ <tomcatVersion>7.0.18.0-SNAPSHOT</tomcatVersion>
<tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
<openejbVersion>4.0.0-SNAPSHOT</openejbVersion>