Author: jeff.yuchang Date: 2009-06-05 00:11:16 -0400 (Fri, 05 Jun 2009) New Revision: 590 Added: idm/trunk/assembly/scripts/assembly-single-jar.xml Modified: idm/trunk/assembly/pom.xml idm/trunk/example/auth/src/main/resources/META-INF/idm-example-auth-jboss-beans.xml Log: * Update the assembly's module artifact id. * Add the single-jar distribution. * Update the auth example. Modified: idm/trunk/assembly/pom.xml =================================================================== --- idm/trunk/assembly/pom.xml 2009-06-04 17:31:44 UTC (rev 589) +++ idm/trunk/assembly/pom.xml 2009-06-05 04:11:16 UTC (rev 590) @@ -2,9 +2,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>idm-assembly</artifactId> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>jbossidm</artifactId> <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>JBoss Identity IDM Assembly </name> <parent> @@ -160,20 +161,35 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-3</version> <executions> + <execution> + <id>create-single-jar</id> + <phase>process-resources</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>scripts/assembly-single-jar.xml</descriptor> + </descriptors> + </configuration> + <inherited>false</inherited> + </execution> + + <execution> <id>create-distribution-package</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> - <finalName>jbossidm-${version}</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>scripts/assembly-distro.xml</descriptor> </descriptors> </configuration> + <inherited>false</inherited> </execution> </executions> Added: idm/trunk/assembly/scripts/assembly-single-jar.xml =================================================================== --- idm/trunk/assembly/scripts/assembly-single-jar.xml (rev 0) +++ idm/trunk/assembly/scripts/assembly-single-jar.xml 2009-06-05 04:11:16 UTC (rev 590) @@ -0,0 +1,59 @@ +<assembly> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${basedir}/../idm-common/target/classes</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-spi/target/classes</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-api/target/classes</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-core/target/classes/</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-cache/target/classes/</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-hibernate/target/classes/</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-ldap/target/classes/</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../idm-auth/target/classes/</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../integration/jboss5/target/classes/</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>*.xsd</exclude> + <exclude>META-INF/*.xml</exclude> + </excludes> + + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../integration/deployer/target/classes/</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>*.xsd</exclude> + <exclude>META-INF/*.xml</exclude> + </excludes> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> Modified: idm/trunk/example/auth/src/main/resources/META-INF/idm-example-auth-jboss-beans.xml =================================================================== --- idm/trunk/example/auth/src/main/resources/META-INF/idm-example-auth-jboss-beans.xml 2009-06-04 17:31:44 UTC (rev 589) +++ idm/trunk/example/auth/src/main/resources/META-INF/idm-example-auth-jboss-beans.xml 2009-06-05 04:11:16 UTC (rev 590) @@ -9,6 +9,7 @@ class="org.jboss.identity.idm.integration.jboss5.IDMService"> <constructor> <parameter>jboss-idm.xml</parameter> + <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter> </constructor> <property name="doChecking">true</property> <property name="setupLocation">setup.txt</property> @@ -40,4 +41,4 @@ -</deployment> \ No newline at end of file +</deployment>