Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 3590714b9dfaa2eeee7dcacaa1e76db4f1f45d23)
@@ -170,6 +170,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToSwfServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>dumpWDDX</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
@@ -240,6 +245,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToJpgServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>flashCrashDump</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
@@ -250,6 +260,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>competenceServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.CompetenceServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>LessonJoinServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.webservice.xml.LessonJoinServlet</servlet-class>
 
@@ -275,11 +290,6 @@
 
    </servlet>
    <servlet>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.BogoPogoServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>storeNotebookEntry</servlet-name>
       <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
@@ -414,6 +424,10 @@
       <url-pattern>/ForgotPasswordRequest</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <url-pattern>/WhiteboardToSwf</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>dumpWDDX</servlet-name>
       <url-pattern>/servlet/dumpWDDX</url-pattern>
    </servlet-mapping>
@@ -430,6 +444,10 @@
       <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <url-pattern>/BogoPogo</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>flashCrashDump</servlet-name>
       <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
@@ -438,6 +456,10 @@
       <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>competenceServlet</servlet-name>
+      <url-pattern>/competenceServlet</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>LessonJoinServlet</servlet-name>
       <url-pattern>/services/xml/LessonJoin/*</url-pattern>
    </servlet-mapping>
@@ -458,10 +480,6 @@
       <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <url-pattern>/BogoPogo</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>storeNotebookEntry</servlet-name>
       <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
@@ -470,6 +488,10 @@
       <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
    </servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
   <mime-mapping>
 	<extension>csv</extension>
 	<mime-type>text/plain</mime-type>