[overlord-commits] Overlord SVN: r932 - in bpm-console/trunk/gui/war: src/main/java and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Jan 25 08:27:19 EST 2010
Author: heiko.braun at jboss.com
Date: 2010-01-25 08:27:19 -0500 (Mon, 25 Jan 2010)
New Revision: 932
Added:
bpm-console/trunk/gui/war/src/main/java/ErraiService.properties
Modified:
bpm-console/trunk/gui/war/pom.xml
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
bpm-console/trunk/gui/war/war/WEB-INF/web.xml
Log:
Added errai-bus dependency and initialization
Modified: bpm-console/trunk/gui/war/pom.xml
===================================================================
--- bpm-console/trunk/gui/war/pom.xml 2010-01-25 13:03:41 UTC (rev 931)
+++ bpm-console/trunk/gui/war/pom.xml 2010-01-25 13:27:19 UTC (rev 932)
@@ -21,6 +21,12 @@
<!-- Dependencies -->
<dependencies>
+ <dependency>
+ <groupId>org.jboss.errai</groupId>
+ <artifactId>errai-bus</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-workspace-api</artifactId>
Added: bpm-console/trunk/gui/war/src/main/java/ErraiService.properties
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/ErraiService.properties (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/ErraiService.properties 2010-01-25 13:27:19 UTC (rev 932)
@@ -0,0 +1,38 @@
+
+#
+# Copyright 2009 JBoss, a divison Red Hat, Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# Specify the Authentication/Authorization Adapter sendNowWith use
+#
+#errai.authentication_adapter=org.jboss.errai.persistence.server.security.HibernateAuthenticationAdapter
+#errai.authentication_adapter=org.jboss.errai.bus.server.security.auth.JAASAdapter
+
+##
+## This property indicates whether or not authentication is required for all communication with the bus. Set this
+## to 'true' if all access to your application should be secure.
+##
+errai.require_authentication_for_all=false
+
+#
+# (Required) Specify the application path on the appserver
+#
+errai.application_context=/jbpm-console/
+
+#
+# (Optional) A Login MOTD sendNowWith be sent sendNowWith the client upon successful login.
+#
+errai.login_motd=UNAUTHORIZED ACCESS IS PROHIBITED!
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 2010-01-25 13:03:41 UTC (rev 931)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 2010-01-25 13:27:19 UTC (rev 932)
@@ -9,8 +9,13 @@
<inherits name="com.google.gwt.i18n.I18N"/>
<inherits name="com.google.gwt.user.ImageBundle"/>
<inherits name="com.google.gwt.xml.XML" />
+
+ <!-- remove when migration to errai is done -->
<inherits name="org.jboss.BPMWorkspace" />
+ <inherits name="org.jboss.errai.common.ErraiCommon"/>
+ <inherits name="org.jboss.errai.bus.ErraiBus" />
+
<!-- Add gwt-log support, default level `DEBUG` -->
<inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2010-01-25 13:03:41 UTC (rev 931)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2010-01-25 13:27:19 UTC (rev 932)
@@ -42,6 +42,8 @@
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.process.UpdateDefinitionsAction;
import org.jboss.bpm.console.client.util.WindowUtil;
+import org.jboss.errai.bus.client.ErraiBus;
+import org.jboss.errai.bus.client.MessageBus;
import org.jboss.errai.workspaces.client.Registry;
import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region;
@@ -72,6 +74,10 @@
this.auth = auth;
this.config = config;
+ final MessageBus bus = ErraiBus.get();
+ if(null==bus)
+ throw new IllegalStateException("Failed to initialize errai-bus");
+
Registry.set(ApplicationContext.class, this);
Registry.set(Controller.class, controller);
Modified: bpm-console/trunk/gui/war/war/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-01-25 13:03:41 UTC (rev 931)
+++ bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-01-25 13:27:19 UTC (rev 932)
@@ -11,7 +11,19 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>ErraiServlet</servlet-name>
+ <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>ErraiServlet</servlet-name>
+ <url-pattern>*.erraiBus</url-pattern>
+ </servlet-mapping>
+
+
+ <servlet-mapping>
<servlet-name>xmlProxy</servlet-name>
<url-pattern>/app/xhp/*</url-pattern>
</servlet-mapping>
More information about the overlord-commits
mailing list