diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-03 17:40:25 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-03 17:40:25 +0100 |
| commit | d4d3d93cd9d6338cf1755eb1a0ce47bec7e4c109 (patch) | |
| tree | 23d1dd40a01609e28244302fec01d1051b3e1b08 /id/assembly-auth.xml | |
| parent | 2dc4a2ddfcc9b024cd9836da6792414a85bf60c9 (diff) | |
| parent | 85fb1aa44b7b3d744d3dc210669f0569b49b2b64 (diff) | |
| download | moa-id-spss-d4d3d93cd9d6338cf1755eb1a0ce47bec7e4c109.tar.gz moa-id-spss-d4d3d93cd9d6338cf1755eb1a0ce47bec7e4c109.tar.bz2 moa-id-spss-d4d3d93cd9d6338cf1755eb1a0ce47bec7e4c109.zip | |
merge
Diffstat (limited to 'id/assembly-auth.xml')
| -rw-r--r-- | id/assembly-auth.xml | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 276c17e7e..9fa082ac2 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -3,8 +3,8 @@ <formats>
<format>dir</format>
- <format>zip</format>
- <format>tar.gz</format>
+<!-- <format>zip</format>
+ <format>tar.gz</format> -->
</formats>
<baseDirectory>moa-id-auth-${project.version}</baseDirectory>
@@ -14,7 +14,6 @@ <directory>${basedir}/id/server/data/deploy</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <!-- <exclude>**/conf/moa-id/oa/**</exclude>-->
<exclude>**/conf/Catalina/**</exclude>
</excludes>
</fileSet>
@@ -63,9 +62,9 @@ <include>MOA.id.server:moa-id-auth</include>
</includes>
<binaries>
- <includeDependencies>false</includeDependencies>
+ <includeDependencies>true</includeDependencies>
<outputDirectory>/</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<dependencySets>
<dependencySet>
<includes>
@@ -103,17 +102,46 @@ <unpack>true</unpack>
</binaries>
</moduleSet>
- <!-- <moduleSet>
+
+ <moduleSet>
<includes>
- <include>MOA.id:moa-id-templates</include>
+ <include>MOA.id:moa-id-configuration</include>
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
- <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
- <outputDirectory>/templates</outputDirectory>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
</binaries>
- </moduleSet>-->
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>MOA.id:moa-id-oa</include>
+ </includes>
+ <sources>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>../</outputDirectory>
+ <includeModuleDirectory>true</includeModuleDirectory>
+ <outputDirectoryMapping>/source/${module.artifactId}/src</outputDirectoryMapping>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/bin/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>.*</exclude>
+ </excludes>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </sources>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+
</moduleSets>
<componentDescriptors>
|