Index: /oceandb/.wmproject.properties
===================================================================
--- /oceandb/.wmproject.properties	(revision 47)
+++ /oceandb/.wmproject.properties	(revision 47)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Project Properties</comment>
+<entry key="projectVersion">0.25</entry>
+</properties>
Index: /oceandb/src/log4j.properties
===================================================================
--- /oceandb/src/log4j.properties	(revision 47)
+++ /oceandb/src/log4j.properties	(revision 47)
@@ -0,0 +1,141 @@
+log4j.rootLogger=warn, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m> (%x) %n
+
+
+
+### WaveMaker loggers
+
+
+
+## Service
+
+# Log progress while generating service class 
+#log4j.logger.com.wavemaker.service.codegen=debug
+
+
+## DataService: runtime
+
+# Transactions
+#
+# WARN - log out-of-sequence transaction begin/commit/rollback calls
+# For example, calling commit explicitly when no transaction is running
+#
+# INFO - log when we're about to run work using Spring's Transaction Template.
+# also log calls to DataServiceManager begin/commit/rollback 
+# (before any work has been done)
+#
+# DEBUG - also log a stack trace for all log messages
+#
+log4j.logger.com.wavemaker.runtime.data.tx=warn
+
+# EventListener
+#
+# INFO - log startRequest/endRequest events
+log4j.logger.com.wavemaker.runtime.data.event=warn
+
+# DataService work
+#
+# logs information about runtime behavior
+log4j.logger.com.wavemaker.runtime.data.work=warn
+
+# DataService metadata logger
+# 
+# DEBUG - log info about backing metadata
+log4j.logger.com.wavemaker.data.metadata=warn
+
+
+## DataService: design time and tools
+
+
+# Parser
+#
+log4j.logger.com.wavemaker.tools.data.parser=warn
+
+# Import Database logger
+log4j.logger.com.wavemaker.tools.data.importdb=warn
+
+
+## Server
+
+# JSONRPCController
+#
+# INFO - log method invocations
+# DEBUG - log method parameters, returns
+log4j.logger.com.wavemaker.runtime.server=info
+
+# JSON library logging
+#
+# INFO - cycles detection
+log4j.logger.com.wavemaker.runtime.server.json=info
+
+
+
+
+
+### 3rdparty loggers
+
+
+## JSON
+log4j.category.net.sf.json=warn
+
+
+
+## Spring
+
+# Spring ClassUtils
+#log4j.logger.org.springframework.util.ClassUtils=warn
+
+log4j.category.org.springframework.web.servlet.view=warn
+
+
+
+
+## Hibernate 
+
+log4j.logger.org.hibernate=warn
+
+log4j.logger.org.hibernate.connection.UserSuppliedConnectionProvider=error
+log4j.logger.org.hibernate.cfg.SettingsFactory=error
+
+# log just the SQL
+#log4j.logger.org.hibernate.SQL=debug
+
+# log JDBC bind parameters 
+#log4j.logger.org.hibernate.type=debug
+
+# log HQL query parser activity
+#log4j.logger.org.hibernate.hql.ast.AST=warn
+
+# log schema export/update
+#log4j.logger.org.hibernate.tool.hbm2ddl=debug
+
+# log HQL parse trees
+#log4j.logger.org.hibernate.hql=debug
+
+# log cache activity
+#log4j.logger.org.hibernate.cache=debug
+
+# log transaction activity
+#log4j.logger.org.hibernate.transaction=debug
+
+# log JDBC resource acquisition
+#log4j.logger.org.hibernate.jdbc=debug
+
+# enable the following line if you want to track down connection 
+# leakages when using DriverManagerConnectionProvider 
+#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace
+
+# log database import 
+#log4j.logger.org.hibernate.cfg.reveng=debug
+
+
+
+## Acegi
+
+#log4j.logger.org.acegisecurity=debug
+
+# log LDAP provider
+#log4j.logger.org.acegisecurity.providers.ldap=debug
Index: /oceandb/webapproot/OID.js
===================================================================
--- /oceandb/webapproot/OID.js	(revision 47)
+++ /oceandb/webapproot/OID.js	(revision 47)
@@ -0,0 +1,6 @@
+dojo.declare("OID", wm.Application, {
+	main: "Main",
+	widgets: {
+
+	}
+});
Index: /oceandb/webapproot/WEB-INF/project-config.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/project-config.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/project-config.xml	(revision 47)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<!--
+Server definition of all configuration; depends on config.xml.
+-->
+
+<beans>
+</beans>
Index: /oceandb/webapproot/WEB-INF/project-managers.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/project-managers.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/project-managers.xml	(revision 47)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Server-side manager bean definitions.  These are only to be used at runtime.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:aop="http://www.springframework.org/schema/aop"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
+                http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                http://www.springframework.org/schema/aop
+                http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+    <!-- extend beans to have the proper names; add in server-specific information -->
+    <bean id="serviceManager"
+            class="com.wavemaker.runtime.service.ServiceManager"
+            scope="singleton"
+            lazy-init="true"
+            parent="serviceManagerBase">
+        <property name="services">
+            <list merge="true">
+            </list>
+        </property>
+    </bean>
+</beans>
Index: /oceandb/webapproot/WEB-INF/project-security.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/project-security.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/project-security.xml	(revision 47)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Server definition of security; imports security.xml.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+</beans>
Index: /oceandb/webapproot/WEB-INF/project-services.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/project-services.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/project-services.xml	(revision 47)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Server definition of all services; 
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+</beans>
Index: /oceandb/webapproot/WEB-INF/project-spring.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/project-spring.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/project-spring.xml	(revision 47)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Local spring modifications.  This file is never altered by WaveMaker software,
+and is an ideal location for end-users to put any code they need.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+			http://www.springframework.org/schema/aop
+			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+</beans>
Index: /oceandb/webapproot/WEB-INF/project-springapp.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/project-springapp.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/project-springapp.xml	(revision 47)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<!--
+  - Server application context definition for "springapp" DispatcherServlet.
+  -->
+
+<beans>
+    <import resource="classpath:springapp.xml"/>
+
+    <import resource="project-config.xml"/>
+    <import resource="project-services.xml"/>
+    <import resource="project-managers.xml"/>
+    <import resource="project-security.xml"/>
+    <import resource="project-spring.xml"/>
+
+    <bean id="urlMapping"
+        class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+        <property name="mappings">
+            <value>
+                /**/*.json=agJSONController
+				/**/*.download=agFileDownloadController
+				/**/*.upload=agFileUploadController
+            </value>
+        </property>
+    </bean>
+</beans>
Index: /oceandb/webapproot/WEB-INF/web.xml
===================================================================
--- /oceandb/webapproot/WEB-INF/web.xml	(revision 47)
+++ /oceandb/webapproot/WEB-INF/web.xml	(revision 47)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+The web.xml is editable, you may customize it to your needs.  Note that
+changes to this file may render your project unusable, so caution should
+be taken.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+        version="2.4">
+    <display-name>Project Name</display-name>
+
+    <servlet>
+        <!-- this servlet-name is part of the springapp-servlet.xml filename -->
+        <servlet-name>springapp</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+
+        <init-param>
+            <param-name>namespace</param-name>
+            <param-value>project-springapp</param-value>
+        </init-param>
+
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>springapp</servlet-name>
+        <url-pattern>*.json</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>springapp</servlet-name>
+        <url-pattern>*.download</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>springapp</servlet-name>
+        <url-pattern>*.upload</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+    <!--
+      Loads the root application context of this web app at startup.
+      The application context is then available via 
+      WebApplicationContextUtils.getWebApplicationContext(ServletContext).
+    -->
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <listener>
+        <listener-class>com.wavemaker.runtime.server.CleanupListener</listener-class>
+    </listener>
+
+    <!--
+      Location of the XML file that defines the root application context.
+      Applied by ContextLoaderListener.
+    -->
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>/WEB-INF/project-springapp.xml</param-value>
+    </context-param>
+
+    <!--
+        Filter requests into UTF-8.  This must be the first filter defined/run.
+    -->
+    <filter>
+        <filter-name>springEncodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>springEncodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- security configuration -->
+    <filter>
+        <filter-name>Acegi Ajax Filter</filter-name>
+        <filter-class>com.wavemaker.runtime.security.AcegiAjaxFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>Acegi Filter Chain Proxy</filter-name>
+        <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
+        <init-param>
+            <param-name>targetBean</param-name>
+            <param-value>filterChainProxy</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>Acegi Ajax Filter</filter-name>
+        <url-pattern>/j_acegi_security_check</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>Acegi Filter Chain Proxy</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
Index: /oceandb/webapproot/config.js
===================================================================
--- /oceandb/webapproot/config.js	(revision 47)
+++ /oceandb/webapproot/config.js	(revision 47)
@@ -0,0 +1,19 @@
+/* Project specific configuration */
+djConfig = { 
+	usePlainJson: true
+};
+
+djConfig.debugBoot = location.search.indexOf("debug") >=0;
+djConfig.popup = location.search.indexOf("popup") >= 0;
+djConfig.isDebug = djConfig.debugBoot || djConfig.popup;
+
+if (djConfig.isDebug) {
+	djConfig.debugBase = true;
+	djConfig.noFirebugLite = false;
+}
+
+wm = {};
+wm.libPath = "/wavemaker/lib/";
+wm.images = wm.libPath + "wm/base/widget/themes/default/images/";
+wm.dojoPath = djConfig.debugBoot ? "../../" : "../";
+wm.logging = (location.search.indexOf("logging") >= 0);
Index: /oceandb/webapproot/index.html
===================================================================
--- /oceandb/webapproot/index.html	(revision 47)
+++ /oceandb/webapproot/index.html	(revision 47)
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="cache-control" content="must-revalidate" />
+<meta name="generator" content="WaveMaker Application Studio" />
+<title>OID</title>
+<link rel="shortcut icon" href="/wavemaker/lib/wm/base/boot/images/favicon.ico" />
+<style type="text/css">
+	@import "/wavemaker/lib/wm/base/boot/boot.css";
+	@import "app.css";
+	
+	/* styling for the wavemaker application element */
+	#wavemakerNode {
+		height: 100%;
+		overflow: hidden;
+		position: relative;
+	}
+</style>
+
+<!-- Boot Wavemaker -->
+<script type="text/javascript" src="config.js"></script>
+<script type="text/javascript" src="/wavemaker/lib/wm/base/boot/boot.js"></script>
+</head>
+<body class="tundra">
+	<!-- Begin OID -->
+	<div id="wavemakerNode">
+		<div id="_wm_loading" style="z-index: 100;">
+			<table><tr><td><img alt="Loading" src="/wavemaker/lib/wm/base/boot/images/loader.gif" />&nbsp;&nbsp;Loading...</td></tr></table>
+		</div>
+	</div>
+	<script type="text/javascript" src="/wavemaker/lib/wm/base/boot/lib_wm.js"></script>
+	<script type="text/javascript" src="lib_project.js"></script>
+	<script type="text/javascript" src="types.js"></script>
+	<script type="text/javascript" src="OID.js"></script>
+	<script type="text/javascript">
+		new OID({domNode: "wavemakerNode"}).run();
+	</script>
+	<!-- End OID -->
+</body>
+</html>
Index: /oceandb/webapproot/lib_project.js
===================================================================
--- /oceandb/webapproot/lib_project.js	(revision 47)
+++ /oceandb/webapproot/lib_project.js	(revision 47)
@@ -0,0 +1,5 @@
+if (djConfig.debugBoot) {
+	wm.loadScripts([
+
+	]);
+}
Index: /oceandb/webapproot/pages/Main/Main.js
===================================================================
--- /oceandb/webapproot/pages/Main/Main.js	(revision 47)
+++ /oceandb/webapproot/pages/Main/Main.js	(revision 47)
@@ -0,0 +1,6 @@
+dojo.declare("Main", wm.Page, {
+	start: function() {
+		
+	},
+	_end: 0
+});
Index: /oceandb/webapproot/pages/Main/Main.widgets.js
===================================================================
--- /oceandb/webapproot/pages/Main/Main.widgets.js	(revision 47)
+++ /oceandb/webapproot/pages/Main/Main.widgets.js	(revision 47)
@@ -0,0 +1,3 @@
+Main.widgets = {
+	layoutBox1: ["wm.Layout", {box: "v", height: "1flex"}, {}]
+}