[jboss-cvs] JBossAS SVN: r65596 - in projects/ejb3/trunk: build and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 25 09:00:30 EDT 2007
Author: wolfc
Date: 2007-09-25 09:00:30 -0400 (Tue, 25 Sep 2007)
New Revision: 65596
Added:
projects/ejb3/trunk/pom.xml
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/injection/
projects/ejb3/trunk/injection/.classpath
projects/ejb3/trunk/injection/.project
projects/ejb3/trunk/injection/pom.xml
Log:
Pomed in the same style as microcontainer
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2007-09-25 12:58:34 UTC (rev 65595)
+++ projects/ejb3/trunk/build/pom.xml 2007-09-25 13:00:30 UTC (rev 65596)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- The parent maven for the microcontainer project that expects a structure like:
+ vi:ts=2:sw=2:expandtab:
+
+ The parent maven for the ejb3 project that expects a structure like:
build/pom.xml
[...]/pom.xml
[...]/pom.xml
@@ -16,44 +18,55 @@
<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>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3</artifactId>
- <version>0.11-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss EJB3 RC11 Build</name>
- <url>http://www.jboss.com</url>
+ <url>http://labs.jboss.com/jbossejb3</url>
<description>
The JBoss EJB3 Release Candidate 11 Preview
</description>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/trunk</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/ejb3/trunk</url>
+ </scm>
+
+ <properties>
+ <version.ant.junit>1.7.0</version.ant.junit>
+ <version.jboss.aop>2.0.0.beta1</version.jboss.aop>
+ <version.jboss.ejb.api>3.0.0.20070913080910</version.jboss.ejb.api>
+ <version.jboss.logging.log4j>2.0.2.GA</version.jboss.logging.log4j>
+ <version.jboss.logging.spi>2.0.2.GA</version.jboss.logging.spi>
+ <version.junit>3.8.1</version.junit>
+ </properties>
+
<build>
<!-- Per default we use maven layout
<sourceDirectory>src/main</sourceDirectory>
<testSourceDirectory>src/tests</testSourceDirectory>
-->
+ <outputDirectory>${ejb3.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${ejb3.testOutputDirectory}</testOutputDirectory>
<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-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
<!--
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -82,16 +95,27 @@
<includes>
<include>**/**TestCase.java</include>
</includes>
- <!--skip>true</skip-->
</configuration>
</plugin>
- <!-- FIXME: test of deploy plugin, to be replaced by new version of jboss-parent -->
<plugin>
- <groupId>jboss.maven-plugins</groupId>
- <artifactId>jboss-deploy-maven-plugin</artifactId>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-deploy-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jboss-deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ <groupId>jboss</groupId>
+ </configuration>
</plugin>
</plugins>
</build>
+
<repositories>
<repository>
<id>jboss</id>
@@ -99,14 +123,30 @@
<layout>default</layout>
<url>http://repository.jboss.com/maven2/</url>
<snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
<enabled>true</enabled>
</snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
+
+ <!-- moved to ejb3 parent
<modules>
<module>../ejb3-core</module>
<module>../jboss-metamodel-dd</module>
</modules>
+ -->
+
<reporting>
<plugins>
<plugin>
@@ -123,6 +163,92 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
</plugins>
</reporting>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- ejb3 -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-injection</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- external -->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>${version.jboss.ejb.api}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <ejb3.outputDirectory>target/classes</ejb3.outputDirectory>
+ <ejb3.testOutputDirectory>target/tests-classes</ejb3.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-resources</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${ejb3.outputDirectory}</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <ejb3.outputDirectory>eclipse-target/classes</ejb3.outputDirectory>
+ <ejb3.testOutputDirectory>eclipse-target/tests-classes</ejb3.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
</project>
Property changes on: projects/ejb3/trunk/injection
___________________________________________________________________
Name: svn:ignore
- target
+ target
eclipse-target
Modified: projects/ejb3/trunk/injection/.classpath
===================================================================
--- projects/ejb3/trunk/injection/.classpath 2007-09-25 12:58:34 UTC (rev 65595)
+++ projects/ejb3/trunk/injection/.classpath 2007-09-25 13:00:30 UTC (rev 65596)
@@ -1,21 +1,26 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java" output="target/eclipse-test-classes"/>
- <classpathentry kind="output" path="target/eclipse-classes"/>
+ <classpathentry kind="src" path="src/test/java" output="eclipse-target/tests-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.beta1/jboss-aop-2.0.0.beta1.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.beta1/jboss-aop-2.0.0.beta1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-transaction-api/1.0.1-SNAPSHOT/jboss-transaction-api-1.0.1-SNAPSHOT.jar" sourcepath="M2_REPO/jboss/jboss-transaction-api/1.0.1-SNAPSHOT/jboss-transaction-api-1.0.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-ejb-api/3.0.0-SNAPSHOT/jboss-ejb-api-3.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/jboss/jboss-ejb-api/3.0.0-SNAPSHOT/jboss-ejb-api-3.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-aop/2.0.0.alpha2/jboss-aop-2.0.0.alpha2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.20070913080910/jboss-ejb-api-3.0.0.20070913080910.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.20070913080910/jboss-ejb-api-3.0.0.20070913080910-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-</classpath>
+</classpath>
\ No newline at end of file
Modified: projects/ejb3/trunk/injection/.project
===================================================================
--- projects/ejb3/trunk/injection/.project 2007-09-25 12:58:34 UTC (rev 65595)
+++ projects/ejb3/trunk/injection/.project 2007-09-25 13:00:30 UTC (rev 65596)
@@ -1,5 +1,5 @@
<projectDescription>
- <name>injection</name>
+ <name>jboss-ejb3-injection</name>
<comment>JBoss POJO Injection Framework</comment>
<projects/>
<buildSpec>
Modified: projects/ejb3/trunk/injection/pom.xml
===================================================================
--- projects/ejb3/trunk/injection/pom.xml 2007-09-25 12:58:34 UTC (rev 65595)
+++ projects/ejb3/trunk/injection/pom.xml 2007-09-25 13:00:30 UTC (rev 65596)
@@ -1,17 +1,18 @@
+<!--
+ vi:ts=2:sw=2:expandtab
+-->
<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>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3</artifactId>
- <version>0.11-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
- <artifactId>injection</artifactId>
+ <artifactId>jboss-ejb3-injection</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>injection</name>
+ <name>JBoss Injection</name>
<url>http://www.jboss.org</url>
<description>JBoss POJO Injection Framework</description>
<build>
@@ -44,52 +45,26 @@
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>2.0.0.alpha2</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>2.0.2.GA</version>
<scope>test</scope>
</dependency>
- <!-- TODO: or do we want jboss-common-core? -->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.2.GA</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
-
- <!-- non-transitive dependencies from aop -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.2.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>2.1.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Added: projects/ejb3/trunk/pom.xml
===================================================================
--- projects/ejb3/trunk/pom.xml (rev 0)
+++ projects/ejb3/trunk/pom.xml 2007-09-25 13:00:30 UTC (rev 65596)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ vi:ts=2:sw=2:expandtab:
+
+ The parent maven for the ejb3 project
+
+ This pom aggregates the subproject pom
+
+ To build this project maven 2 should be installed and in the system path. From the command line
+ run "mvn" from the build directory and "install" will be used as the default goal. In order to use
+ the "deploy" goal, the mvn.cvs.root should be specified in settings.xml.
+-->
+<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>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-parent</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Microcontainer Aggregator</name>
+ <url>http://labs.jboss.com/jbossejb3/</url>
+ <description>
+ The JBoss EJB 3 implementation.
+ </description>
+
+ <modules>
+ <module>build</module>
+ <!--module>core</module-->
+ <module>injection</module>
+ <module>ejb3-cache</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <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-ejb3-${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>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the distribution jar file to a local checkout of the maven repository
+ - This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
Property changes on: projects/ejb3/trunk/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list