Changeset 28499
- Timestamp:
- 01/05/08 13:13:56 (1 year ago)
- Files:
-
- org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRDocumentProxy.java (modified) (1 diff)
- org.nuxeo.ecm.core/trunk/nuxeo-core-query/src/main/java/org/nuxeo/ecm/core/query/Query.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-audit-io/src/main/java/org/nuxeo/ecm/platform/audit/io/IOLogEntryBase.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-cache-server/src/test/java/org/nuxeo/ecm/platform/cache/server/TestSimpleServerCache.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-comment/src/main/java/org/nuxeo/ecm/platform/comment/impl/CommentManagerImpl.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/WidgetDefinition.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/DateTimeWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/DirectorySelectOneWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/FileWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/HtmlTextWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/IntWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/SecretWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/TextWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/TextareaWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/service/WebLayoutManagerImpl.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/test/java/org/nuxeo/ecm/platform/layout/facelets/TestWidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-io-api/src/main/java/org/nuxeo/ecm/platform/io/api/IOManager.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-io-core/src/test/java/org/nuxeo/ecm/platform/io/test/TestIORemoteCopy.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-io-core/src/test/java/org/nuxeo/ecm/platform/io/test/TestIORemoteCopy2.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-modifier/src/test/java/org/nuxeo/ecm/platform/modifier/AbstractPluginTestCase.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-modifier/src/test/java/org/nuxeo/ecm/platform/modifier/TestDocModifierService.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-modifier/src/test/java/org/nuxeo/ecm/platform/modifier/TestModifierOnDocModel.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/Notification.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-core/src/test/java/org/nuxeo/ecm/platform/relations/DummyResourceAdapter.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/main/java/org/nuxeo/ecm/platform/relations/io/IORelationAdapter.java (modified) (9 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/main/java/org/nuxeo/ecm/platform/relations/io/IORelationAdapterProperties.java (modified) (11 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/test/java/org/nuxeo/ecm/platform/relations/io/test/TestIORelationAdapter.java (modified) (4 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-api/src/main/java/org/nuxeo/ecm/platform/transform/timer/SimpleTimer.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-core/src/main/java/org/nuxeo/ecm/platform/transform/transformer/AbstractTransformer.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-plugins/src/main/java/org/nuxeo/ecm/platform/transform/plugin/pdfbox/impl/PDF2ImagePluginImpl.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-plugins/src/test/java/org/nuxeo/ecm/platform/transform/jooconverter/TestJOOoConverter2pdfService.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-types-facade/src/main/java/org/nuxeo/ecm/platform/types/ejb/TypeManagerLocal.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/auth/NuxeoAuthenticationFilter.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/ChainSelectListboxRenderer.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/ChainSelectMultiListboxRenderer.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/tag/fn/Functions.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-usermanager-api/src/main/java/org/nuxeo/ecm/platform/usermanager/UserManager.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-usermanager-core/src/main/java/org/nuxeo/ecm/platform/usermanager/UserManagerImpl.java (modified) (4 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/edit/lock/LockActions.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/search/SearchActions.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/search/SearchActionsBean.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-api/src/main/java/org/nuxeo/ecm/platform/workflow/api/client/wfmc/WMFilter.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-core/src/test/java/org/nuxeo/ecm/platform/workflow/TestWorkflowEventRegistration.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-core/src/test/java/org/nuxeo/ecm/platform/workflow/TestWorkflowService.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-document-facade/src/test/java/org/nuxeo/ecm/platform/workflow/document/ejb/TestWorkItemsListsBeanRemote.java (modified) (3 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-document/src/main/java/org/nuxeo/ecm/platform/workflow/document/service/WorkflowDocumentSecurityPolicyService.java (modified) (5 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-document/src/main/java/org/nuxeo/ecm/platform/workflow/document/service/WorkflowRulesService.java (modified) (2 diffs)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/main/java/org/nuxeo/theme/events/EventContext.java (modified) (1 diff)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/main/java/org/nuxeo/theme/negotiation/AbstractNegotiator.java (modified) (1 diff)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/main/java/org/nuxeo/theme/presets/PhotoshopPaletteParser.java (modified) (3 diffs)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/main/java/org/nuxeo/theme/protocol/nxtheme/Connection.java (modified) (1 diff)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/main/java/org/nuxeo/theme/rendering/RenderingInfo.java (modified) (1 diff)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/main/java/org/nuxeo/theme/themes/ThemeManager.java (modified) (6 diffs)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/test/java/org/nuxeo/theme/test/DummyHtml.java (modified) (1 diff)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/test/java/org/nuxeo/theme/test/DummyMenuItem.java (modified) (1 diff)
- org.nuxeo.theme/trunk/nuxeo-theme-core/src/test/java/org/nuxeo/theme/test/DummyObject.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRDocumentProxy.java
r28462 r28499 142 142 } 143 143 144 144 @Override 145 145 public void orderBefore(String src, String dest) throws DocumentException { 146 146 throw new UnsupportedOperationException("proxy docs are not folders"); org.nuxeo.ecm.core/trunk/nuxeo-core-query/src/main/java/org/nuxeo/ecm/core/query/Query.java
r19493 r28499 34 34 * <code>UnsupportedQueryTypeException</code> should be thrown. 35 35 */ 36 public staticenum Type {36 enum Type { 37 37 NXQL("NXQL"), XPATH("XPATH"); 38 38 org.nuxeo.ecm.platform/trunk/nuxeo-platform-audit-io/src/main/java/org/nuxeo/ecm/platform/audit/io/IOLogEntryBase.java
r28496 r28499 129 129 * 130 130 * @param logEntryElement 131 * @param logEntry132 131 */ 133 132 protected static LogEntry readLogEntry(Element logEntryElement) { org.nuxeo.ecm.platform/trunk/nuxeo-platform-cache-server/src/test/java/org/nuxeo/ecm/platform/cache/server/TestSimpleServerCache.java
r21687 r28499 48 48 private static final Log log = LogFactory.getLog(TestSimpleServerCache.class); 49 49 50 protected final String DOC_TYPE_FILE = "File";51 protected final String DOC_TYPE_FOLDER = "Folder";50 protected static final String DOC_TYPE_FILE = "File"; 51 protected static final String DOC_TYPE_FOLDER = "Folder"; 52 52 53 53 protected class SCHEMA_FILE { … … 341 341 } 342 342 343 private void assertEqualLists(List<String> expected, List<String> actual) {343 private static void assertEqualLists(List<String> expected, List<String> actual) { 344 344 int actualSize = actual.size(); 345 345 int i = 0; org.nuxeo.ecm.platform/trunk/nuxeo-platform-comment/src/main/java/org/nuxeo/ecm/platform/comment/impl/CommentManagerImpl.java
r28496 r28499 195 195 * @throws ClientException 196 196 */ 197 private String updateAuthor(DocumentModel docModel, DocumentModel comment)197 private static String updateAuthor(DocumentModel docModel, DocumentModel comment) 198 198 throws ClientException { 199 199 // update the author if not set org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-api/src/main/java/org/nuxeo/ecm/platform/forms/layout/api/WidgetDefinition.java
r28475 r28499 33 33 public interface WidgetDefinition extends Serializable { 34 34 35 static finalString RENDERED_PROPERTY_NAME = "rendered";35 String RENDERED_PROPERTY_NAME = "rendered"; 36 36 37 static finalString REQUIRED_PROPERTY_NAME = "required";37 String REQUIRED_PROPERTY_NAME = "required"; 38 38 39 39 /** org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/DateTimeWidgetTypeHandler.java
r28496 r28499 29 29 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 30 30 import org.nuxeo.ecm.platform.forms.layout.facelets.TagConfigFactory; 31 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;32 31 import org.nuxeo.ecm.platform.ui.web.component.date.UIInputDateTime; 33 32 org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/DirectorySelectOneWidgetTypeHandler.java
r28496 r28499 27 27 import org.nuxeo.ecm.platform.forms.layout.facelets.FaceletHandlerHelper; 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 29 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;30 29 import org.nuxeo.ecm.platform.ui.web.directory.DirectoryEntryOutputComponent; 31 30 import org.nuxeo.ecm.platform.ui.web.directory.SelectOneListboxComponent; org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/FileWidgetTypeHandler.java
r28496 r28499 27 27 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.ValueExpressionHelper; 29 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;30 29 import org.nuxeo.ecm.platform.ui.web.component.file.UIInputFile; 31 30 import org.nuxeo.ecm.platform.ui.web.component.file.UIOutputFile; org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/HtmlTextWidgetTypeHandler.java
r28496 r28499 27 27 import org.nuxeo.ecm.platform.forms.layout.facelets.FaceletHandlerHelper; 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 29 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;30 29 import org.nuxeo.ecm.platform.ui.web.component.editor.UIHtmlEditor; 31 30 org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/IntWidgetTypeHandler.java
r28496 r28499 30 30 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 31 31 import org.nuxeo.ecm.platform.forms.layout.facelets.TagConfigFactory; 32 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;33 32 34 33 import com.sun.facelets.FaceletContext; org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/SecretWidgetTypeHandler.java
r28496 r28499 27 27 import org.nuxeo.ecm.platform.forms.layout.facelets.FaceletHandlerHelper; 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 29 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;30 29 31 30 import com.sun.facelets.FaceletContext; org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/TextWidgetTypeHandler.java
r28496 r28499 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.FaceletHandlerHelper; 29 29 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 30 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;31 30 32 31 import com.sun.facelets.FaceletContext; org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/plugins/TextareaWidgetTypeHandler.java
r28496 r28499 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.FaceletHandlerHelper; 29 29 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 30 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;31 30 32 31 import com.sun.facelets.FaceletContext; org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/service/WebLayoutManagerImpl.java
r28496 r28499 254 254 * Evaluates an expression to a boolean value. 255 255 */ 256 private Boolean getBooleanValue(FaceletContext context, String expression) {256 private static Boolean getBooleanValue(FaceletContext context, String expression) { 257 257 Object value = evaluateExpression(context, expression); 258 258 if (value instanceof Boolean) { … … 269 269 * Evaluates an expression to a string value. 270 270 */ 271 private String getStringValue(FaceletContext context, String expression) {271 private static String getStringValue(FaceletContext context, String expression) { 272 272 Object value = evaluateExpression(context, expression); 273 273 if (value == null || value instanceof String) { org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/test/java/org/nuxeo/ecm/platform/layout/facelets/TestWidgetTypeHandler.java
r28496 r28499 28 28 import org.nuxeo.ecm.platform.forms.layout.facelets.FaceletHandlerHelper; 29 29 import org.nuxeo.ecm.platform.forms.layout.facelets.LeafFaceletHandler; 30 import org.nuxeo.ecm.platform.forms.layout.facelets.WidgetTypeHandler;31 30 import org.nuxeo.ecm.platform.forms.layout.facelets.plugins.AbstractWidgetTypeHandler; 32 31 org.nuxeo.ecm.platform/trunk/nuxeo-platform-io-api/src/main/java/org/nuxeo/ecm/platform/io/api/IOManager.java
r28475 r28499 40 40 public interface IOManager extends Serializable { 41 41 42 static finalString DOCUMENTS_ADAPTER_NAME = "documents";42 String DOCUMENTS_ADAPTER_NAME = "documents"; 43 43 44 44 /** org.nuxeo.ecm.platform/trunk/nuxeo-platform-io-core/src/test/java/org/nuxeo/ecm/platform/io/test/TestIORemoteCopy.java
r28479 r28499 64 64 private static final Log log = LogFactory.getLog(TestIORemoteCopy.class); 65 65 66 CoreSession coreSession; 67 68 protected DocumentModel root; 69 70 protected DocumentModel parent; 71 72 protected DocumentModel child; 73 74 final String localRepositoryName = "demo"; 66 protected static final String localRepositoryName = "demo"; 75 67 76 68 // used with 5.1.x 77 69 // String STREAM_SERVER_URL = "socket://localhost:3233"; 78 70 // used with 5.2.x 79 String STREAM_SERVER_URL = "socket://localhost:62474"; 80 81 IOManager ioService; 71 protected static final String STREAM_SERVER_URL = "socket://localhost:62474"; 72 73 protected CoreSession coreSession; 74 75 protected DocumentModel root; 76 protected DocumentModel parent; 77 protected DocumentModel child; 78 79 protected IOManager ioService; 82 80 83 81 @Override org.nuxeo.ecm.platform/trunk/nuxeo-platform-io-core/src/test/java/org/nuxeo/ecm/platform/io/test/TestIORemoteCopy2.java
r28479 r28499 57 57 private static final Log log = LogFactory.getLog(TestIORemoteCopy2.class); 58 58 59 CoreSession coreSession1; 60 61 CoreSession coreSession2; 62 63 protected DocumentModel root; 64 65 protected DocumentModel testRoot; 66 67 protected DocumentModel parent; 68 69 protected DocumentModel child; 70 protected DocumentModel child2; 71 72 String repositoryName1 = "default"; 73 74 String repositoryName2 = "default"; 59 protected static final String repositoryName1 = "default"; 60 61 protected static final String repositoryName2 = "default"; 75 62 76 63 // used with 5.1.x 77 64 // String STREAM_SERVER_URL = "socket://localhost:3233"; 78 65 // used with 5.2.x 79 final String STREAM_SERVER_URL = "socket://localhost:62474"; 80 81 IOManager ioService; 82 83 IOManager remoteIOManager; 66 protected static final String STREAM_SERVER_URL = "socket://localhost:62474"; 67 68 protected CoreSession coreSession1; 69 protected CoreSession coreSession2; 70 71 protected DocumentModel root; 72 protected DocumentModel testRoot; 73 protected DocumentModel parent; 74 protected DocumentModel child; 75 protected DocumentModel child2; 76 77 protected IOManager ioService; 78 protected IOManager remoteIOManager; 79 80 protected DocumentRef srcDocId; 81 protected DocumentRef dstDocId; 82 protected String destServerAddress; 84 83 85 84 @Override … … 174 173 coreSession.save(); 175 174 } 176 177 DocumentRef srcDocId;178 DocumentRef dstDocId;179 String destServerAddress;180 175 181 176 // this is using documents created by this test org.nuxeo.ecm.platform/trunk/nuxeo-platform-modifier/src/test/java/org/nuxeo/ecm/platform/modifier/AbstractPluginTestCase.java
r28496 r28499 61 61 } 62 62 63 @Override 63 64 public Repository getRepository() throws Exception { 64 65 if (repository == null) { … … 88 89 try { 89 90 final byte[] fileContent = FileUtils.readBytes(file); 90 91 ByteArrayBlob docContent = new ByteArrayBlob(fileContent, 92 "application/msword"); 93 94 return docContent; 91 return new ByteArrayBlob(fileContent, "application/msword"); 95 92 } catch (IOException e) { 96 93 log.error("Error reading file: " + file.getAbsolutePath()); org.nuxeo.ecm.platform/trunk/nuxeo-platform-modifier/src/test/java/org/nuxeo/ecm/platform/modifier/TestDocModifierService.java
r24551 r28499 63 63 private Transformer transformer; 64 64 65 private final String docPath_wordML = "src/test/resources/data/wordml/hello-simple.xml";65 private static final String docPath_wordML = "src/test/resources/data/wordml/hello-simple.xml"; 66 66 67 67 @Override org.nuxeo.ecm.platform/trunk/nuxeo-platform-modifier/src/test/java/org/nuxeo/ecm/platform/modifier/TestModifierOnDocModel.java
r28475 r28499 49 49 public class TestModifierOnDocModel extends AbstractPluginTestCase { 50 50 51 final Log log = LogFactory.getLog(TestModifierOnDocModel.class);51 private static final Log log = LogFactory.getLog(TestModifierOnDocModel.class); 52 52 53 53 private Session session; … … 59 59 private Transformer transformer; 60 60 61 private final String docPath_MSWORD = "test/resources/data/SampleDoc.doc";61 private static final String docPath_MSWORD = "test/resources/data/SampleDoc.doc"; 62 62 63 private final String docPath_wordML = "src/test/resources/data/wordml/descr04_appro.xml";63 private static final String docPath_wordML = "src/test/resources/data/wordml/descr04_appro.xml"; 64 64 65 65 @Override org.nuxeo.ecm.platform/trunk/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/Notification.java
r28475 r28499 24 24 public interface Notification extends Serializable { 25 25 26 static finalString EMAIL_NOTIFICATION = "email";26 String EMAIL_NOTIFICATION = "email"; 27 27 28 28 /** … … 58 58 String getLabel(); 59 59 60 boolean equals(Object obj);61 62 int hashCode();63 64 60 Boolean getEnabled(); 65 61 org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-core/src/test/java/org/nuxeo/ecm/platform/relations/DummyResourceAdapter.java
r22121 r28499 43 43 } 44 44 45 @Override 45 46 public Class<?> getKlass() { 46 47 return DummyResourceLike.class; org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/main/java/org/nuxeo/ecm/platform/relations/io/IORelationAdapter.java
r26168 r28499 241 241 * account. 242 242 */ 243 @Override 243 244 public IOResources extractResources(String repo, 244 245 Collection<DocumentRef> sources) { … … 260 261 } 261 262 Map<DocumentRef, Set<Resource>> docResources = new HashMap<DocumentRef, Set<Resource>>(); 262 DocumentModel doc;263 263 Set<Resource> emptySet = Collections.emptySet(); 264 264 List<Statement> statements = new ArrayList<Statement>(); … … 266 266 for (DocumentRef docRef : sources) { 267 267 try { 268 doc = session.getDocument(docRef);268 DocumentModel doc = session.getDocument(docRef); 269 269 Set<Resource> resources = relManager.getAllResources(doc); 270 270 docResources.put(docRef, resources); … … 347 347 } 348 348 349 @Override 349 350 public IOResources loadResourcesFromXML(InputStream in) { 350 351 try { … … 381 382 } 382 383 384 @Override 383 385 public void storeResources(IOResources resources) { 384 386 if (!(resources instanceof IORelationResources)) { … … 407 409 } 408 410 409 protected Statement updateDate(Statement statement, Literal newDate,411 protected static Statement updateDate(Statement statement, Literal newDate, 410 412 List<Resource> properties) { 411 413 for (Resource property : properties) { … … 418 420 } 419 421 422 @Override 420 423 public IOResources translateResources(String repo, IOResources resources, 421 424 DocumentTranslationMap map) { … … 432 435 namespaces, relResources.getStatements()); 433 436 Graph graph = graphHelper.getGraph(); 434 Statement pattern;435 437 RelationManager relManager = getRelationManager(); 436 438 CoreSession session = getCoreSession(repo); … … 453 455 continue; 454 456 } 455 pattern = new StatementImpl(resource, null, null);457 Statement pattern = new StatementImpl(resource, null, null); 456 458 List<Statement> outgoing = graph.getStatements(pattern); 457 459 pattern = new StatementImpl(null, null, resource); org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/main/java/org/nuxeo/ecm/platform/relations/io/IORelationAdapterProperties.java
r28475 r28499 27 27 * @author <a href="mailto:at@nuxeo.com">Anahide Tchertchian</a> 28 28 */ 29 public interfaceIORelationAdapterProperties {29 public class IORelationAdapterProperties { 30 30 31 31 /** 32 32 * Property representing the graph name where relations should be extracted. 33 33 */ 34 static final String GRAPH = "graph";34 public static final String GRAPH = "graph"; 35 35 36 36 /** … … 39 39 * Defaults to the graph property value. 40 40 */ 41 static final String IMPORT_GRAPH = "import-graph";41 public static final String IMPORT_GRAPH = "import-graph"; 42 42 43 43 /** … … 50 50 * Default value: false. 51 51 */ 52 static final String IGNORE_EXTERNAL = "ignore-external";52 public static final String IGNORE_EXTERNAL = "ignore-external"; 53 53 54 54 /** … … 58 58 * Default value: false. 59 59 */ 60 static final String IGNORE_LITERALS = "ignore-literals";60 public static final String IGNORE_LITERALS = "ignore-literals"; 61 61 62 62 /** … … 67 67 * Default value: false. 68 68 */ 69 static final String IGNORE_SIMPLE_RESOURCES = "ignore-simple-resources";69 public static final String IGNORE_SIMPLE_RESOURCES = "ignore-simple-resources"; 70 70 71 71 /** … … 75 75 * list will not be kept. 76 76 */ 77 static final String FILTER_PREDICATES = "filter-predicates";77 public static final String FILTER_PREDICATES = "filter-predicates"; 78 78 79 79 /** … … 83 83 * will not be kept. 84 84 */ 85 static final String IGNORE_PREDICATES = "ignore-predicates";85 public static final String IGNORE_PREDICATES = "ignore-predicates"; 86 86 87 87 /** … … 91 91 * which is not on this list will not be kept. 92 92 */ 93 static final String FILTER_METADATA = "filter-metatada";93 public static final String FILTER_METADATA = "filter-metatada"; 94 94 95 95 /** … … 99 99 * which is on this list will not be kept. 100 100 */ 101 static final String IGNORE_METADATA = "ignore-metatada";101 public static final String IGNORE_METADATA = "ignore-metatada"; 102 102 103 103 /** … … 107 107 * Default value: false. 108 108 */ 109 static final String IGNORE_ALL_METADATA = "ignore-all-metatada";109 public static final String IGNORE_ALL_METADATA = "ignore-all-metatada"; 110 110 111 111 /** … … 117 117 * Current date is set as a literal as described in {@link RelationDate} 118 118 */ 119 static final String UPDATE_DATE_METADATA = "update-date-metatada"; 119 public static final String UPDATE_DATE_METADATA = "update-date-metatada"; 120 121 // Constant utility class. 122 private IORelationAdapterProperties() { 123 } 120 124 121 125 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/test/java/org/nuxeo/ecm/platform/relations/io/test/TestIORelationAdapter.java
r28454 r28499 109 109 private JenaGraph graph; 110 110 111 @Override 111 112 public void setUp() throws Exception { 112 113 super.setUp(); … … 121 122 deploy("io-relations-test-contrib.xml"); 122 123 deploy("jena-test-bundle.xml"); 123 ioService = (IOManager)Framework.getService(IOManager.class);124 ioService = Framework.getService(IOManager.class); 124 125 assertNotNull(ioService); 125 126 assertNotNull(ioService); 126 rService = (RelationService)Framework.getService(RelationManager.class);127 rService = Framework.getService(RelationManager.class); 127 128 Graph graph = rService.getGraphByName(graphName); 128 129 assertNotNull(graph); … … 131 132 } 132 133 134 @Override 133 135 public void tearDown() throws Exception { 134 136 if (graph != null) { … … 165 167 } 166 168 167 private void compareGraph(String filePath, Graph graph) throws Exception {169 private static void compareGraph(String filePath, Graph graph) throws Exception { 168 170 Graph newGraph = getMemoryGraph(); 169 171 feedGraph(filePath, newGraph); org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-api/src/main/java/org/nuxeo/ecm/platform/transform/timer/SimpleTimer.java
r28475 r28499 85 85 } 86 86 87 @Override 87 88 public String toString() { 88 89 try { org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-core/src/main/java/org/nuxeo/ecm/platform/transform/transformer/AbstractTransformer.java
r28492 r28499 50 50 public abstract class AbstractTransformer implements Transformer { 51 51 52 protected static final Log log = LogFactory.getLog(AbstractTransformer.class); 52 private static final long serialVersionUID = 6646610808363319901L; 53 54 private static final Log log = LogFactory.getLog(AbstractTransformer.class); 53 55 54 56 protected String name; … … 113 115 } 114 116 } 115 116 117 return chain; 117 118 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-plugins/src/main/java/org/nuxeo/ecm/platform/transform/plugin/pdfbox/impl/PDF2ImagePluginImpl.java
r25115
