Merged V2.2 to HEAD

8372: Merged V2.1 to V2.2
      8314: Merged V2.0 to V2.1
         7750: Fix for ACT-475: ContentStoreCleaner causes OutOfMemoryError
      8332: Made content URL column larger to accommodate the extra locale info present in 2.1
      8334: Build fix: V2.1 tighter on authentication for getTempWriter
   8376: Merged V2.1 to V2.2
      8325: Fix for AWC-1089
      8361: Workaround for WCM-882: All metadata extracters can now handle zero length files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-11 06:22:28 +00:00
parent ceed05d26f
commit cda4e6105f
33 changed files with 1102 additions and 246 deletions

View File

@@ -0,0 +1,49 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.domain;
/**
* Interface for persistent <b>Content URL</b> objects.
* <p>
* Instances represent physically stored content.
*
* @author Derek Hulley
* @since 2.0
*/
public interface ContentUrl
{
/**
* @return Returns the auto-generated ID
*/
Long getId();
String getContentUrl();
void setContentUrl(String contentUrl);
//
// boolean isOrphaned();
//
// void setOrphaned(boolean orphaned);
}

View File

@@ -0,0 +1,73 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing */
package org.alfresco.repo.domain;
import java.util.Set;
/**
* Abstraction for manipulating <b>Content URL</b> entities.
*
* @author Derek Hulley
* @since 2.0
*/
public interface ContentUrlDAO
{
/**
* Create a new <b>Content URL</b> or get an existing instance.
*/
ContentUrl createContentUrl(String contentUrl);
/**
* Enumerate all the available <b>Content URLs</b>, calling back to the given handler.
*
* @param handler the component that will be called with each URL
*/
void getAllContentUrls(ContentUrlHandler handler);
/**
* Delete the <b>Content URL</b>.
*/
void deleteContentUrl(String contentUrl);
/**
* Delete a set of <b>Content URL</b>.
*/
void deleteContentUrls(Set<String> contentUrls);
/**
* Delete all <b>Content URL</b> entities.
*/
void deleteAllContentUrls();
/**
* A callback interface to handle <b>Content URLS<b> produced by iteration.
*
* @author Derek Hulley
* @since 2.0
*/
public interface ContentUrlHandler
{
void handle(String contentUrl);
};
}

View File

@@ -0,0 +1,212 @@
package org.alfresco.repo.domain;
import java.util.HashSet;
import java.util.Set;
import javax.transaction.UserTransaction;
import junit.framework.TestCase;
import org.alfresco.repo.content.filestore.FileContentStore;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.springframework.context.ApplicationContext;
/**
* @see org.alfresco.repo.domain.ContentUrlDAO
*
* @author Derek Hulley
* @since 2.1
*/
public class ContentUrlDAOTest extends TestCase
{
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private ContentUrlDAO dao;
private TransactionService transactionService;
private ContentService contentService;
@Override
protected void setUp() throws Exception
{
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
dao = (ContentUrlDAO) ctx.getBean("contentUrlDAO");
contentService = serviceRegistry.getContentService();
transactionService = serviceRegistry.getTransactionService();
}
@Override
protected void tearDown() throws Exception
{
}
public void testCreateContentUrl() throws Throwable
{
UserTransaction txn = transactionService.getUserTransaction();
try
{
txn.begin();
RunAsWork<String> getTempWriterWork = new RunAsWork<String>()
{
public String doWork() throws Exception
{
return contentService.getTempWriter().getContentUrl();
}
};
String contentUrl = AuthenticationUtil.runAs(getTempWriterWork, AuthenticationUtil.SYSTEM_USER_NAME);
// Make sure that it can be written in duplicate
ContentUrl entity1 = dao.createContentUrl(contentUrl);
ContentUrl entity2 = dao.createContentUrl(contentUrl);
assertNotSame("Assigned IDs must be new", entity1.getId(), entity2.getId());
txn.commit();
}
catch (Throwable e)
{
try { txn.rollback(); } catch (Throwable ee) {}
throw e;
}
}
private Set<String> makeUrls(int count) throws Throwable
{
final Set<String> urls = new HashSet<String>(count);
for (int i = 0; i < count; i++)
{
String contentUrl = String.format("%s%s/%04d", FileContentStore.STORE_PROTOCOL, getName(), i);
dao.createContentUrl(contentUrl);
urls.add(contentUrl);
}
return urls;
}
public void testGetAllContentUrls() throws Throwable
{
UserTransaction txn = transactionService.getUserTransaction();
try
{
txn.begin();
final Set<String> urls = makeUrls(1000);
// Now iterate over them in the same transaction
ContentUrlDAO.ContentUrlHandler handler = new ContentUrlDAO.ContentUrlHandler()
{
public void handle(String contentUrl)
{
urls.remove(contentUrl);
}
};
dao.getAllContentUrls(handler);
assertEquals("Not all content URLs were enumerated", 0, urls.size());
txn.commit();
}
catch (Throwable e)
{
try { txn.rollback(); } catch (Throwable ee) {}
throw e;
}
}
public void testDeleteContentUrl() throws Throwable
{
UserTransaction txn = transactionService.getUserTransaction();
try
{
txn.begin();
final Set<String> urls = makeUrls(1000);
// Delete them
for (String url : urls)
{
dao.deleteContentUrl(url);
}
// Now iterate over them in the same transaction
ContentUrlDAO.ContentUrlHandler handler = new ContentUrlDAO.ContentUrlHandler()
{
public void handle(String contentUrl)
{
urls.remove(contentUrl);
}
};
dao.getAllContentUrls(handler);
// All the URLs previously deleted will not have been removed from the Set
assertEquals("Specific content URLs were not deleted", 1000, urls.size());
txn.commit();
}
catch (Throwable e)
{
try { txn.rollback(); } catch (Throwable ee) {}
throw e;
}
}
public void testDeleteContentUrls() throws Throwable
{
UserTransaction txn = transactionService.getUserTransaction();
try
{
txn.begin();
final Set<String> urls = makeUrls(1000);
// Delete them
dao.deleteContentUrls(urls);
// Now iterate over them in the same transaction
ContentUrlDAO.ContentUrlHandler handler = new ContentUrlDAO.ContentUrlHandler()
{
public void handle(String contentUrl)
{
urls.remove(contentUrl);
}
};
dao.getAllContentUrls(handler);
// All the URLs previously deleted will not have been removed from the Set
assertEquals("Specific content URLs were not deleted", 1000, urls.size());
txn.commit();
}
catch (Throwable e)
{
try { txn.rollback(); } catch (Throwable ee) {}
throw e;
}
}
public void testDeleteAllContentUrls() throws Throwable
{
UserTransaction txn = transactionService.getUserTransaction();
try
{
txn.begin();
makeUrls(1000);
// Delete them
dao.deleteAllContentUrls();
// Check that there are none left
// Now iterate over them in the same transaction
ContentUrlDAO.ContentUrlHandler handler = new ContentUrlDAO.ContentUrlHandler()
{
public void handle(String contentUrl)
{
fail("There should not be any URLs remaining.");
}
};
dao.getAllContentUrls(handler);
txn.commit();
}
catch (Throwable e)
{
try { txn.rollback(); } catch (Throwable ee) {}
throw e;
}
}
}

View File

@@ -0,0 +1,56 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE hibernate-mapping PUBLIC
'-//Hibernate/Hibernate Mapping DTD 3.0//EN'
'http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd'>
<hibernate-mapping>
<class
name="org.alfresco.repo.domain.hibernate.ContentUrlImpl"
proxy="org.alfresco.repo.domain.ContentUrl"
table="alf_content_url"
dynamic-update="false"
dynamic-insert="false"
select-before-update="false"
optimistic-lock="none" >
<!-- auto-generated ID -->
<id name="id" column="id" type="long" >
<generator class="increment" />
</id>
<property name="contentUrl" column="content_url" type="string" length="240" not-null="true" index="idx_alf_con_urls" />
<!--
<property name="isOrphaned" column="is_orphaned" type="boolean" not-null="true" />
-->
</class>
<query name="contentUrl.GetAll">
select
entity.contentUrl
from
org.alfresco.repo.domain.hibernate.ContentUrlImpl entity
</query>
<query name="contentUrl.DeleteInList">
delete
from
org.alfresco.repo.domain.hibernate.ContentUrlImpl entity
where
entity.contentUrl in (:contentUrls)
</query>
<query name="contentUrl.DeleteByUrl">
delete
from
org.alfresco.repo.domain.hibernate.ContentUrlImpl entity
where
entity.contentUrl = :contentUrl
</query>
<query name="contentUrl.DeleteAll">
delete
from
org.alfresco.repo.domain.hibernate.ContentUrlImpl entity
</query>
</hibernate-mapping>

View File

@@ -0,0 +1,86 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.domain.hibernate;
import java.io.Serializable;
import org.alfresco.repo.domain.ContentUrl;
/**
* Bean containing all the persistence data representing a <b>Content Url</b>.
* <p>
* This implementation of the {@link org.alfresco.repo.domain.Node Node} interface is
* Hibernate specific.
*
* @author Derek Hulley
* @since 2.0
*/
public class ContentUrlImpl extends LifecycleAdapter implements ContentUrl, Serializable
{
private static final long serialVersionUID = -7368859912728834288L;
private Long id;
private String contentUrl;
// private boolean isOrphaned;
public ContentUrlImpl()
{
// isOrphaned = false;
}
public Long getId()
{
return id;
}
/**
* For Hibernate Use
*/
@SuppressWarnings("unused")
private void setId(Long id)
{
this.id = id;
}
public String getContentUrl()
{
return contentUrl;
}
public void setContentUrl(String contentUrl)
{
this.contentUrl = contentUrl;
}
//
// public boolean isOrphaned()
// {
// return isOrphaned;
// }
//
// public void setOrphaned(boolean isOrphaned)
// {
// this.isOrphaned = isOrphaned;
// }
}

View File

@@ -0,0 +1,123 @@
package org.alfresco.repo.domain.hibernate;
import java.util.Set;
import org.alfresco.repo.domain.ContentUrl;
import org.alfresco.repo.domain.ContentUrlDAO;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.CacheMode;
import org.hibernate.Query;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
import org.hibernate.type.TypeFactory;
import org.springframework.orm.hibernate3.HibernateCallback;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* Hibernate-specific implementation of the DAO layer for <b>Content URLs</b>.
*
* @author Derek Hulley
* @since 2.0
*/
public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements ContentUrlDAO
{
private static final String QUERY_GET_ALL = "contentUrl.GetAll";
private static final String UPDATE_DELETE_BY_URL = "contentUrl.DeleteByUrl";
private static final String UPDATE_DELETE_IN_LIST = "contentUrl.DeleteInList";
private static final String UPDATE_DELETE_ALL = "contentUrl.DeleteAll";
private static Log logger = LogFactory.getLog(HibernateContentUrlDAOImpl.class);
public ContentUrl createContentUrl(String contentUrl)
{
ContentUrl entity = new ContentUrlImpl();
entity.setContentUrl(contentUrl);
getSession().save(entity);
return entity;
}
public void getAllContentUrls(final ContentUrlHandler handler)
{
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.QUERY_GET_ALL)
.setCacheMode(CacheMode.IGNORE);
return query.scroll(ScrollMode.FORWARD_ONLY);
}
};
ScrollableResults results = (ScrollableResults) getHibernateTemplate().execute(callback);
while (results.next())
{
String contentUrl = results.getText(0);
handler.handle(contentUrl);
}
}
public void deleteContentUrl(final String contentUrl)
{
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
session.flush();
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.UPDATE_DELETE_BY_URL)
.setCacheMode(CacheMode.IGNORE)
.setString("contentUrl", contentUrl);
return (Integer) query.executeUpdate();
}
};
Integer deletedCount = (Integer) getHibernateTemplate().execute(callback);
int entityCount = getSession().getStatistics().getEntityCount();
if (logger.isDebugEnabled())
{
logger.debug("Deleted " + deletedCount + " ContentUrl entities.");
}
}
public void deleteContentUrls(final Set<String> contentUrls)
{
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
session.flush();
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.UPDATE_DELETE_IN_LIST)
.setCacheMode(CacheMode.IGNORE)
.setParameterList("contentUrls", contentUrls, TypeFactory.basic("string"));
return (Integer) query.executeUpdate();
}
};
Integer deletedCount = (Integer) getHibernateTemplate().execute(callback);
if (logger.isDebugEnabled())
{
logger.debug("Deleted " + deletedCount + " ContentUrl entities.");
}
}
public void deleteAllContentUrls()
{
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
session.flush();
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.UPDATE_DELETE_ALL)
.setCacheMode(CacheMode.IGNORE);
return (Integer) query.executeUpdate();
}
};
Integer deletedCount = (Integer) getHibernateTemplate().execute(callback);
if (logger.isDebugEnabled())
{
logger.debug("Deleted " + deletedCount + " ContentUrl entities.");
}
}
}