[jbpm-commits] JBoss JBPM SVN: r2482 - in jbpm3/trunk/modules/gwt-console: rpc and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Oct 6 08:59:37 EDT 2008


Author: heiko.braun at jboss.com
Date: 2008-10-06 08:59:37 -0400 (Mon, 06 Oct 2008)
New Revision: 2482

Modified:
   jbpm3/trunk/modules/gwt-console/pom.xml
   jbpm3/trunk/modules/gwt-console/rpc/pom.xml
   jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinition.java
   jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java
   jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html
   jbpm3/trunk/modules/gwt-console/war/pom.xml
   jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
   jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
Log:
provided dependencies shouldn't get deployed

Modified: jbpm3/trunk/modules/gwt-console/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/pom.xml	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/pom.xml	2008-10-06 12:59:37 UTC (rev 2482)
@@ -17,6 +17,9 @@
    <properties>
       <gchart.version>2.2</gchart.version>
       <gwtext.version>2.0.5</gwtext.version>
+      <gwt-widgets.version>0.2.0</gwt-widgets.version>
+      <stax-api.version>1.0-2</stax-api.version>
+      <jaf.version>1.1</jaf.version>
    </properties>
 
    <modules>
@@ -37,6 +40,21 @@
             <artifactId>gchart</artifactId>
             <version>${gchart.version}</version>
          </dependency>
+         <dependency>
+            <groupId>net.sf.gwt-widget</groupId>
+            <artifactId>gwt-widgets</artifactId>
+            <version>${gwt-widgets.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax-api.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>${jaf.version}</version>            
+         </dependency>
       </dependencies>
    </dependencyManagement>
 </project>

Modified: jbpm3/trunk/modules/gwt-console/rpc/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/pom.xml	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/rpc/pom.xml	2008-10-06 12:59:37 UTC (rev 2482)
@@ -30,10 +30,15 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <scope>provided</scope>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>jaxb-api</artifactId>
+         <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>net.sf.gwt-widget</groupId>
+         <artifactId>gwt-widgets</artifactId>
+         <version>${gwt-widgets.version}</version>
+      </dependency>
    </dependencies>
 
    <build>
@@ -43,5 +48,5 @@
             <directory>src/main/java</directory>
          </resource>
       </resources>
-   </build>  
+   </build>
 </project>

Modified: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinition.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinition.java	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinition.java	2008-10-06 12:59:37 UTC (rev 2482)
@@ -23,8 +23,8 @@
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlElement;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>

Modified: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java	2008-10-06 12:59:37 UTC (rev 2482)
@@ -21,8 +21,10 @@
  */
 package org.jboss.bpm.console.client.model;
 
+import org.gwtwidgets.client.util.SimpleDateFormat;
+
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlElement;
 import java.util.Date;
 
 /**
@@ -97,9 +99,11 @@
    }
 
    @XmlElement(name = "start")
-   public Date getStartDate()
+   public String getStartDate()
    {
-      return startDate;
+      //"yyyy.MM.dd G 'at' HH:mm:ss vvvv"
+      SimpleDateFormat df = new SimpleDateFormat("y-M-d H:m:s");
+      return df.format(startDate);
    }
 
    public void setStartDate(Date startDate)
@@ -107,10 +111,11 @@
       this.startDate = startDate;
    }
 
-   @XmlElement(name = "end")
-   public Date getEndDate()
+   @XmlElement(name = "end")   
+   public String getEndDate()
    {
-      return endDate;
+      SimpleDateFormat df = new SimpleDateFormat("y-M-d H:m:s");
+      return df.format(endDate);
    }
 
    public void setEndDate(Date endDate)

Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html	2008-10-06 12:59:37 UTC (rev 2482)
@@ -37,7 +37,7 @@
 
 <pre>
    curl -H 'Accept: application/json' http://localhost:8080/gwt-console-server/rs/process/definitions
-   curl -H 'Accept: application/json' http://localhrocess/definitions/1/instances
+   curl -H 'Accept: application/json' http://localhost:8080/gwt-console-server/rs/process/definitions/1/instances
 </pre>
 </body>
 </html>
\ No newline at end of file

Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/pom.xml	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/war/pom.xml	2008-10-06 12:59:37 UTC (rev 2482)
@@ -20,7 +20,7 @@
       <dependency>
          <groupId>org.jbpm.jbpm3</groupId>
          <artifactId>gwt-console-rpc</artifactId>
-         <version>${version}</version>         
+         <version>${version}</version>
       </dependency>
 
       <dependency>
@@ -59,18 +59,18 @@
          <artifactId>gchart</artifactId>
       </dependency>
 
-<dependency>
-    <groupId>javax.xml.stream</groupId>
-    <artifactId>stax-api</artifactId>
-    <version>1.0-2</version>
-</dependency>
- <dependency>
-    <groupId>javax.activation</groupId>
-    <artifactId>activation</artifactId>
-    <version>1.1</version>
-</dependency>
+      <dependency>
+         <groupId>javax.xml.stream</groupId>
+         <artifactId>stax-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.activation</groupId>
+         <artifactId>activation</artifactId>         
+         <scope>provided</scope>
+      </dependency>
 
-</dependencies>
+   </dependencies>
    <!-- Plugins -->
    <build>
       <plugins>

Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java	2008-10-06 12:59:37 UTC (rev 2482)
@@ -31,6 +31,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Date;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -113,7 +114,7 @@
           new IntegerFieldDef("parentId"),
           new StringFieldDef("key"),
           new StringFieldDef("status"),
-          new DateFieldDef("start"),
+          new DateFieldDef("start", "Y-m-d H:i:s"),   //2008-10-02 13:51:27
           new DateFieldDef("end")
         }
       );

Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml	2008-10-06 10:54:19 UTC (rev 2481)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml	2008-10-06 12:59:37 UTC (rev 2482)
@@ -4,8 +4,8 @@
   <inherits name='com.google.gwt.user.User' />
   <inherits name='com.gwtext.GwtExt' />
   <inherits name='com.googlecode.gchart.GChart'/>
+  <inherits name='org.gwtwidgets.WidgetLibrary'/>
 
-
    
   <!-- Specify the app entry point class. -->
   <entry-point class='org.jboss.bpm.console.client.Application' />




More information about the jbpm-commits mailing list