Changeset 28989

Show
Ignore:
Timestamp:
01/13/08 00:08:51 (11 months ago)
Author:
sfermigier
Message:

Backport of tons of trivial patchs.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/adapter/DocumentAdapterService.java

    r28924 r28989  
    6464    public void registerAdapterFactory(DocumentAdapterDescriptor dae) { 
    6565        adapters.put(dae.getInterface(), dae); 
    66         log.info("Registered document adapter factory" + dae); 
     66        log.info("Registered document adapter factory " + dae); 
    6767    } 
    6868 

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core-schema/src/main/java/org/nuxeo/ecm/core/schema/types/TypeBindingException.java

    r16046 r28989  
    3232 
    3333    public TypeBindingException(String typeName) { 
    34         super("Type colud not be resolved: " + typeName); 
     34        super("Type could not be resolved: " + typeName); 
    3535        this.typeName = typeName; 
    3636    } 

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/resources/OSGI-INF/SecurityService.xml

    r28304 r28989  
    2525    and in which order they should be display in management menus. 
    2626 
    27     @author 
    28     <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a> 
    29     @author 
    30     <a href="mailto:og@nuxeo.com">Olivier Grisel</a> 
     27    @author <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a> 
     28    @author <a href="mailto:og@nuxeo.com">Olivier Grisel</a> 
    3129  </documentation> 
    3230 

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/resources/OSGI-INF/permissions-contrib.xml

    r28304 r28989  
    66    org.nuxeo.ecm.core/nuxeo-core/doc/NXCore-Security.txt 
    77 
    8     @author 
    9     <a href="mailto:og@nuxeo.com">Olivier Grisel</a> 
     8    @author <a href="mailto:og@nuxeo.com">Olivier Grisel</a> 
    109  </documentation> 
    1110 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-content-template-manager/src/test/java/org/nuxeo/ecm/platform/content/template/tests/TestContentTemplateFactory.java

    r28971 r28989  
    4747        super.setUp(); 
    4848 
    49         deployContrib("ServiceManagement.xml"); 
    50         deployContrib("LoginComponent.xml"); 
     49        //deployContrib("ServiceManagement.xml"); 
     50        //deployContrib("LoginComponent.xml"); 
    5151        deployContrib("RepositoryManager.xml"); 
    52         deployContrib("RepositoryService.xml"); 
     52        //deployContrib("RepositoryService.xml"); 
    5353        deployContrib("CoreTestExtensions.xml"); 
    54         deployContrib("CoreEventListenerService.xml"); 
     54        //deployContrib("CoreEventListenerService.xml"); 
    5555        deployContrib("DemoRepository.xml"); 
    5656        deployContrib("LifeCycleService.xml"); 
    57         deployContrib("LifeCycleServiceExtensions.xml"); 
     57        //deployContrib("LifeCycleServiceExtensions.xml"); 
    5858        deployContrib("CoreEventListenerService.xml"); 
    59         deployContrib("PlatformService.xml"); 
     59        //deployContrib("PlatformService.xml"); 
    6060        deployContrib("DefaultPlatform.xml"); 
    6161 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-events-core/src/main/java/org/nuxeo/ecm/platform/events/service/JMSDocumentMessageProducerService.java

    r28510 r28989  
    4545    private static final String CORE_EVENTS_DESTINATION = "topic/NXCoreEvents"; 
    4646 
    47     private static final Log log = LogFactory 
    48             .getLog(JMSDocumentMessageProducerService.class); 
     47    private static final Log log = LogFactory.getLog(JMSDocumentMessageProducerService.class); 
    4948 
    5049    // :TODO: Ensure XA 
    5150    private static final String XA_TOPIC_CONNECTION_FACTORY = "JmsNX"; 
    5251    //private static final String XA_TOPIC_CONNECTION_FACTORY = "TopicConnectionFactory"; 
    53  
    5452 
    5553    /** 
    …… 
    5957    @Deprecated 
    6058    public void produce(DocumentMessage message) { 
     59        if (message == null) { 
     60            log.debug("Incoming message is null. Cancelling..."); 
     61        } 
    6162        log.debug("Producing message.............................."); 
    6263        try { 
    …… 
    6869        } catch (DocumentMessageProducerException e) { 
    6970            log.error("En error occured while trying to send a JMS message on" 
    70                     + "on the topic/NXCoreMessages topic destination"); 
     71                    + "on the " + DESTINATION_JNDI_NAME + " topic destination"); 
    7172            e.printStackTrace(); 
    7273        } 
    …… 
    7475 
    7576    public void produce(EventMessage message) { 
     77        if (message == null) { 
     78            log.debug("Incoming message is null. Cancelling..."); 
     79        } 
    7680        log.debug("Producing message.............................."); 
    7781        try { 
    …… 
    8185        } catch (DocumentMessageProducerException e) { 
    8286            log.error("En error occured while trying to send a JMS message on" 
    83                     + "on the topic/NXCoreMessages topic destination"); 
     87                    + "on the " + DESTINATION_JNDI_NAME + " topic destination"); 
    8488            e.printStackTrace(); 
    8589        } 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-imaging-transform/src/main/java/org/nuxeo/ecm/platform/imaging/transform/impl/ImagingTransformPluginImpl.java

    r28476 r28989  
    3939        ImagingTransformPlugin { 
    4040 
    41     private static final long serialVersionUID = 1L; 
     41    private static final long serialVersionUID = 8917837724437954053L; 
    4242 
    4343    @Override 
    …… 
    6969                    if (in != null) { 
    7070                        InputStream result = service.rotate(in, angle); 
    71                         /* 
    72                          * try { EditableImage image = EditableImage.create( new 
    73                          * ReadOp(in, ReadOp.Type.IMAGE)); image = 
    74                          * image.execute2( new RotateQuadrantOp(angle)); 
    75                          * BufferedImage bufferedImage = image.execute(new 
    76                          * ConvertToBufferedImageOp()).getBufferedImage(); 
    77                          * Iterator<ImageWriter> iterator = 
    78                          * ImageIO.getImageWritersByMIMEType(getDestinationMimeType()); 
    79                          * while( iterator.hasNext() ) { ImageWriter writer = 
    80                          * iterator.next(); ImageWriteParam writerParams = 
    81                          * writer.getDefaultWriteParam(); if 
    82                          * (writerParams.canWriteCompressed()) { 
    83                          * writerParams.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); 
    84                          * writerParams.setCompressionQuality(1.0f); } 
    85                          * writer.setOutput(output); writer.write(null, new 
    86                          * IIOImage(bufferedImage, null, null), writerParams); } } 
    87                          * catch (IOException e) { // TODO Auto-generated catch 
    88                          * block e.printStackTrace(); } 
    89                          */ 
    9071                        // FIXME : local only 
    9172                        FileBlob blob = new FileBlob(result); 
    …… 
    10182        return results; 
    10283    } 
     84 
    10385} 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-mimetype-core/src/test/java/org/nuxeo/ecm/platform/mimetype/TestMimetype.java

    r22435 r28989  
    2020package org.nuxeo.ecm.platform.mimetype; 
    2121 
    22 import java.io.File; 
    23 import java.net.URL; 
    2422import java.util.ArrayList; 
    2523import java.util.List; 
    26 import org.nuxeo.common.utils.FileUtils; 
    2724 
    2825import junit.framework.TestCase; 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-search-api/src/main/java/org/nuxeo/ecm/core/search/api/backend/indexing/resources/impl/ResolvedResourceImpl.java

    r21705 r28989  
    106106    } 
    107107 
     108    public String toString() { 
     109        String className = getClass().getSimpleName(); 
     110        if (resourceProxy == null) { 
     111            return String.format("%s (uninitialized)", className); 
     112        } 
     113        return String.format("%s (for '%s')", getClass().getSimpleName(), 
     114                getConfiguration().getName()); 
     115    } 
     116 
    108117} 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-syndication/src/main/java/org/nuxeo/ecm/platform/syndication/FeedItemAdapter.java

    r28463 r28989  
    2828import java.util.List; 
    2929 
    30  
    3130import org.nuxeo.ecm.core.api.ClientException; 
    3231import org.nuxeo.ecm.core.api.DocumentModel; 
    …… 
    3736 * 
    3837 */ 
    39 public class FeedItemAdapter { 
     38public class FeedItemAdapter { 
    4039 
    4140    private static final DateFormat DATE_PARSER = new SimpleDateFormat( 
    …… 
    6160                "description")); 
    6261 
    63 //      List<String> contributors = Arrays.asList((String[]) doc.getProperty("dublincore", "contributors")); 
     62        //List<String> contributors = Arrays.asList((String[]) doc.getProperty("dublincore", "contributors")); 
    6463        // direct cast fails for some ResultDocuments returned by search service !!! 
    6564        List<String> contributors = new ArrayList<String>(); 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-transform-plugins/src/test/java/org/nuxeo/ecm/platform/transform/jooconverter/TestJOOoConverter2pdfService.java

    r28924 r28989  
    2929 
    3030/** 
    31  * 
    3231 * Testing the joooconverter. 
    3332 * <p> 
    3433 * We request the transformation service directly here. 
    3534 * <p> 
    36  * These tests are conveting basic documents to pdf 
     35 * These tests are converting basic documents to pdf. 
    3736 * 
    3837 * @author <a href="mailto:ja@nuxeo.com">Julien Anguenot</a> 
    39  * 
    4038 */ 
    4139public class TestJOOoConverter2pdfService extends AbstractPluginTestCase { 
    …… 
    4442 
    4543    public void testText2pdfConversion() throws Exception { 
    46  
    4744        String path = "test-data/hello.txt"; 
    4845        List<TransformDocument> results = service.transform(transformerName, 
    …… 
    6057 
    6158    public void testDoc2pdfConversion() throws Exception { 
    62  
    6359        String path = "test-data/hello.doc"; 
    6460        List<TransformDocument> results = service.transform(transformerName, 
    …… 
    9692    /* 
    9793     * OpenOffice.org 2.x documents. 
    98      * 
    9994     */ 
    10095 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/security/UserSession.java

    r28924 r28989  
    3838public class UserSession implements Serializable { 
    3939 
    40  
    4140    private static final long serialVersionUID = 7639281445209754L; 
    4241 
    4342    private Principal currentUser; 
    4443 
    45     @In(create = true, required=false) 
    46     transient CoreSession documentManager; 
     44    @In(create = true, required = false) 
     45    protected transient CoreSession documentManager; 
    4746 
    4847    @Factory(value = "currentUser", scope = SESSION) 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/wfnotification/NotifDatesEcheancesListener.java

    r28476 r28989  
    7272                    + eventId); 
    7373 
    74             if ("checkDatesEcheancesEvent".equals(eventId)){ 
     74            if ("checkDatesEcheancesEvent".equals(eventId)) { 
    7575                checkDatesAndSendNotifications(); 
    7676            } 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-ws/src/main/java/org/nuxeo/ecm/platform/api/ws/DocumentProperty.java

    r28476 r28989  
    2929public class DocumentProperty implements Serializable { 
    3030 
    31  
    3231    private static final long serialVersionUID = -5495522067864308283L; 
    3332 
    …… 
    3736 
    3837    /** 
    39      * Emtpy ctor needed by tools like jaxb 
     38     * Empty ctor needed by tools like jaxb. 
    4039     */ 
    4140    public DocumentProperty() { 
    …… 
    5756 
    5857    /** 
    59      * Return the field value as a string. 
     58     * Returns the field value as a string. 
    6059     * <p> 
    6160     * Here, we will always return string for the moment. Request from the 

  • org.nuxeo.theme/branches/5.1/nuxeo-theme-core/src/main/java/org/nuxeo/theme/elements/ElementFactory.java

    r28488 r28989  
    2626 
    2727    private ElementFactory() { 
    28         // This class is not supposed to be instanciated. 
     28        // This class is not supposed to be instantiated. 
    2929    } 
    3030 

  • org.nuxeo.theme/branches/5.1/nuxeo-theme-core/src/main/java/org/nuxeo/theme/elements/ElementFormatter.java

    r28488 r28989  
    3232 
    3333    private ElementFormatter() { 
    34         // This class is not supposed to be instanciated. 
     34        // This class is not supposed to be instantiated. 
    3535    } 
    3636 

  • org.nuxeo.theme/branches/5.1/nuxeo-theme-core/src/main/java/org/nuxeo/theme/elements/ElementRenderer.java

    r28488 r28989  
    4242 
    4343    private ElementRenderer() { 
    44         // This class is not supposed to be instanciated. 
     44        // This class is not supposed to be instantiated. 
    4545    } 
    4646 

  • org.nuxeo.theme/branches/5.1/nuxeo-theme-core/src/main/java/org/nuxeo/theme/formats/FormatFactory.java

    r20221 r28989  
    2525    private static final Log log = LogFactory.getLog(FormatFactory.class); 
    2626 
    27     // This class is not supposed to be instanciated. 
     27    // This class is not supposed to be instantiated. 
    2828    private FormatFactory() { 
    2929    } 

  • org.nuxeo.theme/branches/5.1/nuxeo-theme-jsf-editor/src/test/java/org/nuxeo/theme/test/jsf/editor/managers/TestUIManager.java

    r14608 r28989  
    2626    public void setUp() throws Exception { 
    2727        super.setUp(); 
    28         deploy("nxthemes-core-service.xml"); 
    29         deploy("nxthemes-core-contrib.xml"); 
    30         deploy("nxthemes-jsf-contrib.xml"); 
    31         deploy("fragment-config.xml"); 
     28        deployContrib("nxthemes-core-service.xml"); 
     29        deployContrib("nxthemes-core-contrib.xml"); 
     30        deployContrib("nxthemes-jsf-contrib.xml"); 
     31        deployContrib("fragment-config.xml"); 
    3232    } 
    3333