Changeset 28449

Show
Ignore:
Timestamp:
01/02/08 20:19:25 (1 year ago)
Author:
sfermigier
Message:

Forward port.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/trunk/nuxeo-core-query/src/test/java/org/nuxeo/ecm/core/query/sql/TestQueryParser2.java

    r24982 r28449  
    151151        "SELECT * FROM document WHERE ecm:id = relation.subject " + 
    152152            " AND dc:title='foo'", 
     153 
     154        // Reported bogus 
     155        "SELECT * FROM Document WHERE NOT ecm:path STARTSWITH '/some/path'", 
    153156    }; 
    154157 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-compass-plugin/src/main/java/org/nuxeo/ecm/core/search/backend/compass/QueryConverter.java

    r24434 r28449  
    101101        } 
    102102 
    103         ArrayList<CompassQuery> subQueries = new ArrayList<CompassQuery>(); 
     103        List<CompassQuery> subQueries = new ArrayList<CompassQuery>(); 
    104104        addIfNotNull(subQueries, fromClause(query.getFromClause())); 
    105105        addIfNotNull(subQueries, whereClause(query.getWhereClause())); 
    …… 
    200200 
    201201    /** 
    202      * Make a security query for the given principal, on the default security 
     202     * Makes a security query for the given principal, on the default security 
    203203     * indexing field with the default list of relevant permissions. 
    204204     * 
    …… 
    213213 
    214214    /** 
    215      * Build a query for given principal, to check the given list of perms in 
     215     * Builds a query for given principal, to check the given list of perms in 
    216216     * given indexing field. 
    217      * 
     217     * <p> 
    218218     * This is translated in a {@Link MatchBeforeQuery} to require a positive 
    219219     * occurence of one of the principal's security tokens (name or group), 
    220220     * paired with one of the relevant permissions before any negative one. 
    221      * 
     221     * <p> 
    222222     * Of course the field has to have been constructed accordingly. 
    223223     * 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-webapp/src/main/resources/nuxeo.war/WEB-INF/classes/messages.properties

    r27902 r28449  
    6464command.manageThemes=Themes management 
    6565 
    66 command.document.unpublish=UnPublish 
     66command.document.unpublish=Unpublish 
    6767 
    6868#User form 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-webapp/src/main/resources/nuxeo.war/WEB-INF/classes/messages_en.properties

    r28351 r28449  
    221221label.content.header.modified=Last modification date 
    222222label.content.header.author=Author 
    223 label.content.header.currentLifecycleState=Life cycle 
     223label.content.header.currentLifecycleState=State 
    224224label.content.header.location=Location 
    225225label.content.header.size=Size 
    …… 
    884884label.username=Username 
    885885label.version=Version 
    886 label.lifecycle=Life cycle 
     886label.lifecycle=State 
    887887 
    888888lifecycle_transition_event=Document life cycle update