[jboss-identity-commits] JBoss Identity SVN: r834 - in authz/trunk: assemble and 1 other directories.

Author: sohil.shah(a)jboss.com Date: 2009-10-09 18:53:18 -0400 (Fri, 09 Oct 2009) New Revision: 834 Added: authz/trunk/assemble/ authz/trunk/assemble/bin.xml authz/trunk/assemble/doc.xml Modified: authz/trunk/common/pom.xml authz/trunk/pom.xml Log: build stuff to get alpha ready to ship Added: authz/trunk/assemble/bin.xml =================================================================== --- authz/trunk/assemble/bin.xml (rev 0) +++ authz/trunk/assemble/bin.xml 2009-10-09 22:53:18 UTC (rev 834) @@ -0,0 +1,27 @@ +<assembly> + <id>bin</id> + <formats> + <format>dir</format> + <!-- + <format>tar.gz</format> + <format>tar.bz2</format> + <format>zip</format> + --> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.security.authz:common</include> + <include>org.jboss.security.authz:component-spec</include> + <include>org.jboss.security.authz:core-components</include> + <include>org.jboss.security.authz:agent</include> + <include>org.jboss.security.authz:policy-server</include> + </includes> + <binaries> + <outputDirectory>/lib</outputDirectory> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Added: authz/trunk/assemble/doc.xml =================================================================== --- authz/trunk/assemble/doc.xml (rev 0) +++ authz/trunk/assemble/doc.xml 2009-10-09 22:53:18 UTC (rev 834) @@ -0,0 +1,18 @@ +<assembly> + <id>doc</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.security.authz:reference-guide</include> + </includes> + <binaries> + <outputDirectory>/doc</outputDirectory> + <unpack>true</unpack> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Modified: authz/trunk/common/pom.xml =================================================================== --- authz/trunk/common/pom.xml 2009-10-09 20:05:11 UTC (rev 833) +++ authz/trunk/common/pom.xml 2009-10-09 22:53:18 UTC (rev 834) @@ -13,12 +13,7 @@ <url>http://www.jboss.org</url> <description>Contains components that are used by all the other modules</description> - <dependencies> - <!-- jboss xacml --> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-xacml</artifactId> - </dependency> + <dependencies> <!-- jboss microcontainer --> <dependency> <groupId>org.jboss.microcontainer</groupId> Modified: authz/trunk/pom.xml =================================================================== --- authz/trunk/pom.xml 2009-10-09 20:05:11 UTC (rev 833) +++ authz/trunk/pom.xml 2009-10-09 22:53:18 UTC (rev 834) @@ -14,10 +14,11 @@ <module>common</module> <module>core-components</module> <module>agent</module> - <module>policy-server</module> - <module>http-profile</module> + <module>policy-server</module> <module>samples</module> + <module>documentation</module> <!-- + <module>http-profile</module> <module>portal-profile</module> --> </modules> @@ -56,65 +57,77 @@ <dependency> <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> - <version>${version.sun.jaxb}</version> - <scope>provided</scope> + <version>${version.sun.jaxb}</version> </dependency> <dependency> <groupId>sun-jaxb</groupId> <artifactId>jaxb-impl</artifactId> - <version>${version.sun.jaxb}</version> - <scope>provided</scope> + <version>${version.sun.jaxb}</version> </dependency> <dependency> <groupId>sun-jaxb</groupId> <artifactId>jaxb-xjc</artifactId> - <version>${version.sun.jaxb}</version> - <scope>provided</scope> + <version>${version.sun.jaxb}</version> </dependency> <!-- sun jaf --> <dependency> <groupId>sun-jaf</groupId> <artifactId>activation</artifactId> - <version>${version.sun.jaf}</version> + <version>${version.sun.jaf}</version> </dependency> <!-- jboss xacml --> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-xacml</artifactId> - <version>${version.jboss.xacml}</version> - <scope>provided</scope> + <version>${version.jboss.xacml}</version> + <exclusions> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-sunxacml</artifactId> - <version>${version.jboss.xacml}</version> - <scope>provided</scope> + <version>${version.jboss.xacml}</version> + <exclusions> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> <!-- junit --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${version.junit}</version> - <scope>provided</scope> + <version>${version.junit}</version> </dependency> <!-- logging --> <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> - <version>${version.apache.log4j}</version> - <scope>provided</scope> + <version>${version.apache.log4j}</version> </dependency> <!-- Drools --> <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> - <version>${version.org.drools}</version> - <scope>provided</scope> + <version>${version.org.drools}</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -125,8 +138,7 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> - <version>${version.org.drools}</version> - <scope>provided</scope> + <version>${version.org.drools}</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -137,14 +149,12 @@ <dependency> <groupId>org.mvel</groupId> <artifactId>mvel</artifactId> - <version>${version.org.mvel.mvel}</version> - <scope>provided</scope> + <version>${version.org.mvel.mvel}</version> </dependency> <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>${version.org.antlr}</version> - <scope>provided</scope> + <version>${version.org.antlr}</version> </dependency> <!-- xstream dependeny --> @@ -158,40 +168,34 @@ <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> - <version>${version.org.jboss.microcontainer}</version> - <scope>provided</scope> + <version>${version.org.jboss.microcontainer}</version> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-dependency</artifactId> - <version>${version.org.jboss.microcontainer}</version> - <scope>provided</scope> + <version>${version.org.jboss.microcontainer}</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-reflect</artifactId> - <version>${version.org.jboss.jboss-reflect}</version> - <scope>provided</scope> + <version>${version.org.jboss.jboss-reflect}</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>${version.org.jboss.jboss-common-core}</version> - <scope>provided</scope> + <version>${version.org.jboss.jboss-common-core}</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-mdr</artifactId> - <version>${version.org.jboss.jboss-mdr}</version> - <scope>provided</scope> + <version>${version.org.jboss.jboss-mdr}</version> </dependency> <!-- Servlet --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>${version.javax.servlet.servlet-api}</version> - <scope>provided</scope> + <version>${version.javax.servlet.servlet-api}</version> </dependency> <!-- Commons Http Client --> @@ -281,7 +285,16 @@ </goals> </execution> </executions> - </plugin> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>assemble/bin.xml</descriptor> + <descriptor>assemble/doc.xml</descriptor> + </descriptors> + </configuration> + </plugin> </plugins> </build> @@ -296,6 +309,19 @@ </plugin> </plugins> </reporting> + + <!-- Build Profiles --> + <profiles> + <profile> + <id>container-testsuite</id> + <properties> + <!-- + <jboss.home>/home/soshah/projects/jboss-portal/jboss-4.2.3.GA</jboss.home> + --> + <jboss.home>/home/soshah/projects/jboss-portal/jboss-5.0.1.GA</jboss.home> + </properties> + </profile> + </profiles> <repositories> <repository> @@ -358,18 +384,5 @@ <url>dav:https://snapshots.jboss.org/maven2</url> <uniqueVersion>true</uniqueVersion> </snapshotRepository> - </distributionManagement> - - <!-- Build Profiles --> - <profiles> - <profile> - <id>container-testsuite</id> - <properties> - <!-- - <jboss.home>/home/soshah/projects/jboss-portal/jboss-4.2.3.GA</jboss.home> - --> - <jboss.home>/home/soshah/projects/jboss-portal/jboss-5.0.1.GA</jboss.home> - </properties> - </profile> - </profiles> + </distributionManagement> </project>