Merged V3.0 to HEAD

12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-01-16 14:20:15 +00:00
parent 97a73fcc00
commit e4dae16f8c
15 changed files with 159 additions and 57 deletions

View File

@@ -36,8 +36,6 @@ import org.alfresco.service.namespace.NamespaceService;
*/
public class DictionaryNamespaceComponent implements NamespaceService
{
private static final long serialVersionUID = -3774701459465102431L;
/**
* Namespace DAO
*/
@@ -109,5 +107,4 @@ public class DictionaryNamespaceComponent implements NamespaceService
// TODO:
throw new UnsupportedOperationException();
}
}

View File

@@ -36,7 +36,6 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
*/
public interface NamespaceDAO extends NamespacePrefixResolver
{
/**
* Add a namespace URI
*

View File

@@ -48,8 +48,6 @@ public class NamespaceDAOImpl implements NamespaceDAO
{
private static final Log logger = LogFactory.getLog(NamespaceDAOImpl.class);
private static final long serialVersionUID = -1085431310721591548L;
/**
* Lock objects
*/
@@ -63,6 +61,7 @@ public class NamespaceDAOImpl implements NamespaceDAO
// Dependencies
private TenantService tenantService;
private DictionaryDAO dictionaryDAO;
public void setTenantService(TenantService tenantService)
@@ -80,9 +79,6 @@ public class NamespaceDAOImpl implements NamespaceDAO
this.prefixesCache = prefixesCache;
}
private DictionaryDAO dictionaryDAO;
public void registerDictionary(DictionaryDAO dictionaryDAO)
{
this.dictionaryDAO = dictionaryDAO;