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

Merged BRANCHES/V2.2 to BRANCHES/V2.3:

Browse Source 
114258: RM-2522 : Select "Download Zip" (rm-download-zip) on RM Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not fileplan
        - used isFilePlan method from FilePlanService instead of old check
   114917: Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
        114437: Merged DEV to V2.2.1.x
             114241: MNT-14900 : Alfresco doesn't work with Records Management
                - Fixed problem with circular references during Spring dependency injection process
        114605: Reverse merged V2.2.1.x
                   <<< Need to use a different approach. >>>
                   Merged DEV to V2.2.1.x
                      114241: MNT-14900 : Alfresco doesn't work with Records Management
                         - Fixed problem with circular references during Spring dependency injection process
        114609: (RECORD ONLY) Update version to 2.2.1.3
        114687: (RECORD ONLY) Updated version to 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@114921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-10-21 15:15:52 +00:00
parent 6c1c63b3cf d224a6ca38
commit 065e8024ec
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-parent</artifactId> <artifactId>alfresco-rm-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.3-SNAPSHOT</version> <version>2.3.1-SNAPSHOT</version>
<name>Alfresco Records Management</name> <name>Alfresco Records Management</name>
<url>http://www.alfresco.org/</url> <url>http://www.alfresco.org/</url>

2
rm-automation/pom.xml
View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-parent</artifactId> <artifactId>alfresco-rm-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-automation</artifactId> <artifactId>alfresco-rm-automation</artifactId>

2
rm-server/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-parent</artifactId> <artifactId>alfresco-rm-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-server</artifactId> <artifactId>alfresco-rm-server</artifactId>

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
View File

@@ -104,7 +104,7 @@ public abstract class BaseTransferWebScript extends StreamACP
} }
// ensure the node is a filePlan object // ensure the node is a filePlan object
if (!TYPE_FILE_PLAN.equals(this.nodeService.getType(filePlan))) if (!filePlanService.isFilePlan(filePlan))
{ {
status.setCode(HttpServletResponse.SC_BAD_REQUEST, status.setCode(HttpServletResponse.SC_BAD_REQUEST,
"Node " + filePlan.toString() + " is not a file plan"); "Node " + filePlan.toString() + " is not a file plan");