[seam-commits] Seam SVN: r12894 - in modules/faces/trunk: docs/reference and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2010-05-28 12:35:02 -0400 (Fri, 28 May 2010) New Revision: 12894 Removed: modules/faces/trunk/assembly.xml Modified: modules/faces/trunk/docs/reference/pom.xml modules/faces/trunk/examples/short-ly/pom.xml modules/faces/trunk/pom.xml Log: new dist Deleted: modules/faces/trunk/assembly.xml =================================================================== --- modules/faces/trunk/assembly.xml 2010-05-28 15:58:45 UTC (rev 12893) +++ modules/faces/trunk/assembly.xml 2010-05-28 16:35:02 UTC (rev 12894) @@ -1,89 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>bin</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <directory>api/target/site/apidocs</directory> - <outputDirectory>seam-faces/doc/api</outputDirectory> - <includes> - <include>**</include> - </includes> - </fileSet> - - <fileSet> - <directory>examples</directory> - <outputDirectory>seam-faces/examples</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <includes> - <include>seam-faces-example-tinyurl/pom.xml</include> - <include>seam-faces-example-tinyurl/src/**</include> - <include>seam-faces-example-tinyrul/readme.txt</include> - </includes> - </fileSet> - - <fileSet> - <directory>.</directory> - <outputDirectory>seam-faces</outputDirectory> - <includes> - <include>readme.txt</include> - <include>apl.txt</include> - </includes> - </fileSet> - - <fileSet> - <directory>api/src/main/java</directory> - <outputDirectory>seam-faces/source</outputDirectory> - <includes> - <include>**</include> - </includes> - </fileSet> - - <fileSet> - <directory>impl/src/main/java</directory> - <outputDirectory>seam-faces/source</outputDirectory> - <includes> - <include>**</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <outputDirectory>seam-faces/lib</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.weld:weld-extensions</include> - </includes> - </dependencySet> - </dependencySets> - - <moduleSets> - <moduleSet> - <includes> - <include>org.jboss.seam.xml:seam-faces-api:jar</include> - <include>org.jboss.seam.xml:seam-faces:jar</include> - </includes> - <binaries> - <outputDirectory>seam-faces/lib</outputDirectory> - <unpack>false</unpack> - </binaries> - </moduleSet> - - <moduleSet> - <includes> - <include>org.jboss.seam.xml:seam-faces-reference-guide</include> - </includes> - <binaries> - <outputDirectory>seam-faces/doc/reference</outputDirectory> - <unpack>true</unpack> - </binaries> - </moduleSet> - - </moduleSets> -</assembly> Modified: modules/faces/trunk/docs/reference/pom.xml =================================================================== --- modules/faces/trunk/docs/reference/pom.xml 2010-05-28 15:58:45 UTC (rev 12893) +++ modules/faces/trunk/docs/reference/pom.xml 2010-05-28 16:35:02 UTC (rev 12894) @@ -15,6 +15,24 @@ <version>10-SNAPSHOT</version> </parent> + <!-- TODO Remove --> + <!-- Snapshots repo to get parent --> + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots + </url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + <properties> <pdf.name>${project.artifactId}.pdf</pdf.name> </properties> @@ -25,6 +43,28 @@ <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> </plugin> + <!-- Attach docs as a war so dist can retrieve them --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-zip</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.outputDirectory}/${project.artifactId}-${project.version}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: modules/faces/trunk/examples/short-ly/pom.xml =================================================================== --- modules/faces/trunk/examples/short-ly/pom.xml 2010-05-28 15:58:45 UTC (rev 12893) +++ modules/faces/trunk/examples/short-ly/pom.xml 2010-05-28 16:35:02 UTC (rev 12894) @@ -16,6 +16,24 @@ <url>http://seamframework.org</url> + <!-- TODO Remove --> + <!-- Snapshots repo to get parent --> + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots + </url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + <properties> <hibernate.version>3.5.1-Final</hibernate.version> </properties> Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-05-28 15:58:45 UTC (rev 12893) +++ modules/faces/trunk/pom.xml 2010-05-28 16:35:02 UTC (rev 12894) @@ -1,198 +1,217 @@ <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> + 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> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>10</version> - </parent> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>11-SNAPSHOT</version> + </parent> - <artifactId>seam-faces-parent</artifactId> - <groupId>org.jboss.seam.faces</groupId> - <version>3.0.0-SNAPSHOT</version> + <artifactId>seam-faces-parent</artifactId> + <groupId>org.jboss.seam.faces</groupId> + <version>3.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Seam Faces Module Parent POM</name> + <packaging>pom</packaging> + <name>Seam Faces Module Parent POM</name> - <description> + <description> The Parent for Seam Faces Modules </description> - <url>http://www.seamframework.org</url> + <url>http://www.seamframework.org</url> - <modules> - <module>api</module> - <module>impl</module> - <!-- - <module>docs/reference</module> <module>examples/short-ly</module> - --> - </modules> + <modules> + <module>api</module> + <module>impl</module> + </modules> - <properties> - <seam.i18n.version>3.0.0-SNAPSHOT</seam.i18n.version> - <weldx.version>1.0.0.Alpha2</weldx.version> + <properties> + <seam.i18n.version>3.0.0-SNAPSHOT</seam.i18n.version> + <weldx.version>1.0.0.Alpha2</weldx.version> - <arquillian.version>1.0.0.Alpha2</arquillian.version> - <jsfunit.version>1.2.0.Final</jsfunit.version> - <jsfmock.version>1.0.0</jsfmock.version> - <weld.api.version>1.0-SP1</weld.api.version> - <weld.core.version>1.0.1-Final</weld.core.version> - <junit.version>4.8.1</junit.version> - <slf4j.version>1.5.10</slf4j.version> - <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> - <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> - </properties> + <arquillian.version>1.0.0.Alpha2</arquillian.version> + <jsfunit.version>1.2.0.Final</jsfunit.version> + <jsfmock.version>1.0.0</jsfmock.version> + <weld.api.version>1.0-SP1</weld.api.version> + <weld.core.version>1.0.1-Final</weld.core.version> + <junit.version>4.8.1</junit.version> + <slf4j.version>1.5.10</slf4j.version> + <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> + <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> + </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - </repository> - </repositories> + <!-- TODO Remove --> + <!-- Snapshots repo to get parent --> + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots + </url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>org.jboss.seam.international</groupId> - <artifactId>seam-international-api</artifactId> - <version>${seam.i18n.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.jboss.seam.international</groupId> + <artifactId>seam-international-api</artifactId> + <version>${seam.i18n.version}</version> + </dependency> - <!-- Environment Dependencies --> - <dependency> - <!-- This is necessary until a new JSF-API is published to central --> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>2.0.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions</artifactId> - <version>${weldx.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - <scope>provided</scope> - </dependency> + <!-- Environment Dependencies --> + <dependency> + <!-- This is necessary until a new JSF-API is published to central --> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>2.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <version>${weldx.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + <scope>provided</scope> + </dependency> - <!-- Test Dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-junit</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-weld-embedded</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${weld.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>${jsfmock.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <!-- Test Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${weld.core.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> - <profiles> - <profile> - <id>arquillian-glassfish-embedded-30</id> - <dependencies> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-glassfish-embedded-30</artifactId> - <version>${arquillian.version}</version> - </dependency> - </dependencies> - </profile> - </profiles> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>${jsfmock.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <developers> - <developer> - <name>Lincoln Baxter, III</name> - <email&gt;lincolnbaxter(a)gmail.com&lt;/email&gt; - <url>http://ocpsoft.com</url> - <organization>JBoss, by Red Hat</organization> - <organizationUrl>http://jboss.org</organizationUrl> - <timezone>EST</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - <developer> - <name>Dan Allen</name> - <organization>JBoss, by Red Hat</organization> - <organizationUrl>http://jboss.org</organizationUrl> - <timezone>EST</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - <developer> - <name>Nicklas Karlsson</name> - <timezone>GMT+2</timezone> - <roles> - <role>Committer</role> - </roles> - </developer> - </developers> + <profiles> + <profile> + <id>distribution</id> + <activation> + <property> + <name>dist</name> + </property> + </activation> + <modules> + <module>dist</module> + <module>docs/reference</module> + </modules> + </profile> + <profile> + <id>arquillian-glassfish-embedded-30</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-glassfish-embedded-30</artifactId> + <version>${arquillian.version}</version> + </dependency> + </dependencies> + </profile> + </profiles> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/t... </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/f... </developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url> - </scm> + <developers> + <developer> + <name>Lincoln Baxter, III</name> + <email&gt;lincolnbaxter(a)gmail.com&lt;/email&gt; + <url>http://ocpsoft.com</url> + <organization>JBoss, by Red Hat</organization> + <organizationUrl>http://jboss.org</organizationUrl> + <timezone>EST</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + <developer> + <name>Dan Allen</name> + <organization>JBoss, by Red Hat</organization> + <organizationUrl>http://jboss.org</organizationUrl> + <timezone>EST</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + <developer> + <name>Nicklas Karlsson</name> + <timezone>GMT+2</timezone> + <roles> + <role>Committer</role> + </roles> + </developer> + </developers> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/t... </connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/f... </developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url> + </scm> </project>