diff options
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>
 | 
