Commit b32a78b7 authored by Jose Luis Osorno's avatar Jose Luis Osorno
Browse files

Merge branch 'master' into sdk-4.0

parents 7bd5c581 1d551d18

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 
            <source>src/main/assembly/file-mapping.properties</source>

            <filtered>false</filtered>

        </file>

        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->

        <file>

            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>

            <filtered>false</filtered>

        </file>

    </files>



    <fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/log4j.properties

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Add here module-specific custom log4j.properties configuration
 
 No newline at end of file

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 
            <source>src/main/assembly/file-mapping.properties</source>

            <filtered>false</filtered>

        </file>

        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->

        <file>

            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>

            <filtered>false</filtered>

        </file>

    </files>



    <fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/log4j.properties

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Add here module-specific custom log4j.properties configuration
 
 No newline at end of file

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/DemoComponentIT.java

+3 −4
Original line number Diff line number Diff line
@@ -50,10 +50,9 @@ public class DemoComponentIT extends AbstractAlfrescoIT { 
        DemoComponent demoComponent = (DemoComponent) getApplicationContext().getBean("${package}.DemoComponent");

        NodeRef companyHome = demoComponent.getCompanyHome();

        assertNotNull(companyHome);

        String companyHomeName = (String) getServiceRegistry().getNodeService().getProperty(

                companyHome, ContentModel.PROP_NAME);

        assertNotNull(companyHomeName);

        assertEquals("Company Home", companyHomeName);

        String companyHomePath = getServiceRegistry().getNodeService().getPath(companyHome).toPrefixString(getServiceRegistry().getNamespaceService());

        assertNotNull(companyHomePath);

        assertEquals("/app:company_home", companyHomePath);

    }



    @Test