[jbpm-commits] JBoss JBPM SVN: r4778 - in projects/gwt-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon May 11 12:08:06 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-05-11 12:08:06 -0400 (Mon, 11 May 2009)
New Revision: 4778
Added:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java
projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html
projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml
Log:
Layout fixes
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -99,8 +99,8 @@
window.setSize("320px", "180px");
LayoutPanel panel = new LayoutPanel();
+ createLayoutContent(panel);
window.setWidget(panel);
- createLayoutContent(panel);
window.addWindowCloseListener(new WindowCloseListener() {
public void onWindowClosed() {
@@ -163,7 +163,12 @@
// TODO: does this load the imagebundle already?
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+
+ LayoutPanel imgPanel = new LayoutPanel();
+ imgPanel.add(icons.userIcon().createImage());
+ imgPanel.setVisible(false);
+ layoutPanel.add(imgPanel, new BorderLayoutData(BorderLayout.Region.NORTH, 50, 200));
layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200));
layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200));
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -58,14 +58,15 @@
public void update(ServerStatus status)
{
Grid g = new Grid(status.getPlugins().size()+1, 2);
-
+
g.setWidget(0, 0, new Label("Plugins:"));
for (int row = 1; row < status.getPlugins().size()+1; ++row)
{
PluginInfo p = status.getPlugins().get(row-1);
g.setText(row, 0, p.getType());
-
+ g.setStyleName("bpm-info-table");
+
final Image img = p.isAvailable() ?
new Image("images/icons/confirm_small.png"):
new Image("images/icons/deny_small.png");
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -57,35 +57,38 @@
new BoxLayout(BoxLayout.Orientation.VERTICAL)
);
-
// console info
- HTML console = new HTML("<h3>Console Info</h3>");
+ StringBuffer sb = new StringBuffer();
+ sb.append("<table>");
+ sb.append("<tr>");
+ sb.append("<td colspan=2><h3>Console Info</h3></td>");
+ sb.append("</tr>");
- layoutPanel.add(console);
+ sb.append("<tr>");
+ sb.append("<td>Version: </td>");
+ sb.append("<td>"+Version.VERSION+"</td>");
+ sb.append("</tr>");
- Grid g1 = new Grid(2,2);
- g1.setWidget(0,0, new Label("Build:"));
- g1.setText(0,1, "jBPM Console");
+ sb.append("<tr>");
+ sb.append("<td colspan=2><br/></td>");
+ sb.append("</tr>");
- g1.setWidget(1,0, new Label("Version:"));
- g1.setText(1,1, Version.VERSION);
- layoutPanel.add(g1);
-
+ sb.append("<tr>");
+ sb.append("<td colspan=2><h3>Server Info</h3></td>");
+ sb.append("</tr>");
- // server info
- HTML server = new HTML("<h3>Server Info</h3>");
- layoutPanel.add(server);
+ sb.append("<tr>");
+ sb.append("<td>Host: </td>");
+ sb.append("<td>"+appContext.getConfig().getConsoleServerUrl()+"</td>");
+ sb.append("</tr>");
- Grid g2 = new Grid(1,2);
- g2.setWidget(0,0, new Label("Host:"));
- g2.setText(0,1, appContext.getConfig().getConsoleServerUrl());
+ sb.append("</table>");
+ layoutPanel.add(new HTML(sb.toString()));
ServerStatusView serverStatus = new ServerStatusView(appContext);
-
- layoutPanel.add(g2);
layoutPanel.add(serverStatus); // Doesn't render in grid
+
-
tabPanel.add(layoutPanel, "System Overview");
this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER));
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -53,6 +53,8 @@
final String url = getUrl(object);
RequestBuilder builder = new RequestBuilder(getRequestMethod(), URL.encode(url));
+ ConsoleLog.debug(getRequestMethod() +": " + url);
+
try
{
controller.handleEvent( LoadingStatusAction.ON );
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -31,12 +31,14 @@
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.ToolBar;
import org.gwt.mosaic.ui.client.ToolButton;
+import org.gwt.mosaic.ui.client.MessageBox;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.gwt.mosaic.ui.client.list.DefaultListModel;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.common.AbstractView;
@@ -146,6 +148,28 @@
}
)
);
+
+ toolBar.addSeparator();
+
+ toolBar.add(
+ new ToolButton("Delete", new ClickListener() {
+ public void onClick(Widget sender) {
+ // force loading
+ ProcessDefinitionRef definitionRef = getSelection();
+ if(definitionRef!=null)
+ {
+ controller.handleEvent(
+ new Event(DeleteDefinitionAction.ID, definitionRef)
+ );
+ }
+ else
+ {
+ MessageBox.alert("Missing selection", "Please select a process definition");
+ }
+ }
+ }
+ )
+ );
toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java (rev 0)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.process;
+
+import org.jboss.bpm.console.client.common.AbstractRESTAction;
+import org.jboss.bpm.console.client.ApplicationContext;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.Response;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class DeleteDefinitionAction extends AbstractRESTAction
+{
+ public final static String ID = DeleteDefinitionAction.class.getName();
+
+ public DeleteDefinitionAction(ApplicationContext appContetext)
+ {
+ super(appContetext);
+ }
+
+ public String getId()
+ {
+ return ID;
+ }
+
+ public String getUrl(Object event)
+ {
+ ProcessDefinitionRef procRef = (ProcessDefinitionRef)event;
+ return appContext.getUrlBuilder().getRemoveDefinitionURL(procRef.getId());
+ }
+
+ public RequestBuilder.Method getRequestMethod()
+ {
+ return RequestBuilder.POST;
+ }
+
+ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
+ {
+ // refresh
+ controller.handleEvent(
+ new Event(LoadDefinitionsAction.ID, null)
+ );
+ }
+}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -105,7 +105,8 @@
registerAction(LoadInstancesAction.ID, new LoadInstancesAction(appContext));
registerAction(StartNewInstanceAction.ID, new StartNewInstanceAction(appContext));
registerAction(StateChangeAction.ID, new StateChangeAction(appContext));
-
+ registerAction(DeleteDefinitionAction.ID, new DeleteDefinitionAction(appContext));
+
// display tab, needs to visible for correct rendering
tabPanel.selectTab(0);
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-11 16:08:06 UTC (rev 4778)
@@ -53,6 +53,7 @@
private final ApplicationContext appContext;
private WindowPanel windowPanel;
+ private Frame frame;
public AssignedTasksView(ApplicationContext appContext)
{
@@ -200,7 +201,11 @@
windowPanel.addWindowCloseListener(new WindowCloseListener() {
public void onWindowClosed() {
- windowPanel = null;
+ windowPanel = null;
+ frame = null;
+ controller.handleEvent(
+ new Event(LoadTasksAction.ID, null)
+ );
}
public String onWindowClosing() {
@@ -209,7 +214,7 @@
});
// iframe
- Frame frame = new Frame();
+ frame = new Frame();
frame.setUrl(task.getUrl());
DOM.setStyleAttribute(frame.getElement(), "border", "none");
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-11 16:08:06 UTC (rev 4778)
@@ -196,6 +196,7 @@
text-decoration:underline;
}
+/* start - override gwt-log styles */
.log-panel {
background-color: #ECF2FC;
border: 0px solid black;
@@ -217,3 +218,13 @@
visibility:hidden;
}
+/* end - override gwt-log styles */
+
+.bpm-info-table {
+ border:0px solid;
+ width:100%;
+ background:#F8F8F8;
+ padding:5px;
+}
+
+
Modified: projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml 2009-05-11 12:02:14 UTC (rev 4777)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml 2009-05-11 16:08:06 UTC (rev 4778)
@@ -46,7 +46,7 @@
<web-resource-collection>
<web-resource-name>Resteasy</web-resource-name>
<url-pattern>/rs/process/*</url-pattern>
- <url-pattern>/rs/task/*</url-pattern>
+ <!--url-pattern>/rs/task/*</url-pattern https://jira.jboss.org/jira/browse/JBPM-2229 -->
<url-pattern>/rs/tasks/*</url-pattern>
<url-pattern>/rs/identity/*</url-pattern>
</web-resource-collection>
Added: projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/login.html 2009-05-11 16:08:06 UTC (rev 4778)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<form method="POST" action="j_security_check">
+ User: <input type="text" name="j_username"><br>
+ Password: <input type="password" name="j_password"><br/>
+ <input type="submit"/>
+</form>
+</body>
+</html>
\ No newline at end of file
Added: projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html (rev 0)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/login_failed.html 2009-05-11 16:08:06 UTC (rev 4778)
@@ -0,0 +1,5 @@
+<html>
+<body>
+Login failed!
+</body>
+</html>
\ No newline at end of file
More information about the jbpm-commits
mailing list