Merge branch 'master' of github.com:zanata/zanata

zanata · Sep 25, 2011 · 850e120 · 850e120
2 parents 2af7c0a + bbf7901
commit 850e120
Show file tree

Hide file tree

Showing 13 changed files with 153 additions and 201 deletions.
diff --git a/server/zanata-war/pom.xml b/server/zanata-war/pom.xml
diff --git a/server/zanata-war/src/etc/autotest.properties b/server/zanata-war/src/etc/autotest.properties
@@ -1,5 +1,7 @@
 spnego.security.start=Not Used
 spnego.security.end=Not Used
+h2console.servlet.start=-->
+h2console.servlet.end=<!--
 jaas.configure=default
 zanata.authType=INTERNAL
 zanata.useDefaultConfig=false
diff --git a/server/zanata-war/src/etc/fedora.properties b/server/zanata-war/src/etc/fedora.properties
@@ -1,5 +1,7 @@
 spnego.security.start=Not Used
 spnego.security.end=Not Used
+h2console.servlet.start=Not Used
+h2console.servlet.end=Not Used
 jaas.configure=zanata
 zanata.authType=FEDORA_OPENID
 zanata.useDefaultConfig=false
diff --git a/server/zanata-war/src/etc/h2.properties b/server/zanata-war/src/etc/h2.properties
@@ -6,6 +6,5 @@ ds.user.name=sa
 ds.password=
 env.dbunit.type=HSQL
 env.hibernate.hbm2ddl.auto
-env.hibernate.show_sql=true
-env.hibernate.format_sql=false
-env.hibernate.indexBase=zanatasearchindex
+env.hibernate.show_sql=false
+env.hibernate.format_sql=true
diff --git a/server/zanata-war/src/etc/internalauth.properties b/server/zanata-war/src/etc/internalauth.properties
@@ -1,5 +1,7 @@
 spnego.security.start=Not Used
 spnego.security.end=Not Used
+h2console.servlet.start=Not Used
+h2console.servlet.end=Not Used
 jaas.configure=default
 zanata.authType=INTERNAL
 zanata.useDefaultConfig=false
diff --git a/server/zanata-war/src/etc/jaas.properties b/server/zanata-war/src/etc/jaas.properties
@@ -1,5 +1,7 @@
 spnego.security.start=Not Used
 spnego.security.end=Not Used
+h2console.servlet.start=Not Used
+h2console.servlet.end=Not Used
 jaas.configure=zanata
 zanata.authType=JAAS
 zanata.useDefaultConfig=false
diff --git a/server/zanata-war/src/etc/kerberos.properties b/server/zanata-war/src/etc/kerberos.properties
@@ -1,5 +1,7 @@
 spnego.security.start=-->
 spnego.security.end=<!--
+h2console.servlet.start=Not Used
+h2console.servlet.end=Not Used
 zanata.authType=KERBEROS
 zanata.useDefaultConfig=false
 jaas.configure=zanata
diff --git a/server/zanata-war/src/etc/mysql.properties b/server/zanata-war/src/etc/mysql.properties
@@ -7,5 +7,4 @@ ds.password=
 env.dbunit.type=MYSQL
 env.hibernate.hbm2ddl.auto
 env.hibernate.show_sql=false
-env.hibernate.format_sql=false
-env.hibernate.indexBase=zanatasearchindex
+env.hibernate.format_sql=false
diff --git a/server/zanata-war/src/etc/seamtests.properties b/server/zanata-war/src/etc/seamtests.properties
@@ -1,5 +1,7 @@
 spnego.security.start=Not Used
 spnego.security.end=Not Used
+h2console.servlet.start=Not Used
+h2console.servlet.end=Not Used
 jaas.configure=default
 zanata.authType=INTERNAL
 zanata.useDefaultConfig=true
diff --git a/server/zanata-war/src/main/resources-dev/components.properties b/server/zanata-war/src/main/resources-dev/components.properties
@@ -1,3 +1,2 @@
 env.debug=true
-env.import.testdata=true
 env.dbunit.type=HSQL
diff --git a/server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties b/server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
@@ -2,6 +2,5 @@
 # by Maven based on system properties (eg from the active Maven profile).
 
 env.debug=${env.debug}
-env.import.testdata=${env.import.testdata}
 env.dbunit.type=${env.dbunit.type}
 persistence-unit-name=${ds.jndi.name}
diff --git a/server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml b/server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
@@ -190,7 +190,19 @@
 		<url-pattern>/webtrans/gwteventservice</url-pattern>
 	</servlet-mapping>
 
-	<!-- @extra.servlets@ -->
+	<!-- @h2console.servlet.start@
+	
+	<servlet>
+		<servlet-name>H2Console</servlet-name>
+		<servlet-class>org.h2.server.web.WebServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>H2Console</servlet-name>
+		<url-pattern>/console/*</url-pattern>
+	</servlet-mapping>
+	
+	@h2console.servlet.end@ -->
 
 	<security-constraint>
 		<display-name>Restrict raw XHTML Documents</display-name>

diff --git a/server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java b/server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
@@ -105,13 +105,13 @@ else if (action instanceof UpdateTransUnit)
       {
          final UpdateTransUnit _action = (UpdateTransUnit) action;
          AsyncCallback<UpdateTransUnitResult> _callback = (AsyncCallback<UpdateTransUnitResult>) callback;
-         DeferredCommand.addCommand(new DummyUpdateTransUnitCommand(_action, _callback));
+         Scheduler.get().scheduleDeferred(new DummyUpdateTransUnitCommand(_action, _callback));
       }
       else if (action instanceof EditingTranslationAction)
       {
          final EditingTranslationAction _action = (EditingTranslationAction) action;
          AsyncCallback<EditingTranslationResult> _callback = (AsyncCallback<EditingTranslationResult>) callback;
-         DeferredCommand.addCommand(new DummyEditingTranslationCommand(_action, _callback));
+         Scheduler.get().scheduleDeferred(new DummyEditingTranslationCommand(_action, _callback));
       }
       else
       {