[seam-commits] Seam SVN: r12987 - in modules/remoting/trunk: core and 7 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Jun 2 15:44:10 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-06-02 15:44:09 -0400 (Wed, 02 Jun 2010)
New Revision: 12987
Added:
modules/remoting/trunk/docs/src/
modules/remoting/trunk/docs/src/main/
modules/remoting/trunk/docs/src/main/docbook/
modules/remoting/trunk/docs/src/main/docbook/en-US/
Removed:
modules/remoting/trunk/docs/en-US/
Modified:
modules/remoting/trunk/core/pom.xml
modules/remoting/trunk/docs/pom.xml
modules/remoting/trunk/docs/src/main/docbook/en-US/master.xml
modules/remoting/trunk/docs/src/main/docbook/en-US/remoting-general.xml
modules/remoting/trunk/docs/src/main/docbook/en-US/remoting-model.xml
modules/remoting/trunk/examples/helloworld/pom.xml
modules/remoting/trunk/examples/model/pom.xml
modules/remoting/trunk/pom.xml
Log:
new build
Modified: modules/remoting/trunk/core/pom.xml
===================================================================
--- modules/remoting/trunk/core/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
+++ modules/remoting/trunk/core/pom.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -1,19 +1,22 @@
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>seam-remoting-parent</artifactId>
<groupId>org.jboss.seam.remoting</groupId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<name>Seam Remoting Core</name>
-
+
<dependencies>
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -37,12 +40,6 @@
<scope>provided</scope>
</dependency>
- <!--dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <scope>provided</scope>
- </dependency-->
-
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
@@ -56,8 +53,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <!-- Required until the Servlet 3.0 API can be resolved in Central -->
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -71,7 +69,6 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>1.0.1-Final</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: modules/remoting/trunk/docs/pom.xml
===================================================================
--- modules/remoting/trunk/docs/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
+++ modules/remoting/trunk/docs/pom.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -2,9 +2,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>8</version>
+ <groupId>org.jboss.seam.remoting</groupId>
+ <artifactId>seam-remoting-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
@@ -12,21 +13,6 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Seam Remoting Reference Guide</name>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
<properties>
<pdf.name>remoting-reference.pdf</pdf.name>
@@ -37,58 +23,35 @@
<defaultGoal>process-classes</defaultGoal>
<plugins>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <plugin>
<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>
- <profiles>
- <profile>
- <id>translations</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
-
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>translate</goal>
- </goals>
- </execution>
- </executions>
-
- <configuration>
- <translations>
- <!--translation>it-IT</translation>
- <translation>zh-CN</translation>
- <translation>zh-TW</translation>
- <translation>es-ES</translation>
- <translation>ko-KR</translation>
-
- <translation>de-DE</translation>
- <translation>pt-BR</translation-->
- </translations>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/remoting/trunk/docs</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/remoting/trunk/docs</developerConnection>
Copied: modules/remoting/trunk/docs/src/main/docbook/en-US (from rev 12930, modules/remoting/trunk/docs/en-US)
Modified: modules/remoting/trunk/docs/src/main/docbook/en-US/master.xml
===================================================================
--- modules/remoting/trunk/docs/en-US/master.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/remoting/trunk/docs/src/main/docbook/en-US/master.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
<book lang="en">
<toc/>
Modified: modules/remoting/trunk/docs/src/main/docbook/en-US/remoting-general.xml
===================================================================
--- modules/remoting/trunk/docs/en-US/remoting-general.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/remoting/trunk/docs/src/main/docbook/en-US/remoting-general.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="remoting-general">
<title>Seam Remoting</title>
Modified: modules/remoting/trunk/docs/src/main/docbook/en-US/remoting-model.xml
===================================================================
--- modules/remoting/trunk/docs/en-US/remoting-model.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/remoting/trunk/docs/src/main/docbook/en-US/remoting-model.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="remoting-model">
<title>Seam Remoting - Model API</title>
Modified: modules/remoting/trunk/examples/helloworld/pom.xml
===================================================================
--- modules/remoting/trunk/examples/helloworld/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
+++ modules/remoting/trunk/examples/helloworld/pom.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -6,6 +6,7 @@
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
@@ -15,25 +16,17 @@
<name>Seam Remoting Helloworld Example</name>
<dependencies>
- <!--dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency-->
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
- <version>2.0.1-FCS</version>
</dependency>
<dependency>
Modified: modules/remoting/trunk/examples/model/pom.xml
===================================================================
--- modules/remoting/trunk/examples/model/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
+++ modules/remoting/trunk/examples/model/pom.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -1,11 +1,13 @@
<?xml version="1.0"?>
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
@@ -13,41 +15,34 @@
<packaging>war</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Seam Remoting Model Example</name>
-
+
<dependencies>
- <!--dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency-->
-
+
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.jboss.seam.remoting</groupId>
<artifactId>seam-remoting-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>provided</scope>
</dependency>
+
</dependencies>
-
+
</project>
Modified: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
+++ modules/remoting/trunk/pom.xml 2010-06-02 19:44:09 UTC (rev 12987)
@@ -1,10 +1,11 @@
-<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">
+<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>10</version>
+ <artifactId>seam-parent</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <version>1</version>
</parent>
<groupId>org.jboss.seam.remoting</groupId>
@@ -19,59 +20,30 @@
<module>examples/helloworld</module>
<module>examples/model</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <seam.version>3.0.0.b01</seam.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
+
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam</artifactId>
+ <version>${seam.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
+
+
+ <!-- Override sub-module versions from org.jboss.seam:seam -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
+ <groupId>org.jboss.seam.remoting</groupId>
+ <artifactId>seam-remoting-core</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.0-SP1</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
- </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- </dependency>
+
</dependencies>
</dependencyManagement>
More information about the seam-commits
mailing list