fixed after test

This commit is contained in:
2021-01-24 14:29:05 -05:00
parent f40b9c243b
commit 754558ad8e
2 changed files with 23 additions and 43 deletions

View File

@@ -28,7 +28,7 @@
<resources> <resources>
<resource> <resource>
<directory>src</directory> <directory>src</directory>
<filtering>true</filtering> <filtering>false</filtering>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>

View File

@@ -4,67 +4,47 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>build-amp</id> <id>amp</id>
<formats> <formats>
<format>amp</format> <format>amp</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<!-- required files -->
<files> <files>
<file> <file>
<source>src/main/resources/alfresco/module/${project.artifactId}/module.properties</source> <source>${project.build.outputDirectory}/alfresco/module/${project.artifactId}/module.properties</source>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<!-- Rarely used, but optional file mapping -->
<file>
<source>src/main/assembly/file-mapping.properties</source>
<filtered>false</filtered>
</file>
<!-- Search for log4j.properties in a couple different spots; preferring the in reverse order -->
<file>
<source>src/main/resources/log4j.properties</source>
<filtered>false</filtered>
</file>
<file>
<source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
<filtered>false</filtered>
</file>
</files> </files>
<fileSets> <fileSets>
<!-- Rarely used, but optional file mapping -->
<fileSet> <fileSet>
<directory>src/main/web</directory> <directory>src/main/assembly</directory>
<outputDirectory>web</outputDirectory> <filtered>false</filtered>
<filtered>true</filtered> <includes>
<excludes> <include>file-mapping.properties</include>
<exclude>README.md</exclude> </includes>
</excludes> <outputDirectory></outputDirectory>
</fileSet> </fileSet>
<!-- Optional log4j mapping -->
<fileSet>
<directory>${project.build.outputDirectory}/alfresco/module/${project.artifactId}</directory>
<filtered>false</filtered>
<includes>
<include>log4j.properties</include>
</includes>
<outputDirectory></outputDirectory>
</fileSet>
<!-- A bunch of possible web resource locations -->
<fileSet> <fileSet>
<directory>target/web</directory> <directory>target/web</directory>
<outputDirectory>web</outputDirectory> <outputDirectory>web</outputDirectory>
<filtered>false</filtered> <filtered>false</filtered>
</fileSet> </fileSet>
<!-- For compatability with the Alfresco SDK -->
<fileSet>
<directory>src/main/assembly/web</directory>
<outputDirectory>web</outputDirectory>
<filtered>true</filtered>
<excludes>
<exclude>README.md</exclude>
</excludes>
</fileSet>
<!-- For compatability with older versions of the Alfresco SDK -->
<fileSet>
<directory>src/main/webapp</directory>
<outputDirectory>web</outputDirectory>
<filtered>true</filtered>
<excludes>
<exclude>README.md</exclude>
</excludes>
</fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>