MERGED AJAX ADAPTER TO WEB ADAPTER

- Merged all functionality of AJAX adapter inside the web adapter (MAJOR step for making the product more understandable)
- Removed "Adapter" alltogether from API level (MAJOR step for making the product more understandable)
- Built groundwork for automatic terminal detection based selection of technologies
- Built groundwork for integration of theme packaging mechanism by allowing Ajax apps to use theme resourses!
- Deployment is now easier - it is enough to deploy only one instance of the application
- Now AJAX apps also use WebApplicationContext (and get all the features from them!) (should fix bug #93)
- Now AJAX apps also can use WebBrowser class that implements Terminal (fixes bug #74)
- Now AJAX and Web-apps use the same session -> you can jump from web to ajax and preserve state! (fixes bug #60)
- Built groundwork for easier integration of license control (making solving #89 easier) 


svn changeset:130/svn branch:toolkit

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/itmill/toolkit/terminal/web/WebApplicationContext.java b/src/com/itmill/toolkit/terminal/web/WebApplicationContext.java
index 8fc19cfbca..84bc60a610 100644
--- a/src/com/itmill/toolkit/terminal/web/WebApplicationContext.java
+++ b/src/com/itmill/toolkit/terminal/web/WebApplicationContext.java
@@ -97,6 +97,7 @@ public class WebApplicationContext implements ApplicationContext {
 	 */
 	public File getBaseDirectory() {
 		String realPath = session.getServletContext().getRealPath("/");
+		if (realPath == null) return null;
 		return new File(realPath);
 	}
 
@@ -114,7 +115,7 @@ public class WebApplicationContext implements ApplicationContext {
 	public Collection getApplications() {
 		LinkedList applications =
 			(LinkedList) session.getAttribute(
-				WebAdapterServlet.SESSION_ATTR_APPS);
+				ApplicationServlet.SESSION_ATTR_APPS);
 
 		return Collections.unmodifiableCollection(
 			applications == null ? (new LinkedList()) : applications);
@@ -175,4 +176,5 @@ public class WebApplicationContext implements ApplicationContext {
 			((ApplicationContext.TransactionListener)i.next()).transactionEnd(application,request);
 		}
 	}
+
 }