Author: shane.bryzak(a)jboss.com Date: 2010-03-17 22:19:47 -0400 (Wed, 17 Mar 2010) New Revision: 12214 Added: modules/xml/trunk/pom.xml Removed: modules/xml/trunk/parent/ Modified: modules/xml/trunk/assembly.xml modules/xml/trunk/core/pom.xml Log: restructure build for distribution Modified: modules/xml/trunk/assembly.xml =================================================================== --- modules/xml/trunk/assembly.xml 2010-03-18 02:19:09 UTC (rev 12213) +++ modules/xml/trunk/assembly.xml 2010-03-18 02:19:47 UTC (rev 12214) @@ -9,8 +9,8 @@ <fileSets> <fileSet> - <directory>core/target/apidocs</directory> - <outputDirectory>seam-xml/doc/apidocs</outputDirectory> + <directory>core/target/site/apidocs</directory> + <outputDirectory>seam-xml/doc/api</outputDirectory> <includes> <include>**</include> </includes> @@ -35,13 +35,30 @@ <include>lgpl.txt</include> </includes> </fileSet> + + <fileSet> + <directory>core/src/main/java</directory> + <outputDirectory>seam-xml/source</outputDirectory> + <includes> + <include>**</include> + </includes> + </fileSet> </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>seam-xml/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.weld:weld-extensions-core</include> + </includes> + </dependencySet> + </dependencySets> + <moduleSets> <moduleSet> <includes> <include>org.jboss.seam.xml:seam-xml-core:jar</include> - <include>org.jboss.weld:weld-extensions-core</include> </includes> <binaries> <outputDirectory>seam-xml/lib</outputDirectory> Modified: modules/xml/trunk/core/pom.xml =================================================================== --- modules/xml/trunk/core/pom.xml 2010-03-18 02:19:09 UTC (rev 12213) +++ modules/xml/trunk/core/pom.xml 2010-03-18 02:19:47 UTC (rev 12214) @@ -1,120 +1,99 @@ <?xml version="1.0"?> <project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>seam-xml-parent</artifactId> - <groupId>org.jboss.seam.xml</groupId> - <version>3.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> + <parent> + <artifactId>seam-xml-parent</artifactId> + <groupId>org.jboss.seam.xml</groupId> + <version>3.0.0-SNAPSHOT</version> + </parent> - <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-core</artifactId> - <packaging>jar</packaging> - <version>${seam.version}</version> - <name>Seam XML Extension Core</name> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-core</artifactId> + <packaging>jar</packaging> + <name>Seam XML Extension Core</name> - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.0-SP1</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>1.0.1-Final</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions-core</artifactId> - <version>1.0.1-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP1</version> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>1.0.1-Final</version> + </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-se</artifactId> - <version>1.0.1-Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <type>jar</type> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-se</artifactId> + <version>1.0.1-Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <type>jar</type> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/tru... - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/x... - <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk/core</ur... - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/tru... + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/x... + <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk/core</ur... + </scm> - <build> + <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <workspace>${basedir}</workspace> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <workspace>${basedir}</workspace> - <downloadJavadocs>true</downloadJavadocs> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <argLine>-Xmx512m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <downloadJavadocs>true</downloadJavadocs> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <argLine>-Xmx512m</argLine> + </configuration> + </plugin> + </plugins> + </build> </project> Added: modules/xml/trunk/pom.xml =================================================================== --- modules/xml/trunk/pom.xml (rev 0) +++ modules/xml/trunk/pom.xml 2010-03-18 02:19:47 UTC (rev 12214) @@ -0,0 +1,74 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>weld-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>8</version> + </parent> + + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-parent</artifactId> + <packaging>pom</packaging> + <version>3.0.0-SNAPSHOT</version> + <name>Seam XML Parent</name> + + <modules> + <module>core</module> + <module>docs</module> + <module>examples/princess-rescue</module> + </modules> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions-core</artifactId> + <version>1.0.1-SNAPSHOT</version> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/tru... + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/x... + <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk</url> + </scm> + +</project>