Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2012-01-19 12:40:07 +11:00
parent f79bdfaf2e ec7eb3348a
commit 7cd887d48b
11 changed files with 114 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-aggregate/jetty-all-server/pom.xml
View File

@ -163,6 +163,10 @@
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -233,6 +237,11 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId> <artifactId>geronimo-jaspic_1.0_spec</artifactId>

9
jetty-aggregate/jetty-all/pom.xml
View File

@ -147,6 +147,10 @@
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -217,6 +221,11 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId> <artifactId>geronimo-jaspic_1.0_spec</artifactId>

9
jetty-aggregate/jetty-plus/pom.xml
View File

@ -96,6 +96,10 @@
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -113,5 +117,10 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
jetty-distribution/pom.xml
View File

@ -12,6 +12,7 @@
<jetty-orbit-url>http://download.eclipse.org/jetty/orbit</jetty-orbit-url> <jetty-orbit-url>http://download.eclipse.org/jetty/orbit</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory> <assembly-directory>target/distribution</assembly-directory>
<eclipse-ecj-version>3.6</eclipse-ecj-version> <eclipse-ecj-version>3.6</eclipse-ecj-version>
<orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
<orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version> <orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
<orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version> <orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
<orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version> <orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
@ -68,6 +69,7 @@
<mkdir dir="${orbit-cache}" /> <mkdir dir="${orbit-cache}" />
<get dest="${orbit-cache}" verbose="true" skipexisting="true"> <get dest="${orbit-cache}" verbose="true" skipexisting="true">
<url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" /> <url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
<url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
<url url="${jetty-orbit-url}/javax.annotation_${orbit-javax-annotation-version}.jar" /> <url url="${jetty-orbit-url}/javax.annotation_${orbit-javax-annotation-version}.jar" />
<url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" /> <url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
<url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" /> <url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" />

1
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
View File

@ -640,7 +640,6 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
catch (IOException e) catch (IOException e)
{ {
LOG.warn(e.toString()); LOG.warn(e.toString());
LOG.debug(e);
try{close();} try{close();}
catch(IOException e2){LOG.ignore(e2);} catch(IOException e2){LOG.ignore(e2);}
} }

43
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
View File

@ -42,7 +42,7 @@ import org.eclipse.jetty.util.thread.Timeout.Task;
*/ */
public class SslConnection extends AbstractConnection implements AsyncConnection public class SslConnection extends AbstractConnection implements AsyncConnection
{ {
static final Logger LOG=Log.getLogger("org.eclipse.jetty.io.nio.ssl"); private final Logger _logger = Log.getLogger("org.eclipse.jetty.io.nio.ssl");
private static final NIOBuffer __ZERO_BUFFER=new IndirectNIOBuffer(0); private static final NIOBuffer __ZERO_BUFFER=new IndirectNIOBuffer(0);
@ -195,7 +195,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
progress=true; progress=true;
} }
LOG.debug("{} handle {} progress={}", _session, this, progress); _logger.debug("{} handle {} progress={}", _session, this, progress);
} }
} }
finally finally
@ -211,9 +211,10 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
} }
catch(Throwable x) catch(Throwable x)
{ {
LOG.warn("onInputShutdown failed", x); _logger.warn("onInputShutdown failed", x);
try{_sslEndPoint.close();} try{_sslEndPoint.close();}
catch(IOException e2){LOG.ignore(e2);} catch(IOException e2){
_logger.ignore(e2);}
} }
} }
} }
@ -244,7 +245,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
{ {
try try
{ {
LOG.debug("onIdleExpired {}ms on {}",idleForMs,this); _logger.debug("onIdleExpired {}ms on {}",idleForMs,this);
if (_endp.isOutputShutdown()) if (_endp.isOutputShutdown())
_sslEndPoint.close(); _sslEndPoint.close();
else else
@ -252,7 +253,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
} }
catch (IOException e) catch (IOException e)
{ {
LOG.warn(e); _logger.warn(e);
super.onIdleExpired(idleForMs); super.onIdleExpired(idleForMs);
} }
} }
@ -335,7 +336,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
} }
finally finally
{ {
LOG.debug("{} {} {} filled={}/{} flushed={}/{}",_session,this,_engine.getHandshakeStatus(),filled,_inbound.length(),flushed,_outbound.length()); _logger.debug("{} {} {} filled={}/{} flushed={}/{}",_session,this,_engine.getHandshakeStatus(),filled,_inbound.length(),flushed,_outbound.length());
} }
// handle the current hand share status // handle the current hand share status
@ -437,8 +438,8 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
out_buffer.position(_outbound.putIndex()); out_buffer.position(_outbound.putIndex());
out_buffer.limit(out_buffer.capacity()); out_buffer.limit(out_buffer.capacity());
result=_engine.wrap(bbuf,out_buffer); result=_engine.wrap(bbuf,out_buffer);
if (LOG.isDebugEnabled()) if (_logger.isDebugEnabled())
LOG.debug("{} wrap {} {} consumed={} produced={}", _logger.debug("{} wrap {} {} consumed={} produced={}",
_session, _session,
result.getStatus(), result.getStatus(),
result.getHandshakeStatus(), result.getHandshakeStatus(),
@ -451,7 +452,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
} }
catch(SSLException e) catch(SSLException e)
{ {
LOG.warn(String.valueOf(_endp), e); _logger.debug(String.valueOf(_endp), e);
_endp.close(); _endp.close();
throw e; throw e;
} }
@ -479,13 +480,13 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
break; break;
case CLOSED: case CLOSED:
LOG.debug("wrap CLOSE {} {}",this,result); _logger.debug("wrap CLOSE {} {}",this,result);
if (result.getHandshakeStatus()==HandshakeStatus.FINISHED) if (result.getHandshakeStatus()==HandshakeStatus.FINISHED)
_endp.close(); _endp.close();
break; break;
default: default:
LOG.warn("{} wrap default {}",_session,result); _logger.debug("{} wrap default {}",_session,result);
throw new IOException(result.toString()); throw new IOException(result.toString());
} }
@ -513,8 +514,8 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
in_buffer.limit(_inbound.putIndex()); in_buffer.limit(_inbound.putIndex());
result=_engine.unwrap(in_buffer,bbuf); result=_engine.unwrap(in_buffer,bbuf);
if (LOG.isDebugEnabled()) if (_logger.isDebugEnabled())
LOG.debug("{} unwrap {} {} consumed={} produced={}", _logger.debug("{} unwrap {} {} consumed={} produced={}",
_session, _session,
result.getStatus(), result.getStatus(),
result.getHandshakeStatus(), result.getHandshakeStatus(),
@ -527,7 +528,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
} }
catch(SSLException e) catch(SSLException e)
{ {
LOG.warn(String.valueOf(_endp), e); _logger.debug(String.valueOf(_endp), e);
_endp.close(); _endp.close();
throw e; throw e;
} }
@ -549,7 +550,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
break; break;
case BUFFER_OVERFLOW: case BUFFER_OVERFLOW:
LOG.debug("{} unwrap {} {}->{}",_session,result.getStatus(),_inbound.toDetailString(),buffer.toDetailString()); _logger.debug("{} unwrap {} {}->{}",_session,result.getStatus(),_inbound.toDetailString(),buffer.toDetailString());
break; break;
case OK: case OK:
@ -558,13 +559,13 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
break; break;
case CLOSED: case CLOSED:
LOG.debug("unwrap CLOSE {} {}",this,result); _logger.debug("unwrap CLOSE {} {}",this,result);
if (result.getHandshakeStatus()==HandshakeStatus.FINISHED) if (result.getHandshakeStatus()==HandshakeStatus.FINISHED)
_endp.close(); _endp.close();
break; break;
default: default:
LOG.warn("{} wrap default {}",_session,result); _logger.debug("{} wrap default {}",_session,result);
throw new IOException(result.toString()); throw new IOException(result.toString());
} }
@ -613,7 +614,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
{ {
synchronized (SslConnection.this) synchronized (SslConnection.this)
{ {
LOG.debug("{} ssl endp.oshut {}",_session,this); _logger.debug("{} ssl endp.oshut {}",_session,this);
_engine.closeOutbound(); _engine.closeOutbound();
_oshut=true; _oshut=true;
} }
@ -630,7 +631,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
public void shutdownInput() throws IOException public void shutdownInput() throws IOException
{ {
LOG.debug("{} ssl endp.ishut!",_session); _logger.debug("{} ssl endp.ishut!",_session);
// We do not do a closeInput here, as SSL does not support half close. // We do not do a closeInput here, as SSL does not support half close.
// isInputShutdown works it out itself from buffer state and underlying endpoint state. // isInputShutdown works it out itself from buffer state and underlying endpoint state.
} }
@ -647,7 +648,7 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
public void close() throws IOException public void close() throws IOException
{ {
LOG.debug("{} ssl endp.close",_session); _logger.debug("{} ssl endp.close",_session);
_endp.close(); _endp.close();
} }

3
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
View File

@ -5,7 +5,6 @@ import java.io.IOException;
import java.net.Socket; import java.net.Socket;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLEngineResult.HandshakeStatus;
@ -91,7 +90,7 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
ByteBuffer appIn = ByteBuffer.allocate(engine.getSession().getApplicationBufferSize()); ByteBuffer appIn = ByteBuffer.allocate(engine.getSession().getApplicationBufferSize());
ByteBuffer sslIn = ByteBuffer.allocate(engine.getSession().getPacketBufferSize()*2); ByteBuffer sslIn = ByteBuffer.allocate(engine.getSession().getPacketBufferSize()*2);
boolean debug=SslConnection.LOG.isDebugEnabled(); boolean debug=false;
if (debug) System.err.println(engine.getHandshakeStatus()); if (debug) System.err.println(engine.getHandshakeStatus());
int loop=20; int loop=20;

24
jetty-jndi/pom.xml
View File

@ -66,26 +66,26 @@
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>
<artifactId>activation</artifactId> <artifactId>activation</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>below-jdk1.6</id> <id>below-jdk1.6</id>
<activation> <activation>
<jdk>!1.6</jdk> <jdk>(,1.6)</jdk>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>
<artifactId>activation</artifactId> <artifactId>activation</artifactId>
<version>${javax-activation-version}</version> <version>1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>

2
jetty-osgi/test-jetty-osgi/pom.xml
View File

@ -14,6 +14,7 @@
<jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url> <jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory> <assembly-directory>target/distribution</assembly-directory>
<eclipse-ecj-version>3.6</eclipse-ecj-version> <eclipse-ecj-version>3.6</eclipse-ecj-version>
<orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
<orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version> <orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
<orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version> <orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
<orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version> <orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
@ -197,6 +198,7 @@
<mkdir dir="${orbit-cache}" /> <mkdir dir="${orbit-cache}" />
<get dest="${orbit-cache}" verbose="true" skipexisting="true"> <get dest="${orbit-cache}" verbose="true" skipexisting="true">
<url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" /> <url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
<url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
<url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" /> <url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
<url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" /> <url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" />
<url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" /> <url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />

17
jetty-util/src/main/java/org/eclipse/jetty/util/log/JettyAwareLogger.java
View File

@ -598,14 +598,21 @@ class JettyAwareLogger implements org.slf4j.Logger
if (argArray == null) if (argArray == null)
{ {
// Simple SLF4J Message (no args) // Simple SLF4J Message (no args)
_logger.log(marker,FQCN,level,msg,null,t); _logger.log(marker, FQCN, level, msg, null, t);
} }
else else
{ {
// Don't assume downstream handles argArray properly. int loggerLevel = _logger.isTraceEnabled() ? TRACE :
// Do it the SLF4J way here to eliminate that as a bug. _logger.isDebugEnabled() ? DEBUG :
FormattingTuple ft = MessageFormatter.arrayFormat(msg,argArray); _logger.isInfoEnabled() ? INFO :
_logger.log(marker,FQCN,level,ft.getMessage(),null,t); _logger.isWarnEnabled() ? WARN : ERROR;
if (loggerLevel <= level)
{
// Don't assume downstream handles argArray properly.
// Do it the SLF4J way here to eliminate that as a bug.
FormattingTuple ft = MessageFormatter.arrayFormat(msg, argArray);
_logger.log(marker, FQCN, level, ft.getMessage(), null, t);
}
} }
} }
} }

6
pom.xml
View File

@ -11,6 +11,7 @@
<url>${jetty.url}</url> <url>${jetty.url}</url>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<javax-activation-version>1.1</javax-activation-version>
<javax-mail-version>1.4.1</javax-mail-version> <javax-mail-version>1.4.1</javax-mail-version>
<javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version> <javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version>
<javax-transaction-version>1.1.1</javax-transaction-version> <javax-transaction-version>1.1.1</javax-transaction-version>
@ -401,6 +402,11 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<version>${javax-mail-version}</version> <version>${javax-mail-version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax-activation-version}</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>