You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ak...@apache.org on 2008/01/26 22:46:36 UTC
svn commit: r615502 [1/2] - in /mina/asyncweb/trunk: examples/conf/
examples/src/main/java/org/safehaus/asyncweb/example/cookie/
examples/src/main/java/org/safehaus/asyncweb/example/helloworld/
examples/src/main/java/org/safehaus/asyncweb/example/sessi...
Author: akarasulu
Date: Sat Jan 26 13:46:29 2008
New Revision: 615502
URL: http://svn.apache.org/viewvc?rev=615502&view=rev
Log:
moving old safehaus package names in server module
Added:
mina/asyncweb/trunk/server/src/main/java/org/apache/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/BasicServiceContainer.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ContainerLifecycleException.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpService.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceContext.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceFilter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpSession.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ServiceContainer.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/Transport.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/TransportException.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/AbstractHttpServiceContext.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/BasicKeepAliveStrategy.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/CounterKeepAliveStrategy.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/KeepAliveStrategy.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/CSS.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/ErrorResponseFormatter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/StandardResponseFormatter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/SessionKeepAliveFilter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/ThreadPoolFilter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipeline.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipelineListener.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/StandardRequestPipeline.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/CompositeResolver.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ExactMatchURIServiceResolver.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/FixedServiceResolver.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSession.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSessionStore.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionKeyFactory.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionListener.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionStore.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/LoggingSessionListener.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/SecureRandomKeyFactory.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/DefaultHttpIoHandler.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/HttpIoHandler.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/LoggingExceptionMonitor.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java (contents, props changed)
- copied, changed from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java
mina/asyncweb/trunk/server/src/main/resource/
mina/asyncweb/trunk/server/src/main/resource/org/
mina/asyncweb/trunk/server/src/main/resource/org/apache/
mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/
mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/server/
mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/server/errorReporting/
mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/server/errorReporting/strings.properties (props changed)
- copied unchanged from r615497, mina/asyncweb/trunk/server/src/main/resources/org/safehaus/asyncweb/service/errorReporting/strings.properties
Removed:
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/BasicServiceContainer.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ContainerLifecycleException.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpService.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceContext.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceFilter.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpSession.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ServiceContainer.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/Transport.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/TransportException.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/AbstractHttpServiceContext.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/BasicKeepAliveStrategy.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/CounterKeepAliveStrategy.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/KeepAliveStrategy.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/CSS.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/ErrorResponseFormatter.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/StandardResponseFormatter.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/SessionKeepAliveFilter.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/ThreadPoolFilter.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipeline.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipelineListener.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/StandardRequestPipeline.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/CompositeResolver.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ExactMatchURIServiceResolver.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/FixedServiceResolver.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSession.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSessionStore.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionKeyFactory.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionListener.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionStore.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/LoggingSessionListener.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/SecureRandomKeyFactory.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/DefaultHttpIoHandler.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/HttpIoHandler.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/LoggingExceptionMonitor.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java
mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java
mina/asyncweb/trunk/server/src/main/resources/org/safehaus/asyncweb/container/
mina/asyncweb/trunk/server/src/main/resources/org/safehaus/asyncweb/service/errorReporting/strings.properties
Modified:
mina/asyncweb/trunk/examples/conf/AsyncWeb.xml
mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/cookie/CookieExample.java
mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/helloworld/HelloWorldHttpService.java
mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/session/SessionExample.java
mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java
mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java
mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java
mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/MockNextFilter.java
mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/HttpServiceLoader.java
mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/Main.java
Modified: mina/asyncweb/trunk/examples/conf/AsyncWeb.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/conf/AsyncWeb.xml?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/conf/AsyncWeb.xml (original)
+++ mina/asyncweb/trunk/examples/conf/AsyncWeb.xml Sat Jan 26 13:46:29 2008
@@ -24,7 +24,7 @@
<!-- A NIO based HTTP Transport -->
<bean id="mina-transport"
- class="org.safehaus.asyncweb.service.transport.mina.MinaTransport">
+ class="org.apache.asyncweb.server.transport.mina.MinaTransport">
<!--
This property sets the port listened on for new connections
@@ -51,7 +51,7 @@
-->
<property name="ioHandler">
<bean
- class="org.safehaus.asyncweb.service.transport.mina.DefaultHttpIoHandler" />
+ class="org.apache.asyncweb.server.transport.mina.DefaultHttpIoHandler" />
</property>
</bean>
@@ -59,7 +59,7 @@
<!-- The service container -->
<bean id="container"
- class="org.safehaus.asyncweb.service.BasicServiceContainer">
+ class="org.apache.asyncweb.server.BasicServiceContainer">
<!--
This property lists the service handlers to be employed by this
@@ -102,13 +102,13 @@
cookie session identification and a session store
-->
<bean
- class="org.safehaus.asyncweb.service.session.DefaultSessionAccessor">
+ class="org.apache.asyncweb.server.session.DefaultSessionAccessor">
<!--
Employ a basic (in memory) session store with a 15 minute timeout
-->
<property name="sessionStore">
<bean
- class="org.safehaus.asyncweb.service.session.BasicSessionStore">
+ class="org.apache.asyncweb.server.session.BasicSessionStore">
<constructor-arg type="long">
<value>900000</value>
</constructor-arg>
@@ -120,7 +120,7 @@
<list>
<!-- An example listener which logs lifecyle events. This can be removed if required -->
<bean
- class="org.safehaus.asyncweb.service.session.LoggingSessionListener" />
+ class="org.apache.asyncweb.server.session.LoggingSessionListener" />
</list>
</property>
@@ -136,7 +136,7 @@
<!-- The HTTP Service Resolver -->
<bean id="httpServiceHandler"
- class="org.safehaus.asyncweb.service.HttpServiceHandler">
+ class="org.apache.asyncweb.server.HttpServiceHandler">
<!--
This property controls the service resolver employed by the
@@ -148,17 +148,17 @@
-->
<property name="serviceResolver">
<bean
- class="org.safehaus.asyncweb.service.resolver.CompositeResolver">
+ class="org.apache.asyncweb.server.resolver.CompositeResolver">
<property name="resolvers">
<list>
<bean
- class="org.safehaus.asyncweb.service.resolver.SimplePrefixResolver">
+ class="org.apache.asyncweb.server.resolver.SimplePrefixResolver">
<property name="uriPrefix">
<value>/service/</value>
</property>
</bean>
<bean
- class="org.safehaus.asyncweb.service.resolver.PassThruResolver" />
+ class="org.apache.asyncweb.server.resolver.PassThruResolver" />
</list>
</property>
</bean>
Modified: mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/cookie/CookieExample.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/cookie/CookieExample.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/cookie/CookieExample.java (original)
+++ mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/cookie/CookieExample.java Sat Jan 26 13:46:29 2008
@@ -29,10 +29,11 @@
import org.apache.asyncweb.common.DefaultCookie;
import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.*;
-import org.safehaus.asyncweb.service.HttpService;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpService;
+import org.apache.asyncweb.server.HttpServiceContext;
-public class CookieExample implements HttpService {
+public class CookieExample implements HttpService
+{
private static final String ADD_COOKIE_NAME = "cookieName";
Modified: mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/helloworld/HelloWorldHttpService.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/helloworld/HelloWorldHttpService.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/helloworld/HelloWorldHttpService.java (original)
+++ mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/helloworld/HelloWorldHttpService.java Sat Jan 26 13:46:29 2008
@@ -33,8 +33,8 @@
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.common.Cookie;
import org.apache.asyncweb.common.DefaultHttpResponse;
-import org.safehaus.asyncweb.service.HttpService;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpService;
+import org.apache.asyncweb.server.HttpServiceContext;
/**
* A simple <code>HttpService</code> which sends "hello world"
@@ -52,7 +52,7 @@
/**
* Sends the configured message as an HTTP response
*/
- public void handleRequest(HttpServiceContext context) throws Exception {
+ public void handleRequest( HttpServiceContext context) throws Exception {
MutableHttpResponse response = new DefaultHttpResponse();
StringWriter buf = new StringWriter();
Modified: mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/session/SessionExample.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/session/SessionExample.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/session/SessionExample.java (original)
+++ mina/asyncweb/trunk/examples/src/main/java/org/safehaus/asyncweb/example/session/SessionExample.java Sat Jan 26 13:46:29 2008
@@ -26,9 +26,9 @@
import org.apache.mina.common.IoBuffer;
import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.MutableHttpResponse;
-import org.safehaus.asyncweb.service.HttpService;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpService;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpSession;
/**
* A very simple example which demonstrates session usage
@@ -36,7 +36,8 @@
* @author irvingd
*
*/
-public class SessionExample implements HttpService {
+public class SessionExample implements HttpService
+{
private static final String COUNT_PROPERTY = "accessCount";
@@ -105,7 +106,7 @@
}
}
- private boolean checkDestroy(HttpServiceContext context, PrintWriter writer) {
+ private boolean checkDestroy( HttpServiceContext context, PrintWriter writer) {
boolean foundParam = false;
if (context.getRequest().containsParameter(DESTROY_PARAM)) {
foundParam = true;
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/BasicServiceContainer.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/BasicServiceContainer.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/BasicServiceContainer.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java Sat Jan 26 13:46:29 2008
@@ -17,21 +17,21 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import org.safehaus.asyncweb.service.context.BasicKeepAliveStrategy;
-import org.safehaus.asyncweb.service.context.CounterKeepAliveStrategy;
-import org.safehaus.asyncweb.service.context.KeepAliveStrategy;
-import org.safehaus.asyncweb.service.errorReporting.ErrorResponseFormatter;
-import org.safehaus.asyncweb.service.errorReporting.StandardResponseFormatter;
-import org.safehaus.asyncweb.service.session.DefaultSessionAccessor;
-import org.safehaus.asyncweb.service.session.HttpSessionAccessor;
+import org.apache.asyncweb.server.context.KeepAliveStrategy;
+import org.apache.asyncweb.server.errorReporting.ErrorResponseFormatter;
+import org.apache.asyncweb.server.errorReporting.StandardResponseFormatter;
+import org.apache.asyncweb.server.session.DefaultSessionAccessor;
+import org.apache.asyncweb.server.session.HttpSessionAccessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.asyncweb.server.context.BasicKeepAliveStrategy;
+import org.apache.asyncweb.server.context.CounterKeepAliveStrategy;
/**
* Basic <code>ServiceContainer</code> implementation.
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/BasicServiceContainer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ContainerLifecycleException.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ContainerLifecycleException.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ContainerLifecycleException.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
/**
* Exception thrown when a problem is encountered whilst transitioning
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ContainerLifecycleException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpService.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpService.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpService.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
/**
* An application-level HTTP request processor.
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceContext.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceContext.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceContext.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
import java.net.InetSocketAddress;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceFilter.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceFilter.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceFilter.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
public interface HttpServiceFilter {
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceFilter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +28,7 @@
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.HttpRequest;
-import org.safehaus.asyncweb.service.resolver.ServiceResolver;
+import org.apache.asyncweb.server.resolver.ServiceResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpSession.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpSession.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/HttpSession.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
/**
* Provides a mechanism to store data across multiple requests from the same client.
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpSession.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ServiceContainer.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ServiceContainer.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/ServiceContainer.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java Sat Jan 26 13:46:29 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
import java.util.List;
-import org.safehaus.asyncweb.service.context.KeepAliveStrategy;
-import org.safehaus.asyncweb.service.errorReporting.ErrorResponseFormatter;
-import org.safehaus.asyncweb.service.session.HttpSessionAccessor;
+import org.apache.asyncweb.server.context.KeepAliveStrategy;
+import org.apache.asyncweb.server.errorReporting.ErrorResponseFormatter;
+import org.apache.asyncweb.server.session.HttpSessionAccessor;
public interface ServiceContainer {
@@ -71,7 +71,7 @@
*
* @param sessionAccessor The accessor
*/
- void setSessionAccessor(HttpSessionAccessor accessor);
+ void setSessionAccessor( HttpSessionAccessor accessor);
ErrorResponseFormatter getErrorResponseFormatter();
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/ServiceContainer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/Transport.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/Transport.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/Transport.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
/**
* A mechanism over which <code>Request</code>s are received.
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/Transport.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/TransportException.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/TransportException.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/TransportException.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service;
+package org.apache.asyncweb.server;
public class TransportException extends Exception {
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/TransportException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/AbstractHttpServiceContext.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/AbstractHttpServiceContext.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/AbstractHttpServiceContext.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.context;
+package org.apache.asyncweb.server.context;
import java.net.InetSocketAddress;
@@ -27,9 +27,9 @@
import org.apache.asyncweb.common.HttpResponse;
import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.asyncweb.common.MutableHttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpSession;
-import org.safehaus.asyncweb.service.ServiceContainer;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpSession;
+import org.apache.asyncweb.server.ServiceContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +39,8 @@
* @author trustin
* @version $Rev:167 $, $Date:2006-11-15 11:10:05 +0000 (ì, 15 11ì 2006) $
*/
-public abstract class AbstractHttpServiceContext implements HttpServiceContext {
+public abstract class AbstractHttpServiceContext implements HttpServiceContext
+{
private final Logger log = LoggerFactory
.getLogger(AbstractHttpServiceContext.class);
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/BasicKeepAliveStrategy.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/BasicKeepAliveStrategy.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/BasicKeepAliveStrategy.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java Sat Jan 26 13:46:29 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.context;
+package org.apache.asyncweb.server.context;
import org.apache.asyncweb.common.HttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/BasicKeepAliveStrategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/CounterKeepAliveStrategy.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/CounterKeepAliveStrategy.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/CounterKeepAliveStrategy.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java Sat Jan 26 13:46:29 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.context;
+package org.apache.asyncweb.server.context;
import org.apache.asyncweb.common.HttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceContext;
public class CounterKeepAliveStrategy extends BasicKeepAliveStrategy {
@@ -46,7 +46,7 @@
* @param response The response to check
*/
@Override
- protected boolean doIsKeepAlive(HttpServiceContext context,
+ protected boolean doIsKeepAlive( HttpServiceContext context,
HttpResponse response) {
return ++keptAliveCount < maxKeepAlives;
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/CounterKeepAliveStrategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/KeepAliveStrategy.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/KeepAliveStrategy.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/context/KeepAliveStrategy.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java Sat Jan 26 13:46:29 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.context;
+package org.apache.asyncweb.server.context;
import org.apache.asyncweb.common.HttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceContext;
/**
* Defines a strategy for deciding whether a connection should
@@ -40,6 +40,6 @@
* @return <code>true</code> iff a connection should
* remain open after processing the specified response
*/
- public boolean keepAlive(HttpServiceContext context, HttpResponse response);
+ public boolean keepAlive( HttpServiceContext context, HttpResponse response);
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/KeepAliveStrategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/CSS.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/CSS.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/CSS.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.errorReporting;
+package org.apache.asyncweb.server.errorReporting;
import java.io.UnsupportedEncodingException;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/ErrorResponseFormatter.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/ErrorResponseFormatter.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/ErrorResponseFormatter.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.errorReporting;
+package org.apache.asyncweb.server.errorReporting;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableHttpResponse;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/ErrorResponseFormatter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/StandardResponseFormatter.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/StandardResponseFormatter.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/errorReporting/StandardResponseFormatter.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.errorReporting;
+package org.apache.asyncweb.server.errorReporting;
import java.io.UnsupportedEncodingException;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/SessionKeepAliveFilter.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/SessionKeepAliveFilter.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/SessionKeepAliveFilter.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java Sat Jan 26 13:46:29 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.filter;
+package org.apache.asyncweb.server.filter;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpServiceFilter;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceFilter;
/**
* A <code>ServiceHandler</code> which causes any existing session associated with
@@ -37,7 +37,8 @@
* @author irvingd
*
*/
-public class SessionKeepAliveFilter implements HttpServiceFilter {
+public class SessionKeepAliveFilter implements HttpServiceFilter
+{
private static final Logger LOG = LoggerFactory
.getLogger(SessionKeepAliveFilter.class);
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/SessionKeepAliveFilter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/ThreadPoolFilter.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/ThreadPoolFilter.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/filter/ThreadPoolFilter.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java Sat Jan 26 13:46:29 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.filter;
+package org.apache.asyncweb.server.filter;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpServiceFilter;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/ThreadPoolFilter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipeline.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipeline.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipeline.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java Sat Jan 26 13:46:29 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.pipeline;
+package org.apache.asyncweb.server.pipeline;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceContext;
public interface RequestPipeline {
@@ -28,7 +28,7 @@
*
* @return <code>true</code> iff the pipeline accepts the request
*/
- public boolean addRequest(HttpServiceContext context);
+ public boolean addRequest( HttpServiceContext context);
/**
* Frees any responses which may now be provided to the client as a result
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipeline.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipelineListener.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipelineListener.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/RequestPipelineListener.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java Sat Jan 26 13:46:29 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.pipeline;
+package org.apache.asyncweb.server.pipeline;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceContext;
public interface RequestPipelineListener {
- public void responseReleased(HttpServiceContext context);
+ public void responseReleased( HttpServiceContext context);
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/RequestPipelineListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/StandardRequestPipeline.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/StandardRequestPipeline.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/pipeline/StandardRequestPipeline.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java Sat Jan 26 13:46:29 2008
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.pipeline;
+package org.apache.asyncweb.server.pipeline;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.asyncweb.common.HttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/pipeline/StandardRequestPipeline.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/CompositeResolver.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/CompositeResolver.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/CompositeResolver.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.resolver;
+package org.apache.asyncweb.server.resolver;
import java.util.ArrayList;
import java.util.List;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/CompositeResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ExactMatchURIServiceResolver.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ExactMatchURIServiceResolver.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ExactMatchURIServiceResolver.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.resolver;
+package org.apache.asyncweb.server.resolver;
import java.util.HashMap;
import java.util.Map;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ExactMatchURIServiceResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/FixedServiceResolver.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/FixedServiceResolver.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/FixedServiceResolver.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.resolver;
+package org.apache.asyncweb.server.resolver;
import org.apache.asyncweb.common.HttpRequest;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/FixedServiceResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.resolver;
+package org.apache.asyncweb.server.resolver;
import org.apache.asyncweb.common.HttpRequest;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/PassThruResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.resolver;
+package org.apache.asyncweb.server.resolver;
import org.apache.asyncweb.common.HttpRequest;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/ServiceResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.resolver;
+package org.apache.asyncweb.server.resolver;
import org.apache.asyncweb.common.HttpRequest;
import org.slf4j.Logger;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/resolver/SimplePrefixResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSession.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSession.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSession.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java Sat Jan 26 13:46:29 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpSession;
import org.safehaus.asyncweb.util.TimedPermit;
/**
@@ -33,7 +33,8 @@
* @author irvingd
*
*/
-class BasicSession implements HttpSession {
+class BasicSession implements HttpSession
+{
private TimedPermit permit;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSession.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSessionStore.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSessionStore.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/BasicSessionStore.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpSession;
import org.safehaus.asyncweb.util.LinkedPermitIssuer;
import org.safehaus.asyncweb.util.PermitExpirationListener;
import org.safehaus.asyncweb.util.TimedPermit;
@@ -119,7 +119,7 @@
isClosed = true;
closureList = new ArrayList<HttpSession>(sessionMap.values());
}
- for (HttpSession httpSession : closureList) {
+ for ( HttpSession httpSession : closureList) {
BasicSession session = (BasicSession) httpSession;
LOG.debug("Closure: Destroying session: " + session.getId());
session.destroy();
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/BasicSessionStore.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
import org.apache.asyncweb.common.Cookie;
import org.apache.asyncweb.common.DefaultCookie;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/CookieIdentifier.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java Sat Jan 26 13:46:29 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
import org.apache.asyncweb.common.MutableHttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/DefaultSessionAccessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java Sat Jan 26 13:46:29 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
import org.apache.asyncweb.common.MutableHttpResponse;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpSession;
/**
* A facade through which <code>Session</code>s are created and accessed.
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionAccessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableHttpResponse;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionIdentifier.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionKeyFactory.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionKeyFactory.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionKeyFactory.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
/**
* A factory for creating Session keys.