[jboss-cvs] JBossAS SVN: r73814 - in projects/integration/trunk: build and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 29 13:18:29 EDT 2008
Author: pgier
Date: 2008-05-29 13:18:29 -0400 (Thu, 29 May 2008)
New Revision: 73814
Added:
projects/integration/trunk/jboss-classloading-spi/src/main/java/org/
projects/integration/trunk/jboss-corba-ots-spi/src/main/java/org/
projects/integration/trunk/jboss-deployment-spi/src/main/java/org/
projects/integration/trunk/jboss-jca-spi/src/main/java/org/
projects/integration/trunk/jboss-transaction-spi/src/main/java/org/
Removed:
projects/integration/trunk/jboss-classloading-spi/src/main/org/
projects/integration/trunk/jboss-corba-ots-spi/src/main/org/
projects/integration/trunk/jboss-deployment-spi/src/main/org/
projects/integration/trunk/jboss-jca-spi/src/main/org/
projects/integration/trunk/jboss-transaction-spi/src/main/org/
Modified:
projects/integration/trunk/build/assembly/bin.xml
projects/integration/trunk/build/assembly/sources.xml
projects/integration/trunk/build/pom.xml
projects/integration/trunk/jboss-classloading-spi/pom.xml
projects/integration/trunk/jboss-corba-ots-spi/pom.xml
projects/integration/trunk/jboss-deployment-spi/pom.xml
projects/integration/trunk/jboss-jca-spi/pom.xml
projects/integration/trunk/jboss-transaction-spi/pom.xml
projects/integration/trunk/pom.xml
Log:
[JBAS-5288] Refactoring to better follow maven standards.
Modified: projects/integration/trunk/build/assembly/bin.xml
===================================================================
--- projects/integration/trunk/build/assembly/bin.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/build/assembly/bin.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -5,23 +5,23 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>jboss-classloading-spi/target/classes</directory>
+ <directory>../jboss-classloading-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-corba-ots-spi/target/classes</directory>
+ <directory>../jboss-corba-ots-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-deployment-spi/target/classes</directory>
+ <directory>../jboss-deployment-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-jca-spi/target/classes</directory>
+ <directory>../jboss-jca-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-transaction-spi/target/classes</directory>
+ <directory>../jboss-transaction-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: projects/integration/trunk/build/assembly/sources.xml
===================================================================
--- projects/integration/trunk/build/assembly/sources.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/build/assembly/sources.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -6,23 +6,23 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>jboss-classloading-spi/src/main</directory>
+ <directory>../jboss-classloading-spi/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-corba-ots-spi/src/main</directory>
+ <directory>../jboss-corba-ots-spi/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-deployment-spi/src/main</directory>
+ <directory>../jboss-deployment-spi/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-jca-spi/src/main</directory>
+ <directory>../jboss-jca-spi/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>jboss-transaction-spi/src/main</directory>
+ <directory>../jboss-transaction-spi/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: projects/integration/trunk/build/pom.xml
===================================================================
--- projects/integration/trunk/build/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/build/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,105 +1,65 @@
<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>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-integration-parent</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-integration-parent</artifactId>
+ <artifactId>jboss-integration</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Integration 5.0 Parent</name>
+ <name>JBoss Integration 5.0 Aggregate Build</name>
<url>http://www.jboss.com</url>
<description>
The JBoss Integration SPI classes
</description>
- <build>
- <finalName>${artifactId}</finalName>
- <resources>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <printSummary>false</printSummary>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50-client</artifactId>
- <version>2.0.0.CR8</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.5.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.CR1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.0.1.CR1</version>
- </dependency>
- <dependency>
- <groupId>jacorb</groupId>
- <artifactId>jacorb</artifactId>
- <version>2.3.0jboss.patch5-brew</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <profiles>
+ <profile>
+ <id>assembly</id>
+ <activation>
+ <property>
+ <name>!skip.assembly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly/bin.xml</descriptor>
+ <descriptor>assembly/sources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <inherited>false</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-deploy-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jboss-deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Modified: projects/integration/trunk/jboss-classloading-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-classloading-spi/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/jboss-classloading-spi/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,22 +1,16 @@
<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>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
<artifactId>jboss-classloading-spi</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss ClassLoading 5.0.0 SPI</name>
<url>http://www.jboss.org</url>
<description>The Java ClassLoading 5.0.0 SPI classes</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- </build>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
Copied: projects/integration/trunk/jboss-classloading-spi/src/main/java/org (from rev 73803, projects/integration/trunk/jboss-classloading-spi/src/main/org)
Modified: projects/integration/trunk/jboss-corba-ots-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/jboss-corba-ots-spi/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,22 +1,16 @@
<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>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
<artifactId>jboss-corba-ots-spi</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss CORBA OTS 5.0.0 SPI</name>
<url>http://www.jboss.org</url>
<description>SPI to be implemented by CORBA OTS providers for JBoss 5.0.0</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- </build>
<dependencies>
<dependency>
<groupId>org.jboss.javaee</groupId>
Copied: projects/integration/trunk/jboss-corba-ots-spi/src/main/java/org (from rev 73803, projects/integration/trunk/jboss-corba-ots-spi/src/main/org)
Modified: projects/integration/trunk/jboss-deployment-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-deployment-spi/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/jboss-deployment-spi/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,20 +1,14 @@
<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>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
<artifactId>jboss-deployment-spi</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Deployment 5.0.0 SPI</name>
<url>http://www.jboss.org</url>
<description>The JBossAS Deployment 5.0.0 SPI classes</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- </build>
</project>
Copied: projects/integration/trunk/jboss-deployment-spi/src/main/java/org (from rev 73803, projects/integration/trunk/jboss-deployment-spi/src/main/org)
Modified: projects/integration/trunk/jboss-jca-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-jca-spi/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/jboss-jca-spi/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,22 +1,16 @@
<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>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
<artifactId>jboss-jca-spi</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss JCA 5.0.0 SPI</name>
<url>http://www.jboss.org</url>
<description>The JBoss JCA 5.0.0 SPI classes</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- </build>
<dependencies>
<dependency>
<groupId>org.jboss.logging</groupId>
Copied: projects/integration/trunk/jboss-jca-spi/src/main/java/org (from rev 73803, projects/integration/trunk/jboss-jca-spi/src/main/org)
Modified: projects/integration/trunk/jboss-transaction-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-transaction-spi/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/jboss-transaction-spi/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,22 +1,16 @@
<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>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Transaction 5.0.0 SPI</name>
<url>http://www.jboss.org</url>
<description>The Java Transaction 5.0.0 SPI classes</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- </build>
<dependencies>
<dependency>
<groupId>org.jboss.logging</groupId>
Copied: projects/integration/trunk/jboss-transaction-spi/src/main/java/org (from rev 73803, projects/integration/trunk/jboss-transaction-spi/src/main/org)
Modified: projects/integration/trunk/pom.xml
===================================================================
--- projects/integration/trunk/pom.xml 2008-05-29 16:58:27 UTC (rev 73813)
+++ projects/integration/trunk/pom.xml 2008-05-29 17:18:29 UTC (rev 73814)
@@ -1,16 +1,15 @@
<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>org.jboss</groupId>
- <artifactId>jboss-integration-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>build/pom.xml</relativePath>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-integration</artifactId>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Integration 5.0 Aggregate</name>
+ <name>JBoss Integration 5.0 Parent</name>
<url>http://www.jboss.com</url>
<description>
The JBoss Integration SPI classes
@@ -22,60 +21,102 @@
</scm>
<modules>
- <module>build</module>
<module>jboss-classloading-spi</module>
<module>jboss-deployment-spi</module>
<module>jboss-transaction-spi</module>
<module>jboss-corba-ots-spi</module>
<module>jboss-jca-spi</module>
+ <module>build</module>
</modules>
- <profiles>
- <profile>
- <id>assembly</id>
- <activation>
- <property>
- <name>!skip.assembly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>build/assembly/bin.xml</descriptor>
- <descriptor>build/assembly/sources.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/etc</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <printSummary>false</printSummary>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50-client</artifactId>
+ <version>2.0.0.CR8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ <version>1.5.0.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <version>1.0.1.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>2.3.0jboss.patch5-brew</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
More information about the jboss-cvs-commits
mailing list