Skip to content

Commit

Permalink
Merge branch 'master' into sdk-4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlosornogil
jlosornogil committed Jan 28, 2019
2 parents 7bd5c58 + 1d551d1 commit b32a78b
Show file tree
Hide file tree
Showing 14 changed files with 184 additions and 6 deletions.
5 changes: 5 additions & 0 deletions ...n/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...ifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add here module-specific custom log4j.properties configuration
5 changes: 5 additions & 0 deletions ...main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...hare-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add here module-specific custom log4j.properties configuration
7 changes: 3 additions & 4 deletions ...s/archetype-resources/integration-tests/src/test/java/platformsample/DemoComponentIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ public void testGetCompanyHome() {
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
Expand Down
50 changes: 50 additions & 0 deletions archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,56 @@
</executions>
</plugin>

<!-- Compress JavaScript files and store as *-min.js -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>1.5.1</version>
<executions>
<!-- Compress the JS files under the assembly folder -->
<execution>
<id>compress-assembly</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/META-INF/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude>
<exclude>**/*-min.css</exclude>
</excludes>
<force>true</force>
<jswarn>false</jswarn>
</configuration>
</execution>
<!-- Compress the JS files under the resources folder -->
<execution>
<id>compress-resources</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude>
<exclude>**/*-min.css</exclude>
</excludes>
<force>true</force>
<jswarn>false</jswarn>
</configuration>
</execution>
</executions>
</plugin>

<!-- Hot reloading with JRebel -->
<plugin>
<groupId>org.zeroturnaround</groupId>
Expand Down
50 changes: 50 additions & 0 deletions archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,56 @@
</dependencies>
</plugin>

<!-- Compress JavaScript files and store as *-min.js -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>1.5.1</version>
<executions>
<!-- Compress the JS files under the assembly folder -->
<execution>
<id>compress-assembly</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/META-INF/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude>
<exclude>**/*-min.css</exclude>
</excludes>
<force>true</force>
<jswarn>false</jswarn>
</configuration>
</execution>
<!-- Compress the JS files under the resources folder -->
<execution>
<id>compress-resources</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude>
<exclude>**/*-min.css</exclude>
</excludes>
<force>true</force>
<jswarn>false</jswarn>
</configuration>
</execution>
</executions>
</plugin>

<!--
Build an AMP if 3rd party libs are needed by the extensions
JARs are the default artifact produced in your modules, if you want to build an amp for each module
Expand Down
5 changes: 5 additions & 0 deletions ...o-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...es/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add here module-specific custom log4j.properties configuration
52 changes: 51 additions & 1 deletion archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,56 @@
</executions>
</plugin>

<!-- Compress JavaScript files and store as *-min.js -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>1.5.1</version>
<executions>
<!-- Compress the JS files under the assembly folder -->
<execution>
<id>compress-assembly</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/META-INF/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude>
<exclude>**/*-min.css</exclude>
</excludes>
<force>true</force>
<jswarn>false</jswarn>
</configuration>
</execution>
<!-- Compress the JS files under the resources folder -->
<execution>
<id>compress-resources</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<excludes>
<exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude>
<exclude>**/*-min.css</exclude>
</excludes>
<force>true</force>
<jswarn>false</jswarn>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -367,4 +417,4 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>
</project>
5 changes: 5 additions & 0 deletions ...esco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...es/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add here module-specific custom log4j.properties configuration
2 changes: 1 addition & 1 deletion modules/alfresco-rad/src/main/java/org/alfresco/rad/test/AlfrescoTestRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ protected void runChild(FrameworkMethod method, RunNotifier notifier) {
protected void callProxiedChild(FrameworkMethod method, RunNotifier notifier, Description desc) {
notifier.fireTestStarted(desc);

String className = method.getMethod().getDeclaringClass().getCanonicalName();
String className = this.getTestClass().getJavaClass().getCanonicalName();
String methodName = method.getName();
if (null != methodName) {
className += "#" + methodName;
Expand Down
5 changes: 5 additions & 0 deletions plugins/alfresco-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@
<artifactId>zt-zip</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-kernel</artifactId>
<version>7.7.9</version>
</dependency>
</dependencies>

<reporting>
Expand Down

0 comments on commit b32a78b

Please sign in to comment.