Changeset 28513
- Timestamp:
- 01/06/08 13:02:43 (1 year ago)
- Files:
-
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-actions-core/src/main/java/org/nuxeo/ecm/platform/actions/Action.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-facade/src/test/java/org/nuxeo/ecm/core/search/ejb/TestSearchService.java (modified) (1 diff)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/rest/RestHelper.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform-usermanager-core/src/main/java/org/nuxeo/ecm/platform/usermanager/UserManagerImpl.java (modified) (2 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform/src/main/java/org/nuxeo/ecm/platform/util/ECInvalidParameterException.java (modified) (4 diffs)
- org.nuxeo.ecm.platform/trunk/nuxeo-platform/src/main/java/org/nuxeo/ecm/platform/util/LocationManagerPlugin.java (modified) (1 diff)
- org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/ComponentInstanceImpl.java (modified) (1 diff)
- org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/ComponentManagerImpl.java (modified) (3 diffs)
- org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/DefaultRuntimeContext.java (modified) (1 diff)
- org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/ExtensionPointImpl.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
org.nuxeo.ecm.platform/trunk/nuxeo-platform-actions-core/src/main/java/org/nuxeo/ecm/platform/actions/Action.java
r25224 r28513 212 212 } 213 213 214 public void setId(String id) {215 this.id = id;216 }217 218 214 public Class[] getLinkParams() { 219 215 return linkParams; org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-facade/src/test/java/org/nuxeo/ecm/core/search/ejb/TestSearchService.java
r20877 r28513 33 33 public class TestSearchService extends NXRuntimeTestCase { 34 34 35 private SearchService service;36 37 35 @Override 38 36 public void setUp() throws Exception { 39 37 super.setUp(); 40 deploy ("PlatformService.xml");41 deploy ("nxsearch-framework.xml");42 deploy ("nxsearch-contrib.xml");43 deploy ("nxsearch-platform-contrib.xml");38 deployContrib("PlatformService.xml"); 39 deployContrib("nxsearch-framework.xml"); 40 deployContrib("nxsearch-contrib.xml"); 41 deployContrib("nxsearch-platform-contrib.xml"); 44 42 45 service = NXSearch.getSearchService();43 SearchService service = NXSearch.getSearchService(); 46 44 assertNotNull(service); 47 45 } 48 46 49 47 public void testPlatformServiceRegistration() { 50 RuntimeService runtime = Framework.getRuntime();48 //RuntimeService runtime = Framework.getRuntime(); 51 49 SearchService service = runtime.getService(SearchService.class); 52 50 assertNotNull(service); org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/rest/RestHelper.java
r26688 r28513 72 72 protected transient CoreSession documentManager; 73 73 74 private String currentTab;75 76 74 private DocumentView docView; 77 75 … … 106 104 public void setCurrentTab(String currentTab) { 107 105 log.debug("setting curentTab from URL:" + currentTab); 108 this.currentTab = currentTab;109 106 } 110 107 org.nuxeo.ecm.platform/trunk/nuxeo-platform-usermanager-core/src/main/java/org/nuxeo/ecm/platform/usermanager/UserManagerImpl.java
r28499 r28513 97 97 private String userSortField; 98 98 99 @SuppressWarnings("unused")100 private String groupSortField;101 102 99 private String userListingMode; 103 100 … … 892 889 893 890 public void setGroupSortField(String sortField) { 894 groupSortField = sortField;895 891 } 896 892 org.nuxeo.ecm.platform/trunk/nuxeo-platform/src/main/java/org/nuxeo/ecm/platform/util/ECInvalidParameterException.java
r19005 r28513 31 31 32 32 public ECInvalidParameterException() { 33 super();34 // TODO Auto-generated constructor stub35 33 } 36 34 … … 40 38 public ECInvalidParameterException(String message) { 41 39 super(message); 42 // TODO Auto-generated constructor stub43 40 } 44 41 … … 49 46 public ECInvalidParameterException(String message, Throwable cause) { 50 47 super(message, cause); 51 // TODO Auto-generated constructor stub52 48 } 53 49 … … 57 53 public ECInvalidParameterException(Throwable cause) { 58 54 super(cause); 59 // TODO Auto-generated constructor stub60 55 } 61 56 org.nuxeo.ecm.platform/trunk/nuxeo-platform/src/main/java/org/nuxeo/ecm/platform/util/LocationManagerPlugin.java
r20648 r28513 24 24 * 25 25 */ 26 // TODO: not used. Remove?27 26 public class LocationManagerPlugin { 28 27 org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/ComponentInstanceImpl.java
r28179 r28513 82 82 } else { 83 83 // TODO: load class only once when creating the reshgitration info 84 instance = ri.context.loadClass(ri.implementation) 85 .newInstance(); 84 instance = ri.context.loadClass(ri.implementation).newInstance(); 86 85 } 87 86 } org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/ComponentManagerImpl.java
r25934 r28513 108 108 } 109 109 110 111 110 public synchronized void shutdown() { 112 111 // unregister me -> this will unregister all objects that depends on me … … 247 246 log.error("Failed to unregister component: " + ri.getName(), e); 248 247 } 249 250 248 } 251 249 … … 376 374 } 377 375 378 public void loadContributions(RegistrationInfoImpl ri, Extension xt) {376 public static void loadContributions(RegistrationInfoImpl ri, Extension xt) { 379 377 ExtensionPointImpl xp = ri.getExtensionPoint(xt.getExtensionPoint()); 380 378 if (xp != null && xp.contributions != null) { org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/DefaultRuntimeContext.java
r24983 r28513 73 73 return Thread.currentThread().getContextClassLoader().getResource(name); 74 74 } 75 76 75 77 76 public Class loadClass(String className) throws ClassNotFoundException { org.nuxeo.runtime/trunk/nuxeo-runtime/src/main/java/org/nuxeo/runtime/model/impl/ExtensionPointImpl.java
r16046 r28513 81 81 } 82 82 } 83 Object[] contribs = xmap.loadAll(new XMapContext(extension.getContext()), extension.getElement()); 83 Object[] contribs = xmap.loadAll( 84 new XMapContext(extension.getContext()), 85 extension.getElement()); 84 86 extension.setContributions(contribs); 85 87 return contribs;
