[jboss-cvs] JBossAS SVN: r78023 - in projects/jboss-osgi/trunk: build and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 4 18:18:06 EDT 2008
Author: pgier
Date: 2008-09-04 18:18:06 -0400 (Thu, 04 Sep 2008)
New Revision: 78023
Added:
projects/jboss-osgi/trunk/osgi-int/src/main/java/
projects/jboss-osgi/trunk/osgi-int/src/main/java/org/
projects/jboss-osgi/trunk/osgi-int/src/main/resources/
projects/jboss-osgi/trunk/osgi-int/src/main/resources/schema/
projects/jboss-osgi/trunk/osgi-int/src/test/
projects/jboss-osgi/trunk/osgi-int/src/test/java/
projects/jboss-osgi/trunk/osgi-int/src/test/java/org/
projects/jboss-osgi/trunk/osgi-int/src/test/resources/
projects/jboss-osgi/trunk/osgi-int/src/test/resources/bootstrap/
projects/jboss-osgi/trunk/osgi-int/src/test/resources/bundle/
projects/jboss-osgi/trunk/osgi-int/src/test/resources/org/
projects/jboss-osgi/trunk/osgi-repository-api/src/main/java/
projects/jboss-osgi/trunk/osgi-repository-api/src/main/java/org/
Removed:
projects/jboss-osgi/trunk/osgi-int/src/etc/
projects/jboss-osgi/trunk/osgi-int/src/main/org/
projects/jboss-osgi/trunk/osgi-int/src/resources/schema/
projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bootstrap/
projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bundle/
projects/jboss-osgi/trunk/osgi-int/src/resources/tests/org/
projects/jboss-osgi/trunk/osgi-int/src/tests/org/
projects/jboss-osgi/trunk/osgi-repository-api/src/main/org/
Modified:
projects/jboss-osgi/trunk/build/pom.xml
projects/jboss-osgi/trunk/osgi-int/.classpath
projects/jboss-osgi/trunk/osgi-int/pom.xml
projects/jboss-osgi/trunk/osgi-repository-api/.classpath
projects/jboss-osgi/trunk/osgi-repository-api/pom.xml
projects/jboss-osgi/trunk/pom.xml
Log:
[JBBUILD-484] Restructure project to fit maven standards.
Modified: projects/jboss-osgi/trunk/build/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/pom.xml 2008-09-04 22:10:28 UTC (rev 78022)
+++ projects/jboss-osgi/trunk/build/pom.xml 2008-09-04 22:18:06 UTC (rev 78023)
@@ -10,266 +10,19 @@
-->
<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>4-beta-2</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
+ <artifactId>jboss-osgi-dist</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss OSGi Build</name>
+ <name>JBoss OSGi Distribution Build</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>
- JBoss OSGi
+ JBoss OSGi Distribution Build
</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-osgi/trunk/</url>
- </scm>
-
- <properties>
- <version.jboss.microcontainer>2.0.0.Beta17</version.jboss.microcontainer>
- <version.jboss.deployers>2.0.0.Beta20</version.jboss.deployers>
- <version.jboss.common.core>2.2.7.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
- <version.osgi.r4.core>1.0</version.osgi.r4.core>
- <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
- <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
- <version.junit>4.4</version.junit>
- </properties>
-
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
- <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/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>
- <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>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
- </plugins>
- </reporting>
- <dependencyManagement>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-repository-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>${version.osgi.r4.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.deployers}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.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>${microcontainer.outputDirectory}</buildOutputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory>
- </properties>
- </profile>
- </profiles>
+
</project>
Modified: projects/jboss-osgi/trunk/osgi-int/.classpath
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/.classpath 2008-09-04 22:10:28 UTC (rev 78022)
+++ projects/jboss-osgi/trunk/osgi-int/.classpath 2008-09-04 22:18:06 UTC (rev 78023)
@@ -1,7 +1,7 @@
<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/resources/tests" output="target/tests-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="target/generated-sources/javacc"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Modified: projects/jboss-osgi/trunk/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/pom.xml 2008-09-04 22:10:28 UTC (rev 78022)
+++ projects/jboss-osgi/trunk/osgi-int/pom.xml 2008-09-04 22:18:06 UTC (rev 78023)
@@ -10,17 +10,8 @@
<name>JBoss OSGi Int</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss OSGi Integration</description>
+
<build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -40,16 +31,10 @@
<packageName>org.jboss.osgi.plugins.metadata</packageName>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
</plugins>
</build>
- <!-- Do not add version information here, use ../build/pom.xml instead -->
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
<dependencies>
<!-- Global dependencies -->
<dependency>
Copied: projects/jboss-osgi/trunk/osgi-int/src/main/java/org (from rev 78022, projects/jboss-osgi/trunk/osgi-int/src/main/org)
Copied: projects/jboss-osgi/trunk/osgi-int/src/main/resources/schema (from rev 78022, projects/jboss-osgi/trunk/osgi-int/src/resources/schema)
Copied: projects/jboss-osgi/trunk/osgi-int/src/test/java/org (from rev 78022, projects/jboss-osgi/trunk/osgi-int/src/tests/org)
Copied: projects/jboss-osgi/trunk/osgi-int/src/test/resources/bootstrap (from rev 78022, projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bootstrap)
Copied: projects/jboss-osgi/trunk/osgi-int/src/test/resources/bundle (from rev 78022, projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bundle)
Copied: projects/jboss-osgi/trunk/osgi-int/src/test/resources/org (from rev 78022, projects/jboss-osgi/trunk/osgi-int/src/resources/tests/org)
Modified: projects/jboss-osgi/trunk/osgi-repository-api/.classpath
===================================================================
--- projects/jboss-osgi/trunk/osgi-repository-api/.classpath 2008-09-04 22:10:28 UTC (rev 78022)
+++ projects/jboss-osgi/trunk/osgi-repository-api/.classpath 2008-09-04 22:18:06 UTC (rev 78023)
@@ -1,5 +1,5 @@
<classpath>
- <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0.jar"/>
Modified: projects/jboss-osgi/trunk/osgi-repository-api/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-repository-api/pom.xml 2008-09-04 22:10:28 UTC (rev 78022)
+++ projects/jboss-osgi/trunk/osgi-repository-api/pom.xml 2008-09-04 22:18:06 UTC (rev 78023)
@@ -10,7 +10,8 @@
<name>JBoss OSGi Repository API</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss OSGi Repository API</description>
- <!-- Do not add version information here, use ../build/pom.xml instead -->
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
Copied: projects/jboss-osgi/trunk/osgi-repository-api/src/main/java/org (from rev 78022, projects/jboss-osgi/trunk/osgi-repository-api/src/main/org)
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2008-09-04 22:10:28 UTC (rev 78022)
+++ projects/jboss-osgi/trunk/pom.xml 2008-09-04 22:18:06 UTC (rev 78023)
@@ -13,31 +13,56 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>4-beta-1</version>
+ <version>4-beta-2</version>
</parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-aggregator</artifactId>
+ <artifactId>jboss-osgi</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss OSGi Aggregator</name>
+ <name>JBoss OSGi Parent POM</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>
JBoss OSGi
</description>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-osgi/trunk/</url>
</scm>
<modules>
- <module>build</module>
<module>osgi-repository-api</module>
<module>osgi-int</module>
+ <module>build</module>
</modules>
+ <properties>
+ <version.jboss.microcontainer>2.0.0.Beta17</version.jboss.microcontainer>
+ <version.jboss.deployers>2.0.0.Beta20</version.jboss.deployers>
+ <version.jboss.common.core>2.2.7.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
+ <version.osgi.r4.core>1.0</version.osgi.r4.core>
+ <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
+ <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
+ <version.junit>4.4</version.junit>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-7</version>
<configuration>
@@ -46,41 +71,191 @@
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/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>
+
+ <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>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-repository-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>${version.osgi.r4.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.jboss.deployers}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
<id>eclipse</id>
<build>
<defaultGoal>process-test-resources</defaultGoal>
- </build>
- </profile>
- <profile>
- <id>assembly</id>
- <build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
+ <artifactId>maven-eclipse-plugin</artifactId>
<executions>
<execution>
- <id>make-assembly</id>
- <phase>install</phase>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
<goals>
- <goal>assembly</goal>
+ <goal>eclipse</goal>
</goals>
</execution>
</executions>
<configuration>
- <finalName>jboss-microcontainer-${project.version}</finalName>
- <descriptors>
- <descriptor>build/assembly/dist.xml</descriptor>
- <descriptor>build/assembly/src.xml</descriptor>
- </descriptors>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
</configuration>
</plugin>
</plugins>
</build>
+ <properties>
+ <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory>
+ </properties>
</profile>
</profiles>
More information about the jboss-cvs-commits
mailing list