[overlord-commits] Overlord SVN: r747 - bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server.

[overlord-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-08-06 13:42:29 -0400 (Thu, 06 Aug 2009)
New Revision: 747

Modified:
   bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java
Log:
Fix BPMC-7: Server resource page doesn't include servlet path. Thanks Ju

Modified: bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java
===================================================================
--- bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java	2009-08-06 05:59:39 UTC (rev 746)
+++ bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java	2009-08-06 17:42:29 UTC (rev 747)
@@ -109,7 +109,12 @@
             //,ReportFacade.class
         };
 
-    RsDocBuilder rsDocBuilder = new RsDocBuilder(request.getContextPath(),rootResources);
+    String rsServer = request.getContextPath();
+    if (request.getServletPath() != null && !"".equals(request.getServletPath())) {
+    	rsServer = request.getContextPath() + request.getServletPath();
+    }
+    
+    RsDocBuilder rsDocBuilder = new RsDocBuilder(rsServer,rootResources);
     StringBuffer sb = rsDocBuilder.build();
     return Response.ok(sb.toString()).build();
   }