[jboss-cvs] JBossAS SVN: r62811 - in projects/microcontainer/trunk: aop-mc-int and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 4 10:42:54 EDT 2007
Author: pgier
Date: 2007-05-04 10:42:54 -0400 (Fri, 04 May 2007)
New Revision: 62811
Added:
projects/microcontainer/trunk/docs/pom.xml
Modified:
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/build/assembly/dist.xml
projects/microcontainer/trunk/docs/gettingstarted/pom.xml
projects/microcontainer/trunk/pom.xml
Log:
Adding docs to assembly. Moved assembly generation to a profile.
Issue: JBBUILD-363
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-05-04 14:38:45 UTC (rev 62810)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-05-04 14:42:54 UTC (rev 62811)
@@ -75,6 +75,46 @@
</configuration>
</execution>
<execution>
+ <id>weave-separate</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <includes>
+ <include>org/jboss/test/microcontainer/test/JndiDecoratedTestCase.java</include>
+ <include>org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.java</include>
+ <include>org/jboss/test/microcontainer/test/SimpleAspectUseCaseXmlTestCase.java</include>
+ </includes>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
+ <systemProperties>
+ <property>
+ <name>jboss.aop.exclude</name>
+ <value>org.jboss.,org.apache.</value>
+ </property>
+ <property>
+ <name>jboss.aop.include</name>
+ <value>org.jboss.test.</value>
+ </property>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.aop.verbose</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
<id>weave-secure</id>
<phase>test</phase>
<goals>
@@ -470,5 +510,42 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>generate-test-report</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
+ <!--<reporting>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>-->
</project>
Modified: projects/microcontainer/trunk/build/assembly/dist.xml
===================================================================
--- projects/microcontainer/trunk/build/assembly/dist.xml 2007-05-04 14:38:45 UTC (rev 62810)
+++ projects/microcontainer/trunk/build/assembly/dist.xml 2007-05-04 14:42:54 UTC (rev 62811)
@@ -16,11 +16,16 @@
<directory>kernel/examples</directory>
<outputDirectory>examples</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>docs/gettingstarted/target/docbkx</directory>
+ <outputDirectory>docs/gettingstarted/en</outputDirectory>
+ </fileSet>
</fileSets>
<moduleSets>
<moduleSet>
<binaries>
<outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${groupId}-${artifactId}-${version}.${extension}</outputFileNameMapping>
<unpack>false</unpack>
</binaries>
</moduleSet>
Modified: projects/microcontainer/trunk/docs/gettingstarted/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/pom.xml 2007-05-04 14:38:45 UTC (rev 62810)
+++ projects/microcontainer/trunk/docs/gettingstarted/pom.xml 2007-05-04 14:42:54 UTC (rev 62811)
@@ -23,7 +23,6 @@
</pluginRepository>
</pluginRepositories>
-
<build>
<plugins>
<plugin>
@@ -53,7 +52,7 @@
</dependencies>
<configuration>
- <foCustomization>${basedir}/src/styles/docbook-fo.xsl</foCustomization>
+ <!--<foCustomization>${basedir}/src/styles/docbook-fo.xsl</foCustomization>-->
<includes>master.xml</includes>
<!-- use separate pages per chapter for HTML -->
Added: projects/microcontainer/trunk/docs/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/pom.xml (rev 0)
+++ projects/microcontainer/trunk/docs/pom.xml 2007-05-04 14:42:54 UTC (rev 62811)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+ <parent>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-container-docs</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Microcontainer Container Docs</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Documentation</description>
+ <modules>
+ <module>gettingstarted</module>
+ <module>reference</module>
+ </modules>
+</project>
Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml 2007-05-04 14:38:45 UTC (rev 62810)
+++ projects/microcontainer/trunk/pom.xml 2007-05-04 14:42:54 UTC (rev 62811)
@@ -33,29 +33,7 @@
The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
and configuration.
</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>build/assembly/dist.xml</descriptor>
- <descriptor>build/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<modules>
<module>build</module>
<module>container</module>
@@ -78,5 +56,42 @@
<defaultGoal>process-test-resources</defaultGoal>
</build>
</profile>
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>docs</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>install</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>jboss-microcontainer-${project.version}</finalName>
+ <descriptors>
+ <descriptor>build/assembly/dist.xml</descriptor>
+ <descriptor>build/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>docs</module>
+ </modules>
+ </profile>
</profiles>
+
</project>
More information about the jboss-cvs-commits
mailing list