inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Smarten up deployment to filesystem.

Browse Source 
- Deploying to a filesystem implicitly snapshots the source store. 
  This allows shortcutting the tree comparison for directories, because
  guids on directories act as a deep modification indicator if deployments 
  are always from snapshots.  Doh!
- I'll do this for alfresco -> alfresco deployment too.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-05-07 17:52:04 +00:00
parent b9c662956b
commit c55d48a3e7
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/alfresco/public-services-context.xml
View File

@@ -952,6 +952,16 @@
<property name="mappedNames">
<list>
<value>deployDifference</value>
</list>
</property>
</bean>
<bean id="deploymentServiceWriteTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
<property name="advice">
<ref bean="retryingWriteTxnAdvice"/>
</property>
<property name="mappedNames">
<list>
<value>deployDifferenceFS</value>
</list>
</property>
@@ -968,6 +978,7 @@
</property>
<property name="interceptorNames">
<list>
<value>deploymentServiceWriteTxnAdvisor</value>
<value>deploymentServiceReadTxnAdvisor</value>
</list>
</property>

5
source/java/org/alfresco/repo/avm/AVMStoreImpl.java
View File

@@ -233,7 +233,6 @@ public class AVMStoreImpl implements AVMStore, Serializable
}
parent.putChild(parentName[1], newChild);
}
// AVMDAOs.Instance().fVersionLayeredNodeEntryDAO.delete(lastVersion);
// Clear out the new nodes.
List<AVMNode> newInRep = AVMDAOs.Instance().fAVMNodeDAO.getNewInStore(this);
List<AVMNode> layeredNodes = new ArrayList<AVMNode>();
@@ -950,7 +949,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
return false;
}
return fName.equals(((AVMStore)obj).getName());
return fID == ((AVMStore)obj).getId();
}
/**
@@ -960,7 +959,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
@Override
public int hashCode()
{
return fName.hashCode();
return (int)fID;
}
/**

8
source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
View File

@@ -125,17 +125,19 @@
<id column="id" type="long">
<generator class="native"></generator>
</id>
<natural-id>
<property name="versionID" type="int" not-null="true"
column="version_id" index="idx_avm_vr_version">
</property>
<many-to-one name="avmStore" column="avm_store_id"
class="AVMStoreImpl" not-null="true" foreign-key="fk_avm_vr_store">
</many-to-one>
</natural-id>
<property name="createDate" type="long" not-null="true" column="create_date">
</property>
<property name="creator" type="string" column="creator"
not-null="true">
</property>
<many-to-one name="avmStore" column="avm_store_id"
class="AVMStoreImpl" not-null="true" foreign-key="fk_avm_vr_store">
</many-to-one>
<many-to-one name="root" class="DirectoryNodeImpl"
column="root_id" not-null="true" foreign-key="fk_avm_vr_root">
</many-to-one>

14
source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
View File

@@ -608,8 +608,13 @@ public class DeploymentServiceImpl implements DeploymentService
callback.eventOccurred(event);
}
report.add(event);
String storeName = srcPath.substring(0, srcPath.indexOf(':'));
System.out.println(storeName);
if (version < 0)
{
version = fAVMService.createSnapshot(storeName, null, null);
}
String ticket = service.begin(target, userName, password);
deployDirectoryPush(service, ticket, report, callback, version, srcPath, "/");
service.commit(ticket);
event = new DeploymentEvent(DeploymentEvent.Type.END,
@@ -683,8 +688,7 @@ public class DeploymentServiceImpl implements DeploymentService
}
if (diff == 0)
{
if (src.isFile() && dst.getType() == FileType.FILE &&
src.getGuid().equals(dst.getGUID()))
if (src.getGuid().equals(dst.getGUID()))
{
src = null;
dst = null;
@@ -701,6 +705,10 @@ public class DeploymentServiceImpl implements DeploymentService
// Source is a directory.
if (dst.getType() == FileType.DIR)
{
if (!dstPath.equals("/"))
{
service.setGuid(ticket, dstPath, src.getGuid());
}
deployDirectoryPush(service, ticket, report, callback, version, src.getPath(), dstPath + '/' + dst.getName());
src = null;
dst = null;