Changeset 28990
- Timestamp:
- 01/13/08 00:14:34 (11 months ago)
- Files:
-
- org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/utils/SerializableHelper.java (modified) (1 diff)
- org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/xmap/XMap.java (modified) (1 diff)
- org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/xmap/annotation/XContext.java (modified) (2 diffs)
- org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/repository/impl/DocumentProviderManager.java (modified) (2 diffs)
- org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector-test/src/test/java/org/nuxeo/ecm/core/jcr/search/TestSQLWithPath.java (modified) (3 diffs)
- org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRDocument.java (modified) (1 diff)
- org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/api/AbstractSession.java (modified) (1 diff)
- org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/security/MergedPermissionDescriptor.java (modified) (1 diff)
- org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/security/PermissionDescriptor.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-api/src/main/java/org/nuxeo/ecm/platform/api/DefaultJndiContextFactory.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-api/src/main/java/org/nuxeo/ecm/platform/api/DefaultServiceConnector.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-api/src/main/java/org/nuxeo/ecm/platform/api/ECM.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-audit-client/src/main/java/org/nuxeo/ecm/platform/audit/web/listener/ContentHistoryActions.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-audit-client/src/main/java/org/nuxeo/ecm/platform/audit/ws/api/WSAudit.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-cache-client/src/main/resources/OSGI-INF/platform-cacheable-server-contrib.xml (modified) (1 diff)
- 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-directory-facade/src/main/java/org/nuxeo/ecm/platform/directory/ejb/EJBExceptionHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-events-api/src/main/java/org/nuxeo/ecm/platform/events/api/RepositoryChangeEvent.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/LayoutRowTagHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/LayoutRowWidgetTagHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/WidgetTypeHandler.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-imaging-api/src/main/java/org/nuxeo/ecm/platform/imaging/api/ImagingService.java (modified) (3 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-imaging-transform/src/main/java/org/nuxeo/ecm/platform/imaging/transform/api/ImagingTransformPlugin.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationManager.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-notification-core/src/main/java/org/nuxeo/ecm/platform/ec/notification/ChannelNotificator.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-publishing/src/main/java/org/nuxeo/ecm/platform/publishing/rules/DefaultValidatorsRule.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/test/java/org/nuxeo/ecm/platform/relations/io/test/FakeDocument.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-jena-plugin/src/main/java/org/nuxeo/ecm/platform/relations/jena/JenaGraph.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-search/src/test/java/org/nuxeo/ecm/platform/relations/search/Constants.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-compass-plugin/src/main/java/org/nuxeo/ecm/core/search/backend/compass/CompassBackend.java (modified) (4 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-core/src/main/java/org/nuxeo/ecm/core/search/threading/IndexingThreadPool.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-test/src/main/java/org/nuxeo/ecm/core/search/backend/testing/FakeIndexableDocResourceConf.java (modified) (3 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-core/src/main/java/org/nuxeo/ecm/platform/transform/transformer/AbstractTransformer.java (modified) (3 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-plugins/src/test/java/org/nuxeo/ecm/platform/transform/AbstractPluginTestCase.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-url-api/src/main/java/org/nuxeo/ecm/platform/url/DocumentViewImpl.java (modified) (4 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-usermanager-api/src/test/java/org/nuxeo/ecm/platform/usermanager/TestNuxeoPrincipalImpl.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/theme/negotiation/LocalThemeConfig.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-api/src/main/java/org/nuxeo/ecm/platform/workflow/api/client/delegate/WAPIBusinessDelegate.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-api/src/main/java/org/nuxeo/ecm/platform/workflow/api/client/events/EventNames.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-workflow-api/src/main/java/org/nuxeo/ecm/platform/workflow/api/common/WrappedException.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ws/src/main/java/org/nuxeo/ecm/platform/api/ws/BaseNuxeoWebService.java (modified) (3 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ws/src/main/java/org/nuxeo/ecm/platform/api/ws/DocumentBlob.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ws/src/main/java/org/nuxeo/ecm/platform/api/ws/DocumentDescriptor.java (modified) (4 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ws/src/main/java/org/nuxeo/ecm/platform/api/ws/session/WSRemotingSessionServiceDelegate.java (modified) (1 diff)
- org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/ComponentManager.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/utils/SerializableHelper.java
r28516 r28990 59 59 60 60 /** 61 * Serialize and unserializeback an object to test whether it is correctly62 * rebuilt (to be used in unit tests as sanity checks) 61 * Serializes and unserializes back an object to test whether it is correctly 62 * rebuilt (to be used in unit tests as sanity checks). 63 63 * 64 64 * @param ob the actual object we want to test org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/xmap/XMap.java
r22678 r28990 486 486 member = new XAnnotatedContent(this, setter, (XContent) annotation); 487 487 } else if (type == XMemberAnnotation.CONTEXT) { 488 member = new XAnnotatedContext(this, setter, (XContext) annotation);488 member = new XAnnotatedContext(this, setter, (XContext) annotation); 489 489 } 490 490 return member; org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/xmap/annotation/XContext.java
r22678 r28990 26 26 27 27 /** 28 * Inject an execution context property28 * Injects an execution context property. 29 29 * 30 30 * @See 31 31 * @author <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a> 32 *33 32 */ 34 33 @XMemberAnnotation (XMemberAnnotation.CONTEXT) … … 38 37 39 38 /** 40 * The name of the execution context to inject 39 * The name of the execution context to inject. 41 40 * 42 41 * @return the node xpath org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/repository/impl/DocumentProviderManager.java
r28475 r28990 39 39 public class DocumentProviderManager extends DefaultComponent implements DocumentProvider { 40 40 41 private final Map<String, DocumentModel> cache = new Hashtable<String, DocumentModel>(); 42 private final Map<DocumentRef, String> refs = new Hashtable<DocumentRef, String>(); 43 41 44 private CoreSession session; 42 private Map<String, DocumentModel> cache = new Hashtable<String, DocumentModel>();43 private Map<DocumentRef, String> refs = new Hashtable<DocumentRef, String>();44 45 45 46 public void setSession(CoreSession session) { … … 56 57 57 58 public DocumentModel getCachedDocument(DocumentRef ref) { 58 String docId = null;59 String docId; 59 60 if (ref instanceof IdRef) { 60 61 docId = ((IdRef)ref).value; org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector-test/src/test/java/org/nuxeo/ecm/core/jcr/search/TestSQLWithPath.java
r27654 r28990 377 377 * @throws QueryException 378 378 */ 379 private void printResults(final QueryResult qr, final String logPrefix)379 private static void printResults(final QueryResult qr, final String logPrefix) 380 380 throws RepositoryException, QueryException { 381 381 while (qr.next()) { … … 387 387 final String str = getNodeDesc(doc.getNode(), "\n"); 388 388 log.info(logPrefix + '\n' + str + '\n'); 389 } else if (row instanceof DocumentModel) {390 log.info(logPrefix + '\n' + row + '\n');391 389 } else { 392 390 log.info(logPrefix + '\n' + row + '\n'); … … 403 401 * @throws RepositoryException 404 402 */ 403 @SuppressWarnings({"StringConcatenationInsideStringBufferAppend"}) 405 404 private static String getNodeDesc(Node node, final String sep) 406 405 throws RepositoryException { 407 406 PropertyIterator pi = node.getProperties(); 408 407 409 final StringBu ffer buf = new StringBuffer();408 final StringBuilder buf = new StringBuilder(); 410 409 411 410 buf.append("node path : " + node.getPath()); org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRDocument.java
r28926 r28990 272 272 assertIsFolder(); 273 273 try { 274 ModelAdapter.getContainerNode( getNode()).orderBefore(src, dest);274 ModelAdapter.getContainerNode(node).orderBefore(src, dest); 275 275 } catch (RepositoryException e) { 276 276 throw new DocumentException("Failed to reorder documents", e); org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/api/AbstractSession.java
r28926 r28990 2189 2189 ACP acp = new ACPImpl(); 2190 2190 2191 UserEntry ImpluserEntry = new UserEntryImpl(userOrGroupName);2191 UserEntry userEntry = new UserEntryImpl(userOrGroupName); 2192 2192 userEntry.addPrivilege(SecurityConstants.READ, true, false); 2193 2193 org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/security/MergedPermissionDescriptor.java
r28306 r28990 60 60 @Override 61 61 public String toString() { 62 return String.format("MergedPermission[%s]", getName());62 return String.format("MergedPermission[%s]", name); 63 63 } 64 64 org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/security/PermissionDescriptor.java
r28331 r28990 67 67 if (o instanceof PermissionDescriptor) { 68 68 PermissionDescriptor pd = (PermissionDescriptor) o; 69 if (!name.equals(pd. getName())) {69 if (!name.equals(pd.name)) { 70 70 return false; 71 71 } … … 87 87 @Override 88 88 public String toString() { 89 return String.format("PermissionDescriptor[%s]", getName());89 return String.format("PermissionDescriptor[%s]", name); 90 90 } 91 91 92 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-api/src/main/java/org/nuxeo/ecm/platform/api/DefaultJndiContextFactory.java
r21694 r28990 25 25 import javax.naming.NamingException; 26 26 27 import org.nuxeo.runtime.api.ServiceManagement;28 29 27 /** 30 28 * @author <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a> 31 * @deprecated use new service API {@link ServiceManagement}29 * @deprecated use new service API {@link org.nuxeo.runtime.api.ServiceManagement} 32 30 */ 33 31 @SuppressWarnings({"ALL"}) org.nuxeo.ecm.platform/trunk/nuxeo-platform-api/src/main/java/org/nuxeo/ecm/platform/api/DefaultServiceConnector.java
r21694 r28990 22 22 import javax.naming.NamingException; 23 23 24 import org.nuxeo.runtime.api.ServiceManagement;25 26 27 24 /** 28 25 * @author <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a> 29 * @deprecated use new service API {@link ServiceManagement}26 * @deprecated use new service API {@link org.nuxeo.runtime.api.ServiceManagement} 30 27 */ 31 28 @Deprecated org.nuxeo.ecm.platform/trunk/nuxeo-platform-api/src/main/java/org/nuxeo/ecm/platform/api/ECM.java
r21694 r28990 20 20 package org.nuxeo.ecm.platform.api; 21 21 22 import org.nuxeo.runtime.api.Framework;23 24 25 22 /** 26 23 * Main entry to ECM platform instance. … … 34 31 * @author <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a> 35 32 * 36 * @deprecated - you should use {@link Framework}33 * @deprecated - you should use {@link org.nuxeo.runtime.api.Framework} 37 34 */ 38 35 @SuppressWarnings({"ALL"}) org.nuxeo.ecm.platform/trunk/nuxeo-platform-audit-client/src/main/java/org/nuxeo/ecm/platform/audit/web/listener/ContentHistoryActions.java
r28475 r28990 55 55 * @throws AuditException 56 56 */ 57 List<LogEntry> computeLogEntries() throws AuditException;57 List<LogEntry> computeLogEntries() throws AuditException; 58 58 59 59 /** … … 64 64 * @throws AuditException 65 65 */ 66 List<LogEntry> computeLatestLogEntries() throws AuditException;66 List<LogEntry> computeLatestLogEntries() throws AuditException; 67 67 68 Map<Long, String> computeLogEntriesComments(); 68 69 69 Map<Long,String> computeLogEntriesComments(); 70 71 Map<Long,LinkedDocument> computeLogEntrieslinkedDocs(); 70 Map<Long, LinkedDocument> computeLogEntrieslinkedDocs(); 72 71 73 72 String doSearch() throws AuditException; org.nuxeo.ecm.platform/trunk/nuxeo-platform-audit-client/src/main/java/org/nuxeo/ecm/platform/audit/ws/api/WSAudit.java
r24990 r28990 36 36 * 37 37 * @param sessionId : the Nuxeo core session id. 38 * @para mdateRangeQuery : the date range query.38 * @paral dateRangeQuery : the date range query. 39 39 * @return a list of modified document descriptors. 40 40 * @throws AuditException org.nuxeo.ecm.platform/trunk/nuxeo-platform-cache-client/src/main/resources/OSGI-INF/platform-cacheable-server-contrib.xml
r24058 r28990 5 5 A cache manager binding. 6 6 7 @author <a href="mailto:dm@nuxeo.com">Dragos Mihalache</a> 7 @author 8 <a href="mailto:dm@nuxeo.com">Dragos Mihalache</a> 8 9 </documentation> 9 10 org.nuxeo.ecm.platform/trunk/nuxeo-platform-comment/src/main/java/org/nuxeo/ecm/platform/comment/impl/CommentManagerImpl.java
r28976 r28990 261 261 } 262 262 263 // TODO GR upgrade this code. It can't work if current user 264 // doesn't have admin rights 263 265 DocumentModel parent = mySession.getDocument(new PathRef(domainPath)); 264 266 for (String name : pathList) { org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-facade/src/main/java/org/nuxeo/ecm/platform/directory/ejb/EJBExceptionHandler.java
r28612 r28990 45 45 * @return 46 46 */ 47 @SuppressWarnings({"ThrowableInstanceNeverThrown"}) 47 48 public static DirectoryException wrapException(Throwable exception) { 48 DirectoryException clientException = null;49 DirectoryException clientException; 49 50 50 51 if (null == exception) { org.nuxeo.ecm.platform/trunk/nuxeo-platform-events-api/src/main/java/org/nuxeo/ecm/platform/events/api/RepositoryChangeEvent.java
r28475 r28990 28 28 public interface RepositoryChangeEvent extends NXCoreEvent { 29 29 30 static final int ADDED = 1; 31 static final int REMOVED = 2; 32 static final int UPDATED = 3; 33 static final int PERMISSIONS = 4; 34 static final int LOCK = 5; 35 static final int LIFECYCLE = 6; 30 int ADDED = 1; 31 int REMOVED = 2; 32 int UPDATED = 3; 33 int PERMISSIONS = 4; 34 int LOCK = 5; 36 35 37 36 int getType(); org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/LayoutRowTagHandler.java
r28496 r28990 43 43 * client. 44 44 * 45 * @see LayoutTagHandler#apply(FaceletContext, UIComponent, String) .45 * @see LayoutTagHandler#apply(FaceletContext, UIComponent, String) 46 46 * 47 47 * @author <a href="mailto:at@nuxeo.com">Anahide Tchertchian</a> org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/LayoutRowWidgetTagHandler.java
r28496 r28990 42 42 * Only works when used inside a tag using the {@link LayoutRowTagHandler}. 43 43 * 44 * @see LayoutTagHandler#apply(FaceletContext, UIComponent, String) .44 * @see LayoutTagHandler#apply(FaceletContext, UIComponent, String) 45 45 * 46 46 * @author <a href="mailto:at@nuxeo.com">Anahide Tchertchian</a> org.nuxeo.ecm.platform/trunk/nuxeo-platform-forms-layout-client/src/main/java/org/nuxeo/ecm/platform/forms/layout/facelets/WidgetTypeHandler.java
r26037 r28990 48 48 * @param subHandlers facelet handlers for sub widgets. 49 49 * @return a facelet handler. 50 * @throws WidgetException .50 * @throws WidgetException 51 51 */ 52 52 FaceletHandler getFaceletHandler(FaceletContext ctx, TagConfig tagConfig, org.nuxeo.ecm.platform/trunk/nuxeo-platform-imaging-api/src/main/java/org/nuxeo/ecm/platform/imaging/api/ImagingService.java
r25233 r28990 30 30 31 31 /** 32 * Resizes image. 33 * 32 * Resize image 34 33 * @param in 35 34 * @param width … … 40 39 41 40 /** 42 * Rotates image. 43 * 41 * Rotate image 44 42 * @param in 45 43 * @param angle … … 49 47 50 48 /** 51 * Retrieves metadata from an image. 52 * 49 * Retrieve metadata from an image 53 50 * @param in 54 51 * @return metadata 55 52 */ 56 53 Map<String, Object> getImageMetadata(InputStream in); 57 58 54 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-imaging-transform/src/main/java/org/nuxeo/ecm/platform/imaging/transform/api/ImagingTransformPlugin.java
r28475 r28990 25 25 public interface ImagingTransformPlugin { 26 26 27 String OPTION_OPERATION = "operation";27 static final String OPTION_OPERATION = "operation"; 28 28 29 /* Operations */30 String OPERATION_RESIZE = "resize";29 /** Operations */ 30 static final String OPERATION_RESIZE = "resize"; 31 31 32 String OPERATION_ROTATE = "rotate";32 static final String OPERATION_ROTATE = "rotate"; 33 33 34 /* Operation specific options */35 String OPTION_RESIZE_WIDTH = "width";34 /** Operation specific options */ 35 static final String OPTION_RESIZE_WIDTH = "width"; 36 36 37 String OPTION_RESIZE_HEIGHT = "height";37 static final String OPTION_RESIZE_HEIGHT = "height"; 38 38 39 String OPTION_ROTATE_ANGLE = "angle";39 static final String OPTION_ROTATE_ANGLE = "angle"; 40 40 41 41 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationManager.java
r28475 r28990 109 109 * in the map 110 110 * 111 * The map should contain at least the userName of the user calling the method 112 * stored under the key "author". 113 * 114 * infoMap should also contain all the variables that should be used to make-up 115 * the body of the notifications message. 116 * 111 117 * @param notificationName - name of notification 112 118 * @param infoMap - data used to compose the notification body … … 129 135 String freemarkerTemplateName, String subject, String comment, 130 136 NuxeoPrincipal sender, List<String> sendto); 131 132 137 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-notification-core/src/main/java/org/nuxeo/ecm/platform/ec/notification/ChannelNotificator.java
r22588 r28990 30 30 * 31 31 */ 32 // FIXME: this interface is never implemented. 32 33 public interface ChannelNotificator { 33 34 /** org.nuxeo.ecm.platform/trunk/nuxeo-platform-publishing/src/main/java/org/nuxeo/ecm/platform/publishing/rules/DefaultValidatorsRule.java
r28475 r28990 66 66 67 67 /*NXP-1822 Rux: instead of looking for users which have particularly EVERYTHING 68 * permission, collect the users which are allowe sto accept publishing: with at68 * permission, collect the users which are allowed to accept publishing: with at 69 69 * least WRITE permission 70 70 */ org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-io/src/test/java/org/nuxeo/ecm/platform/relations/io/test/FakeDocument.java
r28371 r28990 47 47 public class FakeDocument implements Document { 48 48 49 String uuid;49 final String uuid; 50 50 51 51 public FakeDocument(String uuid) { org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-jena-plugin/src/main/java/org/nuxeo/ecm/platform/relations/jena/JenaGraph.java
r28471 r28990 926 926 graph.enterCriticalSection(Lock.READ); 927 927 // dunno why base and lang are inverted here 928 929 // overcome com.hp.hpl.jena.rdf.model.impl.ModelCom impl bug - 928 // DM: overcome com.hp.hpl.jena.rdf.model.impl.ModelCom impl bug - 930 929 // closes the stream 931 930 // create a temporary stream org.nuxeo.ecm.platform/trunk/nuxeo-platform-relations-search/src/test/java/org/nuxeo/ecm/platform/relations/search/Constants.java
r28462 r28990 34 34 public static final String REPOSITORY_NAME = "unittest"; 35 35 36 private Constants() { 37 } 38 36 39 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-compass-plugin/src/main/java/org/nuxeo/ecm/core/search/backend/compass/CompassBackend.java
r27078 r28990 318 318 // sid can't be null using this API (interface contract) 319 319 String sid = ((IndexingThread) Thread.currentThread()).getSearchServiceSession().getSessionId(); 320 session = ( (CompassBackendSession) sessions.get(sid));320 session = (CompassBackendSession) sessions.get(sid); 321 321 322 322 // Session can be removed from the reference map by the jvm. … … 468 468 * For multiple properties, this will be actually one of the elements. 469 469 * Same for complex properties. 470 * </p>471 470 * <p> 472 471 * For non string properties, the implementation tries first to get the 473 472 * value through Compass and else falls back to java deserialization. 474 * </p> 475 */ 476 protected Serializable extractAtomicProperty(Property prop, String sValue, 473 */ 474 protected static Serializable extractAtomicProperty(Property prop, String sValue, 477 475 IndexableResourceDataConf dataConf) throws SearchException { 478 476 … … 508 506 // Fallback to generic serialization 509 507 try { 510 ObjectInputStream ois;511 508 byte[] buf = new sun.misc.BASE64Decoder().decodeBuffer(sValue); 512 ois = new ObjectInputStream(new ByteArrayInputStream(buf));509 ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(buf)); 513 510 return (Serializable) ois.readObject(); 514 511 } catch (IOException e) { … … 590 587 591 588 if (isComplex) { 592 propName = split[0] + ":"+ split[1];589 propName = split[0] + ':' + split[1]; 593 590 resultName = split[2]; 594 591 } org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-core/src/main/java/org/nuxeo/ecm/core/search/threading/IndexingThreadPool.java
r28475 r28990 21 21 22 22 import java.util.concurrent.LinkedBlockingQueue; 23 import java.util.concurrent.Semaphore; 23 24 import java.util.concurrent.ThreadPoolExecutor; 24 25 import java.util.concurrent.TimeUnit; org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-test/src/main/java/org/nuxeo/ecm/core/search/backend/testing/FakeIndexableDocResourceConf.java
r28516 r28990 37 37 public class FakeIndexableDocResourceConf implements IndexableResourceConf { 38 38 39 private static final String type = "schema"; 40 41 private static final Class klass = DocumentIndexableResourceImpl.class; 42 39 43 private static final long serialVersionUID = 1L; 40 44 … … 42 46 43 47 private final String prefix; 44 45 private static final String type = "schema";46 47 private static final Class klass = DocumentIndexableResourceImpl.class;48 48 49 49 public FakeIndexableDocResourceConf(String name, String prefix) { … … 80 80 81 81 try { 82 resource = (IndexableResource) getKlass().newInstance();82 resource = (IndexableResource) getKlass().newInstance(); 83 83 } catch (InstantiationException e) { 84 84 throw new IndexingException(e.getMessage()); org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-core/src/main/java/org/nuxeo/ecm/platform/transform/transformer/AbstractTransformer.java
r28509 r28990 191 191 192 192 /** 193 * Filter input transform document sources for a given plugin. 194 * 193 * Filters input transform document sources for a given plugin. 195 194 * <p> 196 195 * Note the discrimination is done plugin instance side. 197 * </p>198 196 * 199 * @param sources :transform documents instances.200 * @param plugin :a Nuxeo Transform Plugin instance.197 * @param sources transform documents instances. 198 * @param plugin a Nuxeo Transform Plugin instance. 201 199 * @return a filtered list of transform documents. 202 200 */ … … 213 211 214 212 /** 215 * Filter input blobs sources for a given plugin. 216 * 213 * Filters input blobs sources for a given plugin. 217 214 * <p> 218 215 * Note the discrimination is done plugin instance side. 219 * </p>220 216 * 221 * @param sources :Nuxeo Core blob instances.222 * @param plugin :a Nuxeo Transform Plugin instance.217 * @param blobs Nuxeo Core blob instances. 218 * @param plugin a Nuxeo Transform Plugin instance. 223 219 * @return a filtered list of blobs. 224 220 */ … … 234 230 235 231 /** 236 * Merge options from a given plugin with the ones the transformer defines237 * for this as overrid purpose plugin.232 * Merges options from a given plugin with the ones the transformer defines 233 * for this as overridden purpose plugin. 238 234 * 239 * @param plugin :a Nuxeo Transform plugin240 * @return a map from string to serializable.235 * @param plugin a Nuxeo Transform plugin 236 * @return a map from String to Serializable. 241 237 */ 242 238 protected Map<String, Serializable> mergeOptionsFor(Plugin plugin, org.nuxeo.ecm.platform/trunk/nuxeo-platform-transform-plugins/src/test/java/org/nuxeo/ecm/platform/transform/AbstractPluginTestCase.java
r28926 r28990 48 48 49 49 protected static File createTempFile(String extension) throws IOException { 50 File tempFile = File.createTempFile("document", "."+ extension);50 File tempFile = File.createTempFile("document", '.' + extension); 51 51 tempFile.deleteOnExit(); 52 52 return tempFile; org.nuxeo.ecm.platform/trunk/nuxeo-platform-url-api/src/main/java/org/nuxeo/ecm/platform/url/DocumentViewImpl.java
r24393 r28990 25 25 26 26 import org.nuxeo.ecm.core.api.DocumentModel; 27 import org.nuxeo.ecm.platform.types.adapter.TypeInfo;28 27 import org.nuxeo.ecm.platform.url.api.DocumentLocation; 29 28 import org.nuxeo.ecm.platform.url.api.DocumentView; 29 import org.nuxeo.ecm.platform.types.adapter.TypeInfo; <
