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 [2/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...
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionKeyFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionListener.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionListener.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionListener.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java Sat Jan 26 13:46:29 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpSession;
/**
* Receives notifications of session lifecycle events
@@ -34,7 +34,7 @@
*
* @param session The created session
*/
- public void sessionCreated(HttpSession session);
+ public void sessionCreated( HttpSession session);
/**
* Invoked when a session is destroyed before it expires
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionStore.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionStore.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionStore.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java Sat Jan 26 13:46:29 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpSession;
/**
* Creates and maintains <code>Session</code>s.
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/HttpSessionStore.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/LoggingSessionListener.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/LoggingSessionListener.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/LoggingSessionListener.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java Sat Jan 26 13:46:29 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.session;
+package org.apache.asyncweb.server.session;
-import org.safehaus.asyncweb.service.HttpSession;
+import org.apache.asyncweb.server.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@
doLog("Session Destroyed", session);
}
- public void sessionExpired(HttpSession session) {
+ public void sessionExpired( HttpSession session) {
doLog("Session Expired", session);
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/LoggingSessionListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/SecureRandomKeyFactory.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/SecureRandomKeyFactory.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/SecureRandomKeyFactory.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.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.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/session/SecureRandomKeyFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/DefaultHttpIoHandler.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/DefaultHttpIoHandler.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/DefaultHttpIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java Sat Jan 26 13:46:29 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.transport.mina;
+package org.apache.asyncweb.server.transport.mina;
import org.apache.mina.common.IoSession;
import org.apache.mina.handler.multiton.SingleSessionIoHandler;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerDelegate;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerFactory;
-import org.safehaus.asyncweb.service.ServiceContainer;
+import org.apache.asyncweb.server.ServiceContainer;
/**
* @author trustin
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/HttpIoHandler.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/HttpIoHandler.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/HttpIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java Sat Jan 26 13:46:29 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.transport.mina;
+package org.apache.asyncweb.server.transport.mina;
import org.apache.mina.common.IoHandler;
-import org.safehaus.asyncweb.service.ServiceContainer;
+import org.apache.asyncweb.server.ServiceContainer;
public interface HttpIoHandler extends IoHandler {
@@ -30,5 +30,5 @@
*
* @param container The associated container
*/
- void setContainer(ServiceContainer container);
+ void setContainer( ServiceContainer container);
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/LoggingExceptionMonitor.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/LoggingExceptionMonitor.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/LoggingExceptionMonitor.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.transport.mina;
+package org.apache.asyncweb.server.transport.mina;
import org.apache.mina.common.ExceptionMonitor;
import org.slf4j.Logger;
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.transport.mina;
+package org.apache.asyncweb.server.transport.mina;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -29,9 +29,9 @@
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.safehaus.asyncweb.service.ServiceContainer;
-import org.safehaus.asyncweb.service.Transport;
-import org.safehaus.asyncweb.service.TransportException;
+import org.apache.asyncweb.server.ServiceContainer;
+import org.apache.asyncweb.server.Transport;
+import org.apache.asyncweb.server.TransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,8 @@
* @author irvingd
*
*/
-public class MinaTransport implements Transport {
+public class MinaTransport implements Transport
+{
private static final Logger LOG = LoggerFactory
.getLogger(MinaTransport.class);
@@ -134,7 +135,7 @@
*
* @param container Our associated <code>ServiceContainer</code>
*/
- public void setServiceContainer(ServiceContainer container) {
+ public void setServiceContainer( ServiceContainer container) {
this.container = container;
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java (from r615497, mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java?p2=mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java&p1=mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java&r1=615497&r2=615502&rev=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java Sat Jan 26 13:46:29 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.service.transport.mina;
+package org.apache.asyncweb.server.transport.mina;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -40,13 +40,13 @@
import org.apache.asyncweb.common.DefaultHttpRequest;
import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.*;
-import org.safehaus.asyncweb.service.HttpServiceContext;
-import org.safehaus.asyncweb.service.HttpServiceFilter;
-import org.safehaus.asyncweb.service.ServiceContainer;
-import org.safehaus.asyncweb.service.context.AbstractHttpServiceContext;
-import org.safehaus.asyncweb.service.pipeline.RequestPipeline;
-import org.safehaus.asyncweb.service.pipeline.RequestPipelineListener;
-import org.safehaus.asyncweb.service.pipeline.StandardRequestPipeline;
+import org.apache.asyncweb.server.ServiceContainer;
+import org.apache.asyncweb.server.context.AbstractHttpServiceContext;
+import org.apache.asyncweb.server.pipeline.RequestPipeline;
+import org.apache.asyncweb.server.pipeline.RequestPipelineListener;
+import org.apache.asyncweb.server.pipeline.StandardRequestPipeline;
+import org.apache.asyncweb.server.HttpServiceContext;
+import org.apache.asyncweb.server.HttpServiceFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +79,7 @@
private int readIdleTime = DEFAULT_IDLE_TIME;
- public SingleHttpSessionIoHandler(ServiceContainer container, IoSession session) {
+ public SingleHttpSessionIoHandler( ServiceContainer container, IoSession session) {
this.container = container;
this.session = session;
this.pipeline = new StandardRequestPipeline(DEFAULT_PIPELINE);
@@ -254,7 +254,7 @@
@Override
public void messageReceived(final NextFilter nextFilter,
final IoSession session, final Object message) throws Exception {
- org.safehaus.asyncweb.service.HttpServiceFilter.NextFilter nextFilterAdapter = new org.safehaus.asyncweb.service.HttpServiceFilter.NextFilter() {
+ HttpServiceFilter.NextFilter nextFilterAdapter = new HttpServiceFilter.NextFilter() {
public void invoke() {
nextFilter.messageReceived(session, message);
}
@@ -267,7 +267,7 @@
public void filterWrite(final NextFilter nextFilter,
final IoSession session, final WriteRequest writeRequest)
throws Exception {
- org.safehaus.asyncweb.service.HttpServiceFilter.NextFilter nextFilterAdapter = new org.safehaus.asyncweb.service.HttpServiceFilter.NextFilter() {
+ HttpServiceFilter.NextFilter nextFilterAdapter = new HttpServiceFilter.NextFilter() {
public void invoke() {
nextFilter.filterWrite(session, writeRequest);
}
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/server/errorReporting/strings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/server/errorReporting/strings.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: mina/asyncweb/trunk/server/src/main/resource/org/apache/asyncweb/server/errorReporting/strings.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java (original)
+++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java Sat Jan 26 13:46:29 2008
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.asyncweb.common.HttpRequest;
-import org.safehaus.asyncweb.service.resolver.ServiceResolver;
+import org.apache.asyncweb.server.resolver.ServiceResolver;
/**
* A simple <code>ServiceResolver</code> which allows mappings
Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java (original)
+++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java Sat Jan 26 13:46:29 2008
@@ -27,7 +27,7 @@
import org.apache.asyncweb.common.DefaultHttpRequest;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableHttpRequest;
-import org.safehaus.asyncweb.service.resolver.ExactMatchURIServiceResolver;
+import org.apache.asyncweb.server.resolver.ExactMatchURIServiceResolver;
/**
* Tests the <code>ExactMatchURIServiceResolver</code>
Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java (original)
+++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java Sat Jan 26 13:46:29 2008
@@ -27,7 +27,7 @@
import org.apache.asyncweb.common.DefaultHttpRequest;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableHttpRequest;
-import org.safehaus.asyncweb.service.resolver.SimplePrefixResolver;
+import org.apache.asyncweb.server.resolver.SimplePrefixResolver;
/**
* Tests <code>SimplePrefixResolver</code>
Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/MockNextFilter.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/MockNextFilter.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/MockNextFilter.java (original)
+++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/util/MockNextFilter.java Sat Jan 26 13:46:29 2008
@@ -21,7 +21,7 @@
import junit.framework.Assert;
-import org.safehaus.asyncweb.service.HttpServiceFilter.NextFilter;
+import org.apache.asyncweb.server.HttpServiceFilter.NextFilter;
/**
* A simple <code>InvocationChain</code> which counts the
Modified: mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/HttpServiceLoader.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/HttpServiceLoader.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/HttpServiceLoader.java (original)
+++ mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/HttpServiceLoader.java Sat Jan 26 13:46:29 2008
@@ -22,8 +22,8 @@
import java.util.Iterator;
import java.util.Map;
-import org.safehaus.asyncweb.service.HttpService;
-import org.safehaus.asyncweb.service.HttpServiceHandler;
+import org.apache.asyncweb.server.HttpService;
+import org.apache.asyncweb.server.HttpServiceHandler;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -38,7 +38,7 @@
private HttpServiceHandler handler;
- public void setHandler(HttpServiceHandler httpServiceHandler) {
+ public void setHandler( HttpServiceHandler httpServiceHandler) {
this.handler = httpServiceHandler;
}
Modified: mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/Main.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/Main.java?rev=615502&r1=615501&r2=615502&view=diff
==============================================================================
--- mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/Main.java (original)
+++ mina/asyncweb/trunk/spring/src/main/java/org/safehaus/asyncweb/integration/spring/Main.java Sat Jan 26 13:46:29 2008
@@ -23,8 +23,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.safehaus.asyncweb.service.ContainerLifecycleException;
-import org.safehaus.asyncweb.service.ServiceContainer;
+import org.apache.asyncweb.server.ContainerLifecycleException;
+import org.apache.asyncweb.server.ServiceContainer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
@@ -85,7 +85,7 @@
String[] configs = new String[] { configDir + "conf/AsyncWeb.xml",
configDir + "conf/" + serviceConfigName + "/*.xml" };
ApplicationContext ctx = new FileSystemXmlApplicationContext(configs);
- ServiceContainer container = (ServiceContainer) ctx
+ ServiceContainer container = ( ServiceContainer ) ctx
.getBean("container");
try {
container.start();