Changeset 28564

Show
Ignore:
Timestamp:
01/08/08 10:00:38 (1 year ago)
Author:
sfermigier
Message:

Forward port of latest cosmit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/event/CoreEvent.java

    r19492 r28564  
    5050     * @return a map holding the event information 
    5151     */ 
    52     Map getInfo(); 
     52    Map<String, ?> getInfo(); 
    5353 
    5454    /** 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/event/impl/CoreEventImpl.java

    r19492 r28564  
    3737    protected final Object source; 
    3838 
    39     protected final Map info; 
     39    protected final Map<String, ?> info; 
    4040 
    4141    protected final Date date; 
    …… 
    4848 
    4949 
    50     public CoreEventImpl(String eventId, Object source, Map info, 
     50    public CoreEventImpl(String eventId, Object source, Map<String, ?> info, 
    5151            Principal principal, String category, String comment) { 
    5252        date = new Date(); 
    …… 
    6767    } 
    6868 
    69     public Map getInfo() { 
     69    public Map<String, ?> getInfo() { 
    7070        return info; 
    7171    } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/impl/DocumentModelImpl.java

    r28479 r28564  
    889889                res = client.followTransition(ref, transition); 
    890890            } catch (NullPointerException ne) { 
    891                 throw new ClientException(ne.getMessage()); 
     891                throw new ClientException(ne.getMessage(), ne); 
    892892            } 
    893893        } else { 
    …… 
    928928                        ref); 
    929929            } catch (NullPointerException ne) { 
    930                 throw new ClientException(ne.getMessage()); 
     930                throw new ClientException(ne.getMessage(), ne); 
    931931            } 
    932932        } else { 
    …… 
    968968                        ref); 
    969969            } catch (NullPointerException ne) { 
    970                 throw new ClientException(ne.getMessage()); 
     970                throw new ClientException(ne.getMessage(), ne); 
    971971            } 
    972972        } else { 
    …… 
    10051005                lifeCyclePolicy = getClient().getLifeCyclePolicy(ref); 
    10061006            } catch (NullPointerException ne) { 
    1007                 throw new ClientException(ne.getMessage()); 
     1007                throw new ClientException(ne.getMessage(), ne); 
    10081008            } 
    10091009        } else { 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/model/impl/DefaultPropertyFactory.java

    r28195 r28564  
    193193 
    194194    public static Property newProperty(Property parent, Field field, int flags) { 
    195         Property property = null; 
     195        Property property; 
    196196        Type type = field.getType(); 
    197197        if (type.isSimpleType()) { 
    …… 
    200200            property = DefaultPropertyFactory.newMapProperty(parent, field, flags); 
    201201        } else if (type.isListType()) { 
    202             property = DefaultPropertyFactory.newListProperty(parent, field, flags); 
    203202            ListType ltype = (ListType)type; 
    204203            if (ltype.isArray()) { 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/utils/DocumentModelUtils.java

    r27902 r28564  
    137137 
    138138    private static String join(String[] items, String sep) { 
    139         StringBuffer buf = new StringBuffer(); 
     139        StringBuilder buf = new StringBuilder(); 
    140140        int max = items.length - 1; 
    141141        for (int i = 0; i < items.length; i++) { 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/api/AbstractSession.java

    r28360 r28564  
    23402340    public void orderBefore(DocumentRef parent, String src, String dest) 
    23412341            throws ClientException { 
    2342         Document doc = null; 
    2343         try { 
    2344             doc = resolveReference(parent); 
     2342        try { 
     2343            Document doc = resolveReference(parent); 
    23452344            doc.orderBefore(src, dest); 
    23462345        } catch (DocumentException e) { 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/TestCore.java

    r27629 r28564  
    3737    public void setUp() throws Exception { 
    3838        super.setUp(); 
    39         deploy("CoreService.xml"); 
    40         deploy("TypeService.xml"); 
    41         deploy("RepositoryService.xml"); 
    42         deploy("test-CoreExtensions.xml"); 
     39        deployContrib("CoreService.xml"); 
     40        deployContrib("TypeService.xml"); 
     41        deployContrib("RepositoryService.xml"); 
     42        deployContrib("test-CoreExtensions.xml"); 
    4343        typeManager = NXSchema.getSchemaManager(); 
    4444    } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/event/TestCoreEvent.java

    r25725 r28564  
    4141        String eventId = "someEvent"; 
    4242        String source = "someDummySource"; 
    43         Map<String, Serializable> info = null; 
    4443 
    4544        CoreEvent coreEvent = new CoreEventImpl(null, null, null, null, null, null); 
    …… 
    6160        assertNull(coreEvent2.getInfo()); 
    6261 
     62        Map<String, Serializable> info = null; 
    6363        CoreEvent coreEvent3 = new CoreEventImpl(eventId, source, info, null, null, null); 
    6464        assertNotNull(coreEvent3); 
    …… 
    8989        CoreEvent coreEvent = new CoreEventImpl(eventId, null, info, null, null, null); 
    9090        assertEquals(eventId, coreEvent.getEventId()); 
    91         Map<String, Serializable> infoBack = coreEvent.getInfo(); 
     91        Map<String, ?> infoBack = coreEvent.getInfo(); 
    9292        assertEquals(info, infoBack); 
    9393        assertEquals("xxx", infoBack.get("destination")); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/event/TestNXRuntimeEventListener.java

    r16046 r28564  
    3232public class TestNXRuntimeEventListener extends NXRuntimeTestCase { 
    3333 
    34     private static final String nxListenerName = "nxruntimelistener"; 
     34    private static final String LISTENER_NAME = "nxruntimelistener"; 
    3535 
    3636    @Override 
    …… 
    3838        super.setUp(); 
    3939 
    40         deploy("RepositoryService.xml"); 
    41         deploy("CoreEventListenerService.xml"); 
     40        deployContrib("RepositoryService.xml"); 
     41        deployContrib("CoreEventListenerService.xml"); 
    4242    } 
    4343 
    44     private CoreEventListenerService getRepositoryListenerService() { 
     44    private static CoreEventListenerService getRepositoryListenerService() { 
    4545        return NXCore.getCoreEventListenerService(); 
    4646    } 
    …… 
    4848    public void testNXListenerRegistration() { 
    4949        CoreEventListenerService listenerService = getRepositoryListenerService(); 
    50         EventListener nxListener = listenerService.getEventListenerByName(nxListenerName); 
     50        EventListener nxListener = listenerService.getEventListenerByName( 
     51                LISTENER_NAME); 
    5152        assertNotNull(nxListener); 
    5253    } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/lifecycle/TestLifeCycleService.java

    r16046 r28564  
    7171        // Test life cycle registration 
    7272 
    73         LifeCycle lcd = lifeCycleService 
    74                 .getLifeCycleByName("default"); 
     73        LifeCycle lcd = lifeCycleService.getLifeCycleByName("default"); 
    7574        assertNotNull(lcd); 
    7675 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/repository/FakeEventListener.java

    r16046 r28564  
    3737    public void notifyEvent(CoreEvent coreEvent) { 
    3838        // add an info in the core event map when processing the event 
    39         Map info = coreEvent.getInfo(); 
     39        Map<String, ?> info = coreEvent.getInfo(); 
    4040        if (info != null) { 
    4141            if (info.get("hits") != null) { 
    42                 ((List) info.get("hits")).add(getName()); 
     42                ((List<String>) info.get("hits")).add(getName()); 
    4343            } 
    4444        } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/repository/TestRepositoryListenerService.java

    r24456 r28564  
    4444    protected void setUp() throws Exception { 
    4545        super.setUp(); 
    46         deploy("RepositoryService.xml"); 
    47         deploy("CoreEventListenerService.xml"); 
    48         deploy("CoreEventListenerTestExtensions.xml"); 
     46        deployContrib("RepositoryService.xml"); 
     47        deployContrib("CoreEventListenerService.xml"); 
     48        deployContrib("CoreEventListenerTestExtensions.xml"); 
    4949 
    5050        repositoryListenerService = NXCore.getCoreEventListenerService(); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/test/java/org/nuxeo/ecm/core/security/TestSecurityService.java

    r28346 r28564  
    107107 
    108108    public void testOverridedPermissions1() throws Exception { 
    109  
    110109        // deploy a new atomic permission and a new compound permission 
    111110        deployContrib("permissions-override1-contrib.xml"); 
    …… 
    142141        assertNotNull(groups); 
    143142        assertEquals(Arrays.asList("CustomCompoundPerm"), Arrays.asList(groups)); 
    144  
    145143    } 
    146144 
    147145    public void testOverridedVisiblePermission1() throws Exception { 
    148  
    149146        deployContrib("permissions-override1-contrib.xml"); 
    150147 
    …… 
    175172 
    176173    public void testOverridedPermissions2() throws Exception { 
    177  
    178174        // deploy a new atomic permission and a new compound permission 
    179175        deployContrib("permissions-override2-contrib.xml"); 
    …… 
    191187        assertNotNull(groups); 
    192188        assertEquals(Arrays.asList("ReadWrite", "Write"), Arrays.asList(groups)); 
    193  
    194189    } 
    195190