[jbpm-commits] JBoss JBPM SVN: r4900 - in projects/gwt-console/trunk: server/server-core and 2 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-05-26 09:46:39 -0400 (Tue, 26 May 2009)
New Revision: 4900

Modified:
   projects/gwt-console/trunk/pom.xml
   projects/gwt-console/trunk/server/server-core/pom.xml
   projects/gwt-console/trunk/server/server-core/server-core.iml
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
   projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml
Log:
Integrate report facade with console server

Modified: projects/gwt-console/trunk/pom.xml
===================================================================
--- projects/gwt-console/trunk/pom.xml	2009-05-26 13:45:43 UTC (rev 4899)
+++ projects/gwt-console/trunk/pom.xml	2009-05-26 13:46:39 UTC (rev 4900)
@@ -34,6 +34,7 @@
     <mvc4g.version>1.0.0-jboss</mvc4g.version>
     <resteasy.version>1.0.2.GA</resteasy.version>
     <stax-api.version>1.0-2</stax-api.version>
+    <report.server.version>1.0.0-SNAPSHOT</report.server.version>
   </properties>
 
   <modules>
@@ -171,7 +172,11 @@
         <artifactId>commons-io</artifactId>
         <version>${commons.io.version}</version>
       </dependency>
-
+      <dependency>
+        <groupId>org.jboss.bpm</groupId>
+        <artifactId>report-core</artifactId>
+        <version>${report.server.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: projects/gwt-console/trunk/server/server-core/pom.xml
===================================================================
--- projects/gwt-console/trunk/server/server-core/pom.xml	2009-05-26 13:45:43 UTC (rev 4899)
+++ projects/gwt-console/trunk/server/server-core/pom.xml	2009-05-26 13:46:39 UTC (rev 4900)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.bpm</groupId>
     <artifactId>gwt-console-servermodule</artifactId>
-    <version>1.0.0-SNAPSHOT</version>             
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-multipart-provider</artifactId>
-        <exclusions>
+      <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
           <artifactId>servlet-api</artifactId>
@@ -162,6 +162,13 @@
       <artifactId>jboss-common-core</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>report-core</artifactId>
+
+    </dependency>
+
   </dependencies>
 
   <build>

Modified: projects/gwt-console/trunk/server/server-core/server-core.iml
===================================================================
--- projects/gwt-console/trunk/server/server-core/server-core.iml	2009-05-26 13:45:43 UTC (rev 4899)
+++ projects/gwt-console/trunk/server/server-core/server-core.iml	2009-05-26 13:46:39 UTC (rev 4900)
@@ -253,6 +253,7 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="report-server" />
     <orderEntryProperties />
   </component>
 </module>

Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java	2009-05-26 13:45:43 UTC (rev 4899)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java	2009-05-26 13:46:39 UTC (rev 4900)
@@ -21,6 +21,8 @@
  */
 package org.jboss.bpm.console.server;
 
+import org.jboss.bpm.report.ReportFacade;
+
 import javax.ws.rs.core.Application;
 import java.util.HashSet;
 import java.util.Set;
@@ -42,6 +44,8 @@
     singletons.add(new TaskMgmtFacade());
     singletons.add(new UserMgmtFacade());
     singletons.add(new TestFacade());
+
+    singletons.add( new ReportFacade() );
   }
 
   @Override

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-26 13:45:43 UTC (rev 4899)
+++ projects/gwt-console/trunk/server/server-core/src/main/webapp/WEB-INF/web.xml	2009-05-26 13:46:39 UTC (rev 4900)
@@ -15,6 +15,11 @@
     <param-value>/rs</param-value>
   </context-param>
 
+  <context-param>
+    <param-name>resteasy.providers</param-name>
+    <param-value>org.jboss.bpm.report.FileWriter</param-value>
+  </context-param>
+
   <filter>
     <filter-name>gwtJSON</filter-name>
     <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class>
@@ -48,7 +53,7 @@
       <url-pattern>/rs/process/*</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>      
+      <url-pattern>/rs/identity/*</url-pattern>
     </web-resource-collection>
     <auth-constraint>
       <role-name>administrator</role-name>
@@ -62,7 +67,7 @@
     <realm-name>GWT Console Server</realm-name>
   </login-config>
 
-  <security-role>               
+  <security-role>
     <role-name>administrator</role-name>
   </security-role>
   <security-role>