[OpenbravoERP-commits] devel/pi: related to issue 32512, related to issue 32366: exclud...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b468094df0d0
changeset: 30439:b468094df0d0
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Oct 14 16:02:59 2016 +0200
summary:   related to issue 32512, related to issue 32366: exclude callouts 
from web.xml

  Callous are not executed as Servlets so they needn't be in web.xml. 
SimpleCallout
  do not extend servlet, so callouts extending it cannot be in web.xml.

diffstat:

 src-test/src/org/openbravo/test/model/ClassLoaderTest.java |  3 +--
 src-wad/src/org/openbravo/wad/Wad_data.xsql                |  2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r 534fc1edee0d -r b468094df0d0 
src-test/src/org/openbravo/test/model/ClassLoaderTest.java
--- a/src-test/src/org/openbravo/test/model/ClassLoaderTest.java        Fri Oct 
14 15:39:23 2016 +0200
+++ b/src-test/src/org/openbravo/test/model/ClassLoaderTest.java        Fri Oct 
14 16:02:59 2016 +0200
@@ -29,7 +29,6 @@
 
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -66,7 +65,6 @@
    * Consistency test to have a clean web.xml
    */
   @Test
-  @Ignore
   public void modelClassesShouldImplementServlet() {
     loadModel();
 
@@ -109,6 +107,7 @@
     obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_TAB));
     obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_SPECIALFORM));
     obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_PROCESS));
+    obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_CALLOUT));
 
     checkClasses("Manual Servlet", obc.list(), notFoundClasses, 
notServletClasses);
 
diff -r 534fc1edee0d -r b468094df0d0 src-wad/src/org/openbravo/wad/Wad_data.xsql
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql       Fri Oct 14 15:39:23 
2016 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql       Fri Oct 14 16:02:59 
2016 +0200
@@ -34,6 +34,7 @@
       AND OBJECT_TYPE = 'S'
       AND ACTION != 'W'
       AND COALESCE(p.uiPattern,'M') = 'M'
+      AND AD_CALLOUT_ID IS NULL
       ORDER BY NAME
       ]]>
     </Sql>
@@ -68,6 +69,7 @@
       AND MO.OBJECT_TYPE = 'S' 
       AND MO.ACTION != 'W'
       AND MO.AD_MODEL_OBJECT_ID = MOM.AD_MODEL_OBJECT_ID 
+      AND AD_CALLOUT_ID IS NULL
       GROUP BY MO.CLASSNAME, MOM.MAPPINGNAME
       ORDER BY NAME
       ]]>

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits