Removed the server package

The "harfang.server" package has been replaced by the top-level "harfang"
package. This has been done to shorten some names as the "server"
package was redundant.

CHANGES

@@ -10,6 +10,7 @@
 * URLMapping now takes the RequestInfo in its resolve method instead of the URL alone
 * URLMapping's "extractParameters" has been removed in favor of resolve's "ResolutionResult" object
 * ERegURLMapping's constructor no longer takes an EReg as an argument, but a pattern and its options
+* Package harfang.server.* has been moved to harfang.*
 
 0.4.0 (2013-08-07)
 ==================

src/main/haxe/harfang/server/RequestDispatcher.hx → src/main/haxe/harfang/RequestDispatcher.hx

@@ -17,16 +17,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Harfang.  If not, see <http://www.gnu.org/licenses/>.
 
-package harfang.server;
+package harfang;
 
-import harfang.controller.Controller;
 import harfang.configuration.ServerConfiguration;
+import harfang.controller.Controller;
+import harfang.event.ServerEventListener;
 import harfang.exception.HTTPException;
 import harfang.exception.NotFoundException;
 import harfang.module.Module;
-import harfang.server.event.ServerEventListener;
-import harfang.server.request.RequestInfo;
-import harfang.server.response.HTTPStatus;
+import harfang.request.RequestInfo;
+import harfang.response.HTTPStatus;
 import harfang.url.ResolutionResult;
 import harfang.url.URLMapping;
 

src/main/haxe/harfang/server/ServerMain.hx → src/main/haxe/harfang/ServerMain.hx

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Harfang.  If not, see <http://www.gnu.org/licenses/>.
 
-package harfang.server;
+package harfang;
 
 #if php
 import php.Web;
@@ -31,11 +31,11 @@ import haxe.macro.Expr;
 import haxe.macro.Context;
 
 import harfang.configuration.ServerConfiguration;
+import harfang.event.ServerEventListener;
 import harfang.exception.Exception;
 import harfang.exception.HTTPException;
 import harfang.exception.WrappedException;
-import harfang.server.event.ServerEventListener;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 
 /**
  * Program entry point. This is where the frameworks gets initialized.

src/main/haxe/harfang/configuration/AbstractServerConfiguration.hx

@@ -19,11 +19,11 @@
 
 package harfang.configuration;
 
-import harfang.url.URLMapping;
+import harfang.event.ServerEventListener;
+import harfang.module.Module;
 import harfang.exception.Exception;
 import harfang.exception.HTTPException;
-import harfang.module.Module;
-import harfang.server.event.ServerEventListener;
+import harfang.url.URLMapping;
 
 /**
  * Provides a default implementation for the ServerConfiguration interface,

src/main/haxe/harfang/configuration/ServerConfiguration.hx

@@ -19,12 +19,11 @@
 
 package harfang.configuration;
 
+import harfang.event.ServerEventListener;
 import harfang.module.Module;
 import harfang.url.URLMapping;
 import harfang.exception.Exception;
 import harfang.exception.HTTPException;
-import harfang.server.event.ServerEventListener;
-
 
 /**
  * The configuration specifies pretty much everything that the framework needs

src/main/haxe/harfang/controller/AbstractController.hx

@@ -20,7 +20,7 @@
 package harfang.controller;
 
 import harfang.module.Module;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.URLMapping;
 
 /**

src/main/haxe/harfang/controller/Controller.hx

@@ -20,7 +20,7 @@
 package harfang.controller;
 
 import harfang.module.Module;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.URLMapping;
 
 /**

src/main/haxe/harfang/server/event/ServerEventListener.hx → src/main/haxe/harfang/event/ServerEventListener.hx

@@ -17,13 +17,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Harfang.  If not, see <http://www.gnu.org/licenses/>.
 
-package harfang.server.event;
+package harfang.event;
 
 import harfang.configuration.ServerConfiguration;
 import harfang.controller.Controller;
 import harfang.exception.HTTPException;
 import harfang.exception.Exception;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.URLMapping;
 
 /**

src/main/haxe/harfang/exception/NotFoundException.hx

@@ -20,7 +20,7 @@
 package harfang.exception;
 
 import harfang.exception.HTTPException;
-import harfang.server.response.HTTPStatus;
+import harfang.response.HTTPStatus;
 
 /**
  * The 404 exception is thrown whenever something is not found, server-side.

src/main/haxe/harfang/server/request/RequestInfo.hx → src/main/haxe/harfang/request/RequestInfo.hx

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Harfang.  If not, see <http://www.gnu.org/licenses/>.
 
-package harfang.server.request;
+package harfang.request;
 
 import StringTools;
 

src/main/haxe/harfang/server/response/HTTPStatus.hx → src/main/haxe/harfang/response/HTTPStatus.hx

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Harfang.  If not, see <http://www.gnu.org/licenses/>.
 
-package harfang.server.response;
+package harfang.response;
 
 /**
  * This is a list of various HTTP status codes. This is based on a list found

src/main/haxe/harfang/url/ERegURLMapping.hx

@@ -20,7 +20,7 @@
 package harfang.url;
 
 import harfang.controller.Controller;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 
 /**
  * This is the framework's default request mapping implementation. It resolves a

src/main/haxe/harfang/url/URLMapping.hx

@@ -20,7 +20,7 @@
 package harfang.url;
 
 import harfang.controller.Controller;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 
 /**
  * A URL mapping consists of a binding between a controller and a request.

src/test/haxe/requestdispatcher/RequestDispatcherTest.hx

@@ -24,8 +24,8 @@ import unit2.TestCase;
 import harfang.exception.Exception;
 import harfang.exception.NotFoundException;
 
-import harfang.server.RequestDispatcher;
-import harfang.server.request.RequestInfo;
+import harfang.RequestDispatcher;
+import harfang.request.RequestInfo;
 
 import requestdispatcher.mock.MockRequestDispatcherUserConfiguration;
 import requestdispatcher.mock.MockRequestDispatcherFilterConfiguration;

src/test/haxe/requestdispatcher/RequestInfoTest.hx

@@ -21,7 +21,7 @@ package requestdispatcher;
 
 import unit2.TestCase;
 
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 
 /**
  * Tests the request info model class

src/test/haxe/requestdispatcher/mock/MockRequestDispatcherController.hx

@@ -21,7 +21,7 @@ package requestdispatcher.mock;
 
 import harfang.controller.AbstractController;
 import harfang.module.Module;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.URLMapping;
 
 /**

src/test/haxe/requestdispatcher/mock/MockURLMapping.hx

@@ -20,7 +20,7 @@
 package requestdispatcher.mock;
 
 import harfang.controller.Controller;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.ResolutionResult;
 import harfang.url.URLMapping;
 

src/test/haxe/serverconfiguration/ServerConfigurationTest.hx

@@ -21,8 +21,8 @@ package serverconfiguration;
 
 import unit2.TestCase;
 
-import harfang.server.ServerMain;
-import harfang.server.request.RequestInfo;
+import harfang.ServerMain;
+import harfang.request.RequestInfo;
 
 import serverconfiguration.mock.MockServerConfiguration;
 import serverconfiguration.mock.MockServerConfigurationController;

src/test/haxe/servereventlistener/ServerEventListenerTest.hx

@@ -27,10 +27,10 @@ import harfang.exception.Exception;
 import harfang.exception.HTTPException;
 import harfang.exception.WrappedException;
 
-import harfang.server.ServerMain;
-import harfang.server.request.RequestInfo;
+import harfang.ServerMain;
+import harfang.RequestDispatcher;
+import harfang.request.RequestInfo;
 
-import harfang.server.RequestDispatcher;
 
 import servereventlistener.mock.MockServerEventListenerUserConfiguration;
 import servereventlistener.mock.MockServerEventListenerModule;

src/test/haxe/servereventlistener/mock/MockServerEventListenerController.hx

@@ -24,7 +24,7 @@ import harfang.exception.Exception;
 import harfang.exception.HTTPException;
 import harfang.exception.WrappedException;
 import harfang.module.Module;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.URLMapping;
 
 /**

src/test/haxe/servereventlistener/mock/MockServerEventListenerUserConfiguration.hx

@@ -25,8 +25,8 @@ import harfang.configuration.ServerConfiguration;
 import harfang.exception.Exception;
 import harfang.exception.HTTPException;
 
-import harfang.server.event.ServerEventListener;
-import harfang.server.request.RequestInfo;
+import harfang.event.ServerEventListener;
+import harfang.request.RequestInfo;
 
 import harfang.url.URLMapping;
 

src/test/haxe/urlmappingfactory/URLMappingFactoryTest.hx

@@ -21,9 +21,9 @@ package urlmappingfactory;
 
 import unit2.TestCase;
 
+import harfang.request.RequestInfo;
 import harfang.url.ERegURLMappingFactory;
 import harfang.url.URLMappingFactory;
-import harfang.server.request.RequestInfo;
 import harfang.url.ERegURLMapping;
 
 import urlmappingfactory.mock.MockMacroModule;

src/test/haxe/urlmappingfactory/mock/MockMacroURLMapping.hx

@@ -20,7 +20,7 @@
 package urlmappingfactory.mock;
 
 import harfang.controller.Controller;
-import harfang.server.request.RequestInfo;
+import harfang.request.RequestInfo;
 import harfang.url.ResolutionResult;
 import harfang.url.URLMapping;
 

test-neko.hxml

@@ -2,5 +2,5 @@
 -neko out/test.n
 -cp src/main/haxe
 -cp src/test/haxe
---macro harfang.server.ServerMain.setServerConfigurationClass('PlaceholderConfiguration')
+--macro harfang.ServerMain.setServerConfigurationClass('PlaceholderConfiguration')
 -main TestMain

test-php.hxml

@@ -2,5 +2,5 @@
 -php out/phptest
 -cp src/main/haxe
 -cp src/test/haxe
---macro harfang.server.ServerMain.setServerConfigurationClass('PlaceholderConfiguration')
+--macro harfang.ServerMain.setServerConfigurationClass('PlaceholderConfiguration')
 -main TestMain