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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
83757: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << Bringing back the commit just reverted. Needed to revert another commit
         80358 which changed pom.xml files to include the correct versions of
   	  external libs including open cmiss 0.11 >>
      80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
         << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
         80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
            << And added alfresco-opencmis-extension 1.0 >>
            79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
               << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
                  rather than the changes from V4.2-BUG-FIX >>
               79166: Reverse merged V4.2-BUG-FIX (4.2.4)
                  << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                     and Steve is on holiday for a week. >>
                  << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
                  79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                     67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                        Updated OpenCMIS to 0.11 version.
                  79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                     79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
         80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
         80814: MNT-11223: Fix build (pt1)
            - 80366: pom.xml contained a reference to an external surf which is now back in house.
         80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
         80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
         80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
         80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Changed Solr to Lucene for tests.
      83745: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         83699: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) VIA EOL
            81016: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS to check for secondary types list to be null.
            81017: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Disabled assert for tests run by maven.
            82255: Merged V4.2-BUG-FIX (4.2.4) to EOL (5.0/Cloud)
               82252: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Disabled QueryRootFolderTest.
            - RECORD ONLY merge from V4.2-BUG-FIX extra commits not required on HEAD-BUG-FIX: 80373,80397,80840-80841,81707,81741,82245


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:13:46 +00:00
parent 3ec6b5b747
commit 01aba183d1
7 changed files with 79 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@@ -54,7 +54,7 @@
<dependency>
<groupId>org.alfresco.cmis.client</groupId>
<artifactId>alfresco-opencmis-extension</artifactId>
<version>0.9</version>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
@@ -80,6 +80,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -101,6 +105,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
<version>${dependency.opencmis.version}</version>
</dependency>
<!-- ALF-19407 chemistry-tck-atompub and junit are dependencies of CMISTestRunnerWebScript, which is not a test -->
<dependency>
<groupId>org.apache.chemistry</groupId>

2
source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
View File

@@ -152,6 +152,7 @@ public class ResourceWebScriptHelper
* @param selectParam
* @return List<String> bean property names potentially using JSON Pointer syntax
*/
@SuppressWarnings("unchecked")
public static List<String> getSelectClause(String selectParam) throws InvalidArgumentException
{
if (selectParam == null) return Collections.emptyList();
@@ -167,7 +168,6 @@ public class ResourceWebScriptHelper
{
return Arrays.asList(selectedPropsTree.getText());
}
@SuppressWarnings("unchecked")
List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
if (children!= null && !children.isEmpty())
{

28
source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
View File

@@ -22,7 +22,11 @@ import org.apache.chemistry.opencmis.tck.tests.crud.OperationContextTest;
import org.apache.chemistry.opencmis.tck.tests.crud.SetAndDeleteContentTest;
import org.apache.chemistry.opencmis.tck.tests.crud.UpdateSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.QueryTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
import org.apache.chemistry.opencmis.tck.tests.query.QueryInFolderTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
@@ -68,7 +72,7 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
@Test
public void testCMISTCKQuery() throws Exception
{
QueryTestGroup queryTestGroup = new QueryTestGroup();
OverrideQueryTestGroup queryTestGroup = new OverrideQueryTestGroup();
JUnitHelper.run(queryTestGroup);
}
@@ -120,4 +124,24 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
addTest(new OperationContextTest());
}
}
public class OverrideQueryTestGroup extends AbstractSessionTestGroup
{
@Override
public void init(Map<String, String> parameters) throws Exception
{
super.init(parameters);
setName("Query Test Group");
setDescription("Query and content changes tests.");
addTest(new QuerySmokeTest());
// The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest());
addTest(new QueryForObject());
addTest(new QueryLikeTest());
addTest(new QueryInFolderTest());
addTest(new ContentChangesSmokeTest());
}
}
}

2
source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
View File

@@ -12,7 +12,7 @@ public class TCKEnterpriseTestFixture extends EnterpriseTestFixture
"rest-api-test-context.xml"
};
public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/solr/"};
public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
private static TCKEnterpriseTestFixture instance;

6
source/test-java/org/alfresco/rest/api/tests/TestCMIS.java
View File

@@ -1101,10 +1101,13 @@ public class TestCMIS extends EnterpriseTestApi
final List<SecondaryType> secondaryTypesList = doc.getSecondaryTypes();
final List<String> secondaryTypes = new ArrayList<String>();
if (secondaryTypesList != null)
{
for(SecondaryType secondaryType : secondaryTypesList)
{
secondaryTypes.add(secondaryType.getId());
}
}
secondaryTypes.add("P:sys:temporary");
secondaryTypes.add("P:cm:titled");
@@ -1184,10 +1187,13 @@ public class TestCMIS extends EnterpriseTestApi
Document doc = (Document)browserCmisSession11.getObject(doc3NodeRef.getId());
final List<SecondaryType> secondaryTypesList = doc.getSecondaryTypes();
final List<String> secondaryTypes = new ArrayList<String>();
if (secondaryTypesList != null)
{
for (SecondaryType secondaryType : secondaryTypesList)
{
secondaryTypes.add(secondaryType.getId());
}
}
secondaryTypes.add("P:sys:temporary");
secondaryTypes.add("P:cm:titled");

29
source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
View File

@@ -44,7 +44,12 @@ import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup;
import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup;
import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.QueryTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
import org.apache.chemistry.opencmis.tck.tests.query.QueryInFolderTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.types.TypesTestGroup;
import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
@@ -155,7 +160,7 @@ public class TestEnterpriseAtomPubTCK extends AbstractEnterpriseOpenCMIS10TCKTes
@Test
public void testCMISTCKQuery() throws Exception
{
QueryTestGroup queryTestGroup = new QueryTestGroup();
OverrideQueryTestGroup queryTestGroup = new OverrideQueryTestGroup();
JUnitHelper.run(queryTestGroup);
}
@@ -176,4 +181,24 @@ public class TestEnterpriseAtomPubTCK extends AbstractEnterpriseOpenCMIS10TCKTes
addTest(new CheckedOutTest());
}
}
private class OverrideQueryTestGroup extends AbstractSessionTestGroup
{
@Override
public void init(Map<String, String> parameters) throws Exception
{
super.init(parameters);
setName("Query Test Group");
setDescription("Query and content changes tests.");
addTest(new QuerySmokeTest());
// The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest());
addTest(new QueryForObject());
addTest(new QueryLikeTest());
addTest(new QueryInFolderTest());
addTest(new ContentChangesSmokeTest());
}
}
}

4
source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
View File

@@ -17,7 +17,6 @@ import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryRootFolderTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
@@ -130,7 +129,8 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe
// this is failing because of an MT issue (the thread is a specific tenant but the DB metadata query is searching
// against the workspace://SpacesStore)
// addTest(new QuerySmokeTest());
addTest(new QueryRootFolderTest());
// The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest());
addTest(new QueryForObject());
addTest(new QueryLikeTest());
addTest(new ContentChangesSmokeTest());