version 0.1.0

mwitte · Mar 22, 2014 · 29f11b3 · 29f11b3
1 parent ec2b647
commit 29f11b3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 49 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emberchatappserver",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.1",

diff --git a/src/WEB-INF/app-thumbnail.png b/src/WEB-INF/app-thumbnail.png
diff --git a/src/WEB-INF/classes/EmberChat/Service/ServiceLocator.php b/src/WEB-INF/classes/EmberChat/Service/ServiceLocator.php
@@ -63,7 +63,7 @@ public function __construct(Application $application)
         // this hole service locator will get removed in future
         $this->application = $application;
 
-        $connection = Factory::createContextConnection();
+        $connection = Factory::createContextConnection($application->getName());
         $session = $connection->createContextSession();
         $initialContext = $session->createInitialContext();
 

diff --git a/src/WEB-INF/classes/EmberChat/Servlets/AppServlet.php b/src/WEB-INF/classes/EmberChat/Servlets/AppServlet.php
diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
@@ -4,28 +4,4 @@
     <display-name>EmberChat AppServer</display-name>
     <description>The backend for the EmberChat Project</description>
 
-    <servlet>
-        <description><![CDATA[Serves static content]]></description>
-        <display-name>StaticResourceServlet</display-name>
-        <servlet-name>StaticResourceServlet</servlet-name>
-        <servlet-class>\TechDivision\ServletContainer\Servlets\StaticResourceServlet</servlet-class>
-    </servlet>
-
-    <servlet>
-        <description><![CDATA[Serves EmberChat app]]></description>
-        <display-name>AppServlet</display-name>
-        <servlet-name>AppServlet</servlet-name>
-        <servlet-class>\EmberChat\Servlets\AppServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>AppServlet</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>StaticResourceServlet</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
 </web-app>